From: Gajanan Bhat Subject: [PATCH 3/3] drm/i915: Add sprite watermark programming for VLV and CHV Date: Wed, 16 Jul 2014 18:24:05 +0530 Message-ID: <1405515245-14946-4-git-send-email-gajanan.bhat@intel.com> References: <1405515245-14946-1-git-send-email-gajanan.bhat@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 87E7E6E56C for ; Wed, 16 Jul 2014 00:21:50 -0700 (PDT) In-Reply-To: <1405515245-14946-1-git-send-email-gajanan.bhat@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Program DDL register as part sprite watermark programming for CHV and VLV. Signed-off-by: Gajanan Bhat --- drivers/gpu/drm/i915/intel_pm.c | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index f3a3e90..0f439f7 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1405,6 +1405,48 @@ static void valleyview_update_wm(struct drm_crtc *crtc) intel_set_memory_cxsr(dev_priv, true); } +static void valleyview_update_sprite_wm(struct drm_plane *plane, + struct drm_crtc *crtc, + uint32_t sprite_width, + uint32_t sprite_height, + int pixel_size, + bool enabled, bool scaled) +{ + struct drm_device *dev = crtc->dev; + struct drm_i915_private *dev_priv = dev->dev_private; + int pipe = to_intel_plane(plane)->pipe; + int drain_latency; + int plane_prec; + int sprite_dl; + int prec_mult; + + if (to_intel_plane(plane)->plane == 0) + sprite_dl = I915_READ(VLV_DDL(pipe)) & ~DDL_SPRITE0_PRECISION_64 & + ~(DRAIN_LATENCY_MAX << DDL_SPRITE0_SHIFT); + else + sprite_dl = I915_READ(VLV_DDL(pipe)) & ~DDL_SPRITE1_PRECISION_64 & + ~(DRAIN_LATENCY_MAX << DDL_SPRITE1_SHIFT); + + if (enabled && vlv_compute_drain_latency(crtc, pixel_size, &prec_mult, + &drain_latency)) { + if (to_intel_plane(plane)->plane == 0) { + plane_prec = (prec_mult == DRAIN_LATENCY_PRECISION_64) ? + DDL_SPRITE0_PRECISION_64 : + DDL_SPRITE0_PRECISION_32; + sprite_dl = sprite_dl | plane_prec | + drain_latency << DDL_SPRITE0_SHIFT; + } else { + plane_prec = (prec_mult == DRAIN_LATENCY_PRECISION_64) ? + DDL_SPRITE1_PRECISION_64 : + DDL_SPRITE1_PRECISION_32; + sprite_dl = sprite_dl | plane_prec | + drain_latency << DDL_SPRITE1_SHIFT; + } + } + + I915_WRITE(VLV_DDL(pipe), sprite_dl); +} + static void g4x_update_wm(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev; @@ -6851,10 +6893,12 @@ void intel_init_pm(struct drm_device *dev) dev_priv->display.init_clock_gating = gen8_init_clock_gating; } else if (IS_CHERRYVIEW(dev)) { dev_priv->display.update_wm = valleyview_update_wm; + dev_priv->display.update_sprite_wm = valleyview_update_sprite_wm; dev_priv->display.init_clock_gating = cherryview_init_clock_gating; } else if (IS_VALLEYVIEW(dev)) { dev_priv->display.update_wm = valleyview_update_wm; + dev_priv->display.update_sprite_wm = valleyview_update_sprite_wm; dev_priv->display.init_clock_gating = valleyview_init_clock_gating; } else if (IS_PINEVIEW(dev)) { -- 1.7.9.5