Skip to content

Commit

Permalink
drm/i915: Turn off the CUS when turning off a HDR plane
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Ville Syrjälä committed Mar 18, 2019
1 parent 5a04044 commit 7c12004
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/intel_sprite.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 7c12004

Please sign in to comment.