* [Intel-gfx] [v3] drm/i915/dsc: Fix bigjoiner check in dsc_disable
@ 2021-06-09 6:59 Vandita Kulkarni
2021-06-09 9:32 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/dsc: Fix bigjoiner check in dsc_disable (rev5) Patchwork
0 siblings, 1 reply; 2+ messages in thread
From: Vandita Kulkarni @ 2021-06-09 6:59 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
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 <jani.nikula@intel.com>
Fixes: d961eb20adb6 (drm/i915/bigjoiner: atomic commit changes for uncompressed joiner)
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3537
Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
---
drivers/gpu/drm/i915/display/intel_vdsc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
index 19cd9531c115..7121b66bf96d 100644
--- a/drivers/gpu/drm/i915/display/intel_vdsc.c
+++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
@@ -1161,12 +1161,12 @@ void intel_dsc_disable(const struct intel_crtc_state *old_crtc_state)
struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
- if (!(old_crtc_state->dsc.compression_enable &&
- old_crtc_state->bigjoiner))
- return;
-
- intel_de_write(dev_priv, dss_ctl1_reg(old_crtc_state), 0);
- intel_de_write(dev_priv, dss_ctl2_reg(old_crtc_state), 0);
+ /* Disable only if either of them is enabled */
+ if (old_crtc_state->dsc.compression_enable ||
+ old_crtc_state->bigjoiner) {
+ intel_de_write(dev_priv, dss_ctl1_reg(old_crtc_state), 0);
+ intel_de_write(dev_priv, dss_ctl2_reg(old_crtc_state), 0);
+ }
}
void intel_uncompressed_joiner_get_config(struct intel_crtc_state *crtc_state)
--
2.21.0.5.gaeb582a
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/dsc: Fix bigjoiner check in dsc_disable (rev5)
2021-06-09 6:59 [Intel-gfx] [v3] drm/i915/dsc: Fix bigjoiner check in dsc_disable Vandita Kulkarni
@ 2021-06-09 9:32 ` Patchwork
0 siblings, 0 replies; 2+ messages in thread
From: Patchwork @ 2021-06-09 9:32 UTC (permalink / raw)
To: Navare, Manasi; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 412 bytes --]
== Series Details ==
Series: drm/i915/dsc: Fix bigjoiner check in dsc_disable (rev5)
URL : https://patchwork.freedesktop.org/series/91006/
State : failure
== Summary ==
Applying: drm/i915/dsc: Fix bigjoiner check in dsc_disable
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_vdsc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
[-- Attachment #1.2: Type: text/html, Size: 906 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-09 9:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-09 6:59 [Intel-gfx] [v3] drm/i915/dsc: Fix bigjoiner check in dsc_disable Vandita Kulkarni
2021-06-09 9:32 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/dsc: Fix bigjoiner check in dsc_disable (rev5) Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.