diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-03-15 21:54:45 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-03-18 17:47:03 +0200 |
| commit | 7c1200456cb0859fba27927feb8322929a4fad83 (patch) | |
| tree | d12e58824db0b7e393e2fa0e4439297ef7b2a1d5 | |
| parent | drm/i915: Fix legacy gamma mode for ICL (diff) | |
| download | linux-dev-7c1200456cb0859fba27927feb8322929a4fad83.tar.xz linux-dev-7c1200456cb0859fba27927feb8322929a4fad83.zip | |
drm/i915: Turn off the CUS when turning off a HDR plane
We're currently leaving the CUS enabled if we disable the
master plane directly after scanning out NV12.
Could perhaps cause the selected slave plane to misbehave
if we try to use it for scanning out something non-NV12?
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190315195445.26527-2-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110032
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index e00559d4cf5a..268fb34ff0e2 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -622,6 +622,9 @@ skl_disable_plane(struct intel_plane *plane, spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); + if (icl_is_hdr_plane(dev_priv, plane_id)) + I915_WRITE_FW(PLANE_CUS_CTL(pipe, plane_id), 0); + skl_write_plane_wm(plane, crtc_state); I915_WRITE_FW(PLANE_CTL(pipe, plane_id), 0); |