github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: Use hw.active instead of uapi.active in the initial plane readout

Browse Source 
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>
This commit is contained in:
Ville Syrjälä 2025-11-19 20:16:04 +02:00
parent 28bf111ffe
commit e48b99d863
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/display/intel_plane_initial.c
View File

@ -39,7 +39,7 @@ intel_reuse_initial_plane_obj(struct intel_crtc *this,
const struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state);
if (!crtc_state->uapi.active)
if (!crtc_state->hw.active)
continue;
if (!plane_state->ggtt_vma)
@ -411,10 +411,12 @@ void intel_initial_plane_config(struct intel_display *display)
struct intel_crtc *crtc;
for_each_intel_crtc(display->drm, crtc) {
const struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state);
struct intel_initial_plane_config *plane_config =
&plane_configs[crtc->pipe];
if (!to_intel_crtc_state(crtc->base.state)->uapi.active)
if (!crtc_state->hw.active)
continue;
/*

6
drivers/gpu/drm/xe/display/xe_plane_initial.c
View File

@ -58,7 +58,7 @@ intel_reuse_initial_plane_obj(struct intel_crtc *this,
const struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state);
if (!crtc_state->uapi.active)
if (!crtc_state->hw.active)
continue;
if (!plane_state->ggtt_vma)
@ -290,10 +290,12 @@ void intel_initial_plane_config(struct intel_display *display)
struct intel_crtc *crtc;
for_each_intel_crtc(display->drm, crtc) {
const struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state);
struct intel_initial_plane_config *plane_config =
&plane_configs[crtc->pipe];
if (!to_intel_crtc_state(crtc->base.state)->uapi.active)
if (!crtc_state->hw.active)
continue;
/*