Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: Use hw.active instead of uapi.active in the initial plane readout
We're interested in the actual hardware state rather than the uapi
state, so grab the crtc active flag from the correct spot.
In practice the two will be identical here becase
.get_initial_plane_config() will reject the initial FB when
joiner is active.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251119181606.17129-5-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
+8
-4
+4
-2
drivers/gpu/drm/i915/display/intel_plane_initial.c
+4
-2
drivers/gpu/drm/i915/display/intel_plane_initial.c
···
39
39
const struct intel_crtc_state *crtc_state =
40
40
to_intel_crtc_state(crtc->base.state);
41
41
42
-
if (!crtc_state->uapi.active)
42
+
if (!crtc_state->hw.active)
43
43
continue;
44
44
45
45
if (!plane_state->ggtt_vma)
···
411
411
struct intel_crtc *crtc;
412
412
413
413
for_each_intel_crtc(display->drm, crtc) {
414
+
const struct intel_crtc_state *crtc_state =
415
+
to_intel_crtc_state(crtc->base.state);
414
416
struct intel_initial_plane_config *plane_config =
415
417
&plane_configs[crtc->pipe];
416
418
417
-
if (!to_intel_crtc_state(crtc->base.state)->uapi.active)
419
+
if (!crtc_state->hw.active)
418
420
continue;
419
421
420
422
/*
+4
-2
drivers/gpu/drm/xe/display/xe_plane_initial.c
+4
-2
drivers/gpu/drm/xe/display/xe_plane_initial.c
···
58
58
const struct intel_crtc_state *crtc_state =
59
59
to_intel_crtc_state(crtc->base.state);
60
60
61
-
if (!crtc_state->uapi.active)
61
+
if (!crtc_state->hw.active)
62
62
continue;
63
63
64
64
if (!plane_state->ggtt_vma)
···
290
290
struct intel_crtc *crtc;
291
291
292
292
for_each_intel_crtc(display->drm, crtc) {
293
+
const struct intel_crtc_state *crtc_state =
294
+
to_intel_crtc_state(crtc->base.state);
293
295
struct intel_initial_plane_config *plane_config =
294
296
&plane_configs[crtc->pipe];
295
297
296
-
if (!to_intel_crtc_state(crtc->base.state)->uapi.active)
298
+
if (!crtc_state->hw.active)
297
299
continue;
298
300
299
301
/*