yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

platforms/drm: fix underscan

Browse source 
The enums belong to "underscan", not to "underscan hborder".
The aspect ratio also needed correction
This commit is contained in:
Xaver Hugl 2021-07-07 18:56:33 +02:00
parent be6c33458f
commit 4d8ae93f06
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/plugins/platforms/drm/drm_object_connector.cpp
View file

@ -49,13 +49,13 @@ bool DrmConnector::init()
PropertyDefinition(QByteArrayLiteral("EDID")), PropertyDefinition(QByteArrayLiteral("EDID")),
PropertyDefinition(QByteArrayLiteral("overscan")), PropertyDefinition(QByteArrayLiteral("overscan")),
PropertyDefinition(QByteArrayLiteral("vrr_capable")), PropertyDefinition(QByteArrayLiteral("vrr_capable")),
PropertyDefinition(QByteArrayLiteral("underscan")), PropertyDefinition(QByteArrayLiteral("underscan"), {
PropertyDefinition(QByteArrayLiteral("underscan vborder")),
PropertyDefinition(QByteArrayLiteral("underscan hborder"), {
QByteArrayLiteral("off"), QByteArrayLiteral("off"),
QByteArrayLiteral("on"), QByteArrayLiteral("on"),
QByteArrayLiteral("auto") QByteArrayLiteral("auto")
}), }),
PropertyDefinition(QByteArrayLiteral("underscan vborder")),
PropertyDefinition(QByteArrayLiteral("underscan hborder")),
}, DRM_MODE_OBJECT_CONNECTOR)) { }, DRM_MODE_OBJECT_CONNECTOR)) {
return false; return false;
} }
@ -190,10 +190,10 @@ void DrmConnector::setOverscan(uint32_t overscan, const QSize &modeSize)
} else if (auto prop = m_props[static_cast<uint32_t>(PropertyIndex::Underscan)]) { } else if (auto prop = m_props[static_cast<uint32_t>(PropertyIndex::Underscan)]) {
float aspectRatio = modeSize.width() / static_cast<float>(modeSize.height()); float aspectRatio = modeSize.width() / static_cast<float>(modeSize.height());
prop->setEnum(overscan > 0 ? UnderscanOptions::On : UnderscanOptions::Off); prop->setEnum(overscan > 0 ? UnderscanOptions::On : UnderscanOptions::Off);
uint32_t hborder = overscan / aspectRatio; uint32_t hborder = overscan * aspectRatio;
if (hborder > 128) { if (hborder > 128) {
hborder = 128; hborder = 128;
overscan = 128 * aspectRatio; overscan = 128 / aspectRatio;
} }
// overscan only goes from 0-100 so we cut off the 101-128 value range of underscan_vborder // overscan only goes from 0-100 so we cut off the 101-128 value range of underscan_vborder
setValue(PropertyIndex::Underscan_vborder, overscan); setValue(PropertyIndex::Underscan_vborder, overscan);