mirror of
https://github.com/hyprwm/aquamarine.git
synced 2024-12-23 02:19:50 +01:00
drm: only fail INVALID format when enabled (#122)
This commit is contained in:
parent
a23e9a9bdf
commit
5e3f6013e9
1 changed files with 5 additions and 5 deletions
|
@ -1429,11 +1429,6 @@ bool Aquamarine::CDRMOutput::commitState(bool onlyTest) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (STATE.drmFormat == DRM_FORMAT_INVALID) {
|
|
||||||
backend->backend->log(AQ_LOG_ERROR, "drm: No format for output");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (COMMITTED & COutputState::eOutputStateProperties::AQ_OUTPUT_STATE_FORMAT) {
|
if (COMMITTED & COutputState::eOutputStateProperties::AQ_OUTPUT_STATE_FORMAT) {
|
||||||
// verify the format is valid for the primary plane
|
// verify the format is valid for the primary plane
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
|
@ -1450,6 +1445,11 @@ bool Aquamarine::CDRMOutput::commitState(bool onlyTest) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (STATE.enabled && STATE.drmFormat == DRM_FORMAT_INVALID) {
|
||||||
|
backend->backend->log(AQ_LOG_ERROR, "drm: No format for output");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (STATE.adaptiveSync && !connector->canDoVrr) {
|
if (STATE.adaptiveSync && !connector->canDoVrr) {
|
||||||
backend->backend->log(AQ_LOG_ERROR, "drm: No Adaptive sync support for output");
|
backend->backend->log(AQ_LOG_ERROR, "drm: No Adaptive sync support for output");
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue