artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ffaaf0c
)
drm/i915: Reject async flips with bigjoiner
author
jsg
<jsg@openbsd.org>
Mon, 1 Jan 2024 23:59:47 +0000
(23:59 +0000)
committer
jsg
<jsg@openbsd.org>
Mon, 1 Jan 2024 23:59:47 +0000
(23:59 +0000)
From Ville Syrjala
7d09c84df5ab9e18464a2f048e393a7860a043e9
in linux-6.1.y/6.1.70
88a173e5dd05e788068e8fa20a8c37c44bd8f416
in mainline linux
sys/dev/pci/drm/i915/display/intel_display.c
patch
|
blob
|
history
diff --git
a/sys/dev/pci/drm/i915/display/intel_display.c
b/sys/dev/pci/drm/i915/display/intel_display.c
index
a6bbf26
..
cab50df
100644
(file)
--- a/
sys/dev/pci/drm/i915/display/intel_display.c
+++ b/
sys/dev/pci/drm/i915/display/intel_display.c
@@
-6481,6
+6481,17
@@
static int intel_async_flip_check_uapi(struct intel_atomic_state *state,
return -EINVAL;
}
+ /*
+ * FIXME: Bigjoiner+async flip is busted currently.
+ * Remove this check once the issues are fixed.
+ */
+ if (new_crtc_state->bigjoiner_pipes) {
+ drm_dbg_kms(&i915->drm,
+ "[CRTC:%d:%s] async flip disallowed with bigjoiner\n",
+ crtc->base.base.id, crtc->base.name);
+ return -EINVAL;
+ }
+
for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state,
new_plane_state, i) {
if (plane->pipe != crtc->pipe)