Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-08-22 15:11:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[idd] transport: intersect frame capabilities

Browse Source
This commit is contained in:
Geoffrey McRae
2026-08-12 23:53:52 +10:00
parent c601468871
commit 5b09d4f90a
16 changed files with 334 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
idd/LGIdd/display/CDeviceContext.cpp
View File

@@ -272,7 +272,7 @@ void CDeviceContext::InitAdapter()
return;
}
DEBUG_TRACE("Loading configured display modes");
if (!m_displayConfiguration.Load(m_transport->GetMemoryLimits()))
if (!m_displayConfiguration.Load(*m_transport))
{
m_initInProgress.store(0);
return;
@@ -405,8 +405,7 @@ void CDeviceContext::ReplugMonitor()
void CDeviceContext::ReloadSettings()
{
if (!m_displayConfiguration.ReloadSettings(
m_transport->GetMemoryLimits()))
if (!m_displayConfiguration.ReloadSettings(*m_transport))
return;
ReplugMonitor();
@@ -449,7 +448,7 @@ void CDeviceContext::SetResolution(uint32_t width, uint32_t height)
{
const CDisplayConfiguration::ResolutionResult result =
m_displayConfiguration.SetResolution(
width, height, m_transport->GetMemoryLimits());
width, height, *m_transport);
switch (result.status)
{
@@ -464,6 +463,10 @@ void CDeviceContext::SetResolution(uint32_t width, uint32_t height)
g_pipe.ResolutionRejected(width, height, result.requiredMiB);
break;
case CDisplayConfiguration::ResolutionStatus::UNSUPPORTED:
g_pipe.ResolutionRejected(width, height, 0);
break;
default:
break;
}

162
idd/LGIdd/display/CDisplayConfiguration.cpp
View File

@@ -23,77 +23,9 @@
#include "CDebug.h"
#include "CSRWLock.h"
#include <d3d12.h>
#include <iterator>
#include <utility>
static const UINT64 FRAME_BYTES_PER_PIXEL = 4;
bool CDisplayConfiguration::AlignUp(
UINT64 value, UINT64 alignment, UINT64& result)
{
if (!alignment || (alignment & (alignment - 1)))
return false;
const UINT64 mask = alignment - 1;
result = (value + mask) & ~mask;
return true;
}
bool CDisplayConfiguration::CalculateFrameSize(
uint32_t width, uint32_t height, UINT64& frameSize)
{
frameSize = 0;
if (!width || !height)
return false;
UINT64 pitch;
if (!AlignUp((UINT64)width * FRAME_BYTES_PER_PIXEL,
D3D12_TEXTURE_DATA_PITCH_ALIGNMENT, pitch))
return false;
frameSize = pitch * height;
return true;
}
bool CDisplayConfiguration::GetResolutionMemoryRequirements(
uint32_t width, uint32_t height, UINT64 alignment,
const FrameMemoryLimits& limits, UINT64& frameSize, UINT64& requiredSize)
{
frameSize = 0;
requiredSize = 0;
if (!alignment || !limits.frameMemoryOffset || !limits.bufferCount ||
!CalculateFrameSize(width, height, frameSize))
return false;
UINT64 frameAllocationSize;
if (!AlignUp(frameSize + alignment, alignment, frameAllocationSize))
return false;
UINT64 frameMemoryStart;
if (!AlignUp(limits.frameMemoryOffset, alignment, frameMemoryStart))
return false;
requiredSize = frameMemoryStart +
frameAllocationSize * limits.bufferCount;
return true;
}
uint32_t CDisplayConfiguration::RecommendedMemorySizeMiB(
UINT64 requiredSize)
{
UINT64 sizeMiB = requiredSize / 1048576;
if (requiredSize % 1048576)
++sizeMiB;
UINT64 result = 1;
while (result < sizeMiB && result <= UINT32_MAX / 2)
result <<= 1;
return result < sizeMiB ? UINT32_MAX : (uint32_t)result;
}
#ifdef HAS_IDDCX_110
static inline IDDCX_WIRE_BITS_PER_COMPONENT GetWireBitsPerComponent(bool hdr)
{
@@ -117,7 +49,7 @@ CDisplayConfiguration::CDisplayConfiguration(CSettings& settings) :
{
}
bool CDisplayConfiguration::LoadModes(const FrameMemoryLimits& limits)
bool CDisplayConfiguration::LoadModes(const FrameCaps& caps)
{
const CSettings::DisplayModes configuredModes =
m_settings.LoadModes();
@@ -127,17 +59,17 @@ bool CDisplayConfiguration::LoadModes(const FrameMemoryLimits& limits)
CSettings::DisplayModes newModes;
newModes.reserve(configuredModes.size());
const UINT64 alignment = limits.alignment ? limits.alignment :
D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
bool hasPreferred = false;
for (const auto& configuredMode : configuredModes)
{
UINT64 frameSize;
UINT64 requiredMemorySize;
if (!GetResolutionMemoryRequirements(configuredMode.width,
configuredMode.height, alignment, limits, frameSize,
requiredMemorySize))
const FrameMode frameMode =
{
configuredMode.width,
configuredMode.height,
configuredMode.refreshMilliHz,
};
if (!frameMode.width || !frameMode.height ||
!frameMode.refreshMilliHz)
{
DEBUG_WARN("Filtering invalid %s mode %ux%u@%.3f",
configuredMode.extraMode ? "extra" : "configured",
@@ -145,16 +77,13 @@ bool CDisplayConfiguration::LoadModes(const FrameMemoryLimits& limits)
configuredMode.refreshMilliHz / 1000.0);
continue;
}
if (requiredMemorySize > limits.capacity)
if (!caps.CanUseMode(frameMode))
{
DEBUG_WARN(
"Filtering %s mode %ux%u@%.3f: requires %llu bytes of transport memory, only %llu bytes are available",
"Filtering unsupported %s mode %ux%u@%.3f",
configuredMode.extraMode ? "extra" : "configured",
configuredMode.width, configuredMode.height,
configuredMode.refreshMilliHz / 1000.0,
(unsigned long long)requiredMemorySize,
(unsigned long long)limits.capacity);
configuredMode.refreshMilliHz / 1000.0);
continue;
}
@@ -169,7 +98,7 @@ bool CDisplayConfiguration::LoadModes(const FrameMemoryLimits& limits)
if (newModes.empty())
{
DEBUG_ERROR("No configured display modes fit in transport memory");
DEBUG_ERROR("No configured display modes are supported");
return false;
}
@@ -183,13 +112,13 @@ bool CDisplayConfiguration::LoadModes(const FrameMemoryLimits& limits)
return true;
}
bool CDisplayConfiguration::Load(const FrameMemoryLimits& limits)
bool CDisplayConfiguration::Load(const FrameCaps& caps)
{
return LoadModes(limits);
return LoadModes(caps);
}
bool CDisplayConfiguration::ReloadSettings(
const FrameMemoryLimits& limits)
const FrameCaps& caps)
{
bool modesLoaded = false;
{
@@ -209,7 +138,7 @@ bool CDisplayConfiguration::ReloadSettings(
}
if (settingsUpdated)
modesLoaded = LoadModes(limits);
modesLoaded = LoadModes(caps);
}
if (!modesLoaded)
@@ -219,43 +148,52 @@ bool CDisplayConfiguration::ReloadSettings(
CDisplayConfiguration::ResolutionResult
CDisplayConfiguration::SetResolution(
uint32_t width, uint32_t height, const FrameMemoryLimits& limits)
uint32_t width, uint32_t height, const FrameCaps& caps)
{
ResolutionResult result;
UINT64 frameSize;
UINT64 requiredMemorySize;
if (!GetResolutionMemoryRequirements(width, height, limits.alignment,
limits, frameSize, requiredMemorySize))
{
DEBUG_WARN("Ignoring invalid resolution request: %ux%u", width, height);
return result;
}
if (requiredMemorySize > limits.capacity)
{
result.status = ResolutionStatus::TOO_LARGE;
result.requiredMiB = RecommendedMemorySizeMiB(requiredMemorySize);
DEBUG_WARN(
"Refusing resolution %ux%u: frame requires %llu bytes, only %llu bytes are available; transport memory must be at least %u MiB",
width, height,
(unsigned long long)frameSize,
(unsigned long long)limits.maxFrameSize,
result.requiredMiB);
return result;
}
CSettings::DisplayMode mode = {};
mode.width = width;
mode.height = height;
mode.refreshMilliHz = m_settings.GetDefaultRefreshMilliHz();
mode.preferred = true;
if (!mode.width || !mode.height || !mode.refreshMilliHz)
{
DEBUG_WARN("Ignoring invalid resolution request: %ux%u", width, height);
return result;
}
const FrameMode frameMode =
{
mode.width,
mode.height,
mode.refreshMilliHz,
};
if (!caps.CanUseMode(frameMode, &result.requiredMiB))
{
if (result.requiredMiB)
{
result.status = ResolutionStatus::TOO_LARGE;
DEBUG_WARN(
"Refusing resolution %ux%u: configured frame capacity must be at "
"least %u MiB",
width, height, result.requiredMiB);
}
else
{
result.status = ResolutionStatus::UNSUPPORTED;
DEBUG_WARN("Refusing unsupported resolution: %ux%u",
width, height);
}
return result;
}
{
CSRWExclusiveLock reloadLock(m_reloadLock);
if (!m_settings.SetExtraMode(mode))
result.status = ResolutionStatus::SETTINGS_FAILED;
else if (!LoadModes(limits))
else if (!LoadModes(caps))
result.status = ResolutionStatus::MODES_FAILED;
else
{

19
idd/LGIdd/display/CDisplayConfiguration.h
View File

@@ -25,7 +25,7 @@
#include "config/CSettings.h"
#include "display/CEdid.h"
#include "display/IddCxCompat.h"
#include "transport/FrameMemoryLimits.h"
#include "transport/FrameCaps.h"
#include <stddef.h>
#include <stdint.h>
@@ -39,6 +39,7 @@ public:
SUCCESS,
INVALID,
TOO_LARGE,
UNSUPPORTED,
SETTINGS_FAILED,
MODES_FAILED,
};
@@ -68,27 +69,19 @@ private:
CEdid m_edid;
bool m_hdrEnabled = false;
bool LoadModes(const FrameMemoryLimits& limits);
bool LoadModes(const FrameCaps& caps);
CSettings::DisplayModes SnapshotModes(bool * hdrEnabled = nullptr) const;
static bool AlignUp(UINT64 value, UINT64 alignment, UINT64& result);
static bool CalculateFrameSize(uint32_t width, uint32_t height,
UINT64& frameSize);
static bool GetResolutionMemoryRequirements(uint32_t width,
uint32_t height, UINT64 alignment, const FrameMemoryLimits& limits,
UINT64& frameSize, UINT64& requiredSize);
static uint32_t RecommendedMemorySizeMiB(UINT64 requiredSize);
public:
explicit CDisplayConfiguration(CSettings& settings);
CDisplayConfiguration(const CDisplayConfiguration&) = delete;
CDisplayConfiguration& operator=(const CDisplayConfiguration&) = delete;
bool Load(const FrameMemoryLimits& limits);
bool ReloadSettings(const FrameMemoryLimits& limits);
bool Load(const FrameCaps& caps);
bool ReloadSettings(const FrameCaps& caps);
ResolutionResult SetResolution(uint32_t width, uint32_t height,
const FrameMemoryLimits& limits);
const FrameCaps& caps);
void InitializeEdid(bool hdr);
void RebuildEdid(bool hdr);