diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-05-26 14:36:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-05-26 14:36:50 +1000 |
| commit | 94d39d01287b8e28cf4b914908a9fef5201954a8 (patch) | |
| tree | bbeb5a306cc2543445e65fd2bd664438dd20f007 | |
| parent | 44c026a73be8038f03dbdeef028b642880cf1511 (diff) | |
| parent | 45dfbd992923f4df174db4e23b96fca7e30d73e2 (diff) | |
| download | lwn-94d39d01287b8e28cf4b914908a9fef5201954a8.tar.gz lwn-94d39d01287b8e28cf4b914908a9fef5201954a8.zip | |
Merge tag 'drm-intel-fixes-2023-05-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
PIPEDMC disabling fix for bigjoiner config
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZG9aROGyc947/J1l@jlahtine-mobl.ger.corp.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 3c29792137a5..0aae9a1eb3d5 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -1851,9 +1851,17 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, intel_disable_shared_dpll(old_crtc_state); - intel_encoders_post_pll_disable(state, crtc); + if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { + struct intel_crtc *slave_crtc; + + intel_encoders_post_pll_disable(state, crtc); - intel_dmc_disable_pipe(i915, crtc->pipe); + intel_dmc_disable_pipe(i915, crtc->pipe); + + for_each_intel_crtc_in_pipe_mask(&i915->drm, slave_crtc, + intel_crtc_bigjoiner_slave_pipes(old_crtc_state)) + intel_dmc_disable_pipe(i915, slave_crtc->pipe); + } } static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state) |