From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 4/5] drm/i915: implement WaDisableSpriteDestColorKey Date: Thu, 18 Oct 2012 11:49:53 +0200 Message-ID: <1350553794-5534-5-git-send-email-daniel.vetter@ffwll.ch> References: <1350553794-5534-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 39DCF9E880 for ; Thu, 18 Oct 2012 02:32:07 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id n13so2055073eaa.36 for ; Thu, 18 Oct 2012 02:32:06 -0700 (PDT) In-Reply-To: <1350553794-5534-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org Unfortunately this requires a bit of book-keeping to return the right values for get_colorkey and to set things up correctly when re-enabling the plane. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_sprite.c | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 79f8ed6..e935e75 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -220,6 +220,8 @@ struct intel_plane { struct drm_i915_gem_object *obj; int max_downscale; u32 lut_r[1024], lut_g[1024], lut_b[1024]; + bool restore_ilk_dest_key; /* for a w/a */ + void (*update_plane)(struct drm_plane *plane, struct drm_framebuffer *fb, struct drm_i915_gem_object *obj, diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 7644f31..8bcacd5 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -230,6 +230,13 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, dvscntr = I915_READ(DVSCNTR(pipe)); + WARN_ON(!(dvscntr & DVS_ENABLE) && (dvscntr && DVS_DEST_KEY)); + + if (intel_plane->restore_ilk_dest_key) { + dvscntr |= DVS_DEST_KEY; + intel_plane->restore_ilk_dest_key = false; + } + /* Mask out pixel format bits in case we change it */ dvscntr &= ~DVS_PIXFORMAT_MASK; dvscntr &= ~DVS_RGB_ORDER_XBGR; @@ -311,8 +318,16 @@ ilk_disable_plane(struct drm_plane *plane) struct drm_i915_private *dev_priv = dev->dev_private; struct intel_plane *intel_plane = to_intel_plane(plane); int pipe = intel_plane->pipe; + uint32_t tmp; - I915_WRITE(DVSCNTR(pipe), I915_READ(DVSCNTR(pipe)) & ~DVS_ENABLE); + /* WaDisableSpriteDestColorKey: We need to disable the dest key when + * disabling the sprite. */ + tmp = I915_READ(DVSCNTR(pipe)); + if (IS_GEN5(dev) &&(tmp & DVS_DEST_KEY)) + intel_plane->restore_ilk_dest_key = true; + tmp &= ~(DVS_ENABLE | DVS_DEST_KEY); + + I915_WRITE(DVSCNTR(pipe), tmp); /* Disable the scaler */ I915_WRITE(DVSSCALE(pipe), 0); /* Flush double buffered register updates */ @@ -365,6 +380,7 @@ ilk_update_colorkey(struct drm_plane *plane, int ret = 0; intel_plane = to_intel_plane(plane); + intel_plane->restore_ilk_dest_key = false; I915_WRITE(DVSKEYVAL(intel_plane->pipe), key->min_value); I915_WRITE(DVSKEYMAX(intel_plane->pipe), key->max_value); @@ -372,9 +388,12 @@ ilk_update_colorkey(struct drm_plane *plane, dvscntr = I915_READ(DVSCNTR(intel_plane->pipe)); dvscntr &= ~(DVS_SOURCE_KEY | DVS_DEST_KEY); - if (key->flags & I915_SET_COLORKEY_DESTINATION) - dvscntr |= DVS_DEST_KEY; - else if (key->flags & I915_SET_COLORKEY_SOURCE) + if (key->flags & I915_SET_COLORKEY_DESTINATION) { + if ((dvscntr & DVS_ENABLE) || !IS_GEN5(dev)) + dvscntr |= DVS_DEST_KEY; + else + intel_plane->restore_ilk_dest_key = true; + } else if (key->flags & I915_SET_COLORKEY_SOURCE) dvscntr |= DVS_SOURCE_KEY; I915_WRITE(DVSCNTR(intel_plane->pipe), dvscntr); -- 1.7.10.4