Skip to content

Commit 96676fe

Browse files
sdeepak2vsyrjala
authored andcommitted
drm/i915/chv: Set min freq to RPn on CHV.
With latest Punit FW, vgg input voltag drop falling to minimum is fixed. So reverting the WA patch & moving to turbo freq opreation range to [RPn -> RP0] This is not a 1:1 revert of the commit 5b7c91b. You can refer to commit 5b5929c ("drm/i915/chv: remove pre-production hardware workarounds") as the reason for the discrepancy commit 5b7c91b Author: Deepak S <[email protected]> Date: Sat May 9 18:15:46 2015 +0530 drm/i915/chv: Set min freq to efficient frequency on chv v2: Fix inconsistent return type. (Chris) v3: drop pre-production hw case (Ville) Acked-by: Chris Wilson <[email protected]> Signed-off-by: Deepak S <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]>
1 parent 64d83e3 commit 96676fe

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

drivers/gpu/drm/i915/intel_pm.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5708,6 +5708,17 @@ static int cherryview_rps_guar_freq(struct drm_i915_private *dev_priv)
57085708
return rp1;
57095709
}
57105710

5711+
static u32 cherryview_rps_min_freq(struct drm_i915_private *dev_priv)
5712+
{
5713+
u32 val, rpn;
5714+
5715+
val = vlv_punit_read(dev_priv, FB_GFX_FMIN_AT_VMIN_FUSE);
5716+
rpn = ((val >> FB_GFX_FMIN_AT_VMIN_FUSE_SHIFT) &
5717+
FB_GFX_FREQ_FUSE_MASK);
5718+
5719+
return rpn;
5720+
}
5721+
57115722
static int valleyview_rps_guar_freq(struct drm_i915_private *dev_priv)
57125723
{
57135724
u32 val, rp1;
@@ -5944,8 +5955,7 @@ static void cherryview_init_gt_powersave(struct drm_i915_private *dev_priv)
59445955
intel_gpu_freq(dev_priv, dev_priv->rps.rp1_freq),
59455956
dev_priv->rps.rp1_freq);
59465957

5947-
/* PUnit validated range is only [RPe, RP0] */
5948-
dev_priv->rps.min_freq = dev_priv->rps.efficient_freq;
5958+
dev_priv->rps.min_freq = cherryview_rps_min_freq(dev_priv);
59495959
DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n",
59505960
intel_gpu_freq(dev_priv, dev_priv->rps.min_freq),
59515961
dev_priv->rps.min_freq);

0 commit comments

Comments
 (0)