Skip to content

Commit 5131743

Browse files
Vanditakulkarnianshuma1
authored andcommitted
drm/i915/dsc: Fix bigjoiner check in dsc_disable
This change takes care of resetting the dss_ctl registers in case of dsc_disable, bigjoiner disable and also uncompressed joiner disable. v2: Fix formatting v3: Fix the typo (Mansi) Suggested-by: Jani Nikula <[email protected]> Fixes: d961eb2 ("drm/i915/bigjoiner: atomic commit changes for uncompressed joiner") Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3537 Signed-off-by: Vandita Kulkarni <[email protected]> Reviewed-by: Manasi Navare <[email protected]> Signed-off-by: Anshuman Gupta <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 17c1a4b commit 5131743

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/gpu/drm/i915/display/intel_vdsc.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,12 +1161,12 @@ void intel_dsc_disable(const struct intel_crtc_state *old_crtc_state)
11611161
struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
11621162
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
11631163

1164-
if (!(old_crtc_state->dsc.compression_enable &&
1165-
old_crtc_state->bigjoiner))
1166-
return;
1167-
1168-
intel_de_write(dev_priv, dss_ctl1_reg(old_crtc_state), 0);
1169-
intel_de_write(dev_priv, dss_ctl2_reg(old_crtc_state), 0);
1164+
/* Disable only if either of them is enabled */
1165+
if (old_crtc_state->dsc.compression_enable ||
1166+
old_crtc_state->bigjoiner) {
1167+
intel_de_write(dev_priv, dss_ctl1_reg(old_crtc_state), 0);
1168+
intel_de_write(dev_priv, dss_ctl2_reg(old_crtc_state), 0);
1169+
}
11701170
}
11711171

11721172
void intel_uncompressed_joiner_get_config(struct intel_crtc_state *crtc_state)

0 commit comments

Comments
 (0)