Skip to content

Commit 5b7c91b

Browse files
sdeepak2danvet
authored andcommitted
drm/i915/chv: Set min freq to efficient frequency on chv
After feedback from the hardware team, now we set the GPU min/idel freq to RPe. Punit is expecting us to operate GPU between Rpe & Rp0. If we drop the frequency to RPn, punit is failing to change the vgg input voltage to minimum :( Since Punit validates the rps range [RPe, RP0]. This patch removes unused cherryview_rps_min_freq function. v2: Change commit message v3: set min_freq before idle_freq (chris) v4: Squash 'Remove unused rps min function' patch Signed-off-by: Deepak S <[email protected]> Acked-by: Chris Wilson <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
1 parent 4a7624f commit 5b7c91b

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

drivers/gpu/drm/i915/intel_pm.c

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4743,24 +4743,6 @@ static int cherryview_rps_guar_freq(struct drm_i915_private *dev_priv)
47434743
return rp1;
47444744
}
47454745

4746-
static int cherryview_rps_min_freq(struct drm_i915_private *dev_priv)
4747-
{
4748-
struct drm_device *dev = dev_priv->dev;
4749-
u32 val, rpn;
4750-
4751-
if (dev->pdev->revision >= 0x20) {
4752-
val = vlv_punit_read(dev_priv, FB_GFX_FMIN_AT_VMIN_FUSE);
4753-
rpn = ((val >> FB_GFX_FMIN_AT_VMIN_FUSE_SHIFT) &
4754-
FB_GFX_FREQ_FUSE_MASK);
4755-
} else { /* For pre-production hardware */
4756-
val = vlv_punit_read(dev_priv, PUNIT_GPU_STATUS_REG);
4757-
rpn = ((val >> PUNIT_GPU_STATIS_GFX_MIN_FREQ_SHIFT) &
4758-
PUNIT_GPU_STATUS_GFX_MIN_FREQ_MASK);
4759-
}
4760-
4761-
return rpn;
4762-
}
4763-
47644746
static int valleyview_rps_guar_freq(struct drm_i915_private *dev_priv)
47654747
{
47664748
u32 val, rp1;
@@ -5012,7 +4994,8 @@ static void cherryview_init_gt_powersave(struct drm_device *dev)
50124994
intel_gpu_freq(dev_priv, dev_priv->rps.rp1_freq),
50134995
dev_priv->rps.rp1_freq);
50144996

5015-
dev_priv->rps.min_freq = cherryview_rps_min_freq(dev_priv);
4997+
/* PUnit validated range is only [RPe, RP0] */
4998+
dev_priv->rps.min_freq = dev_priv->rps.efficient_freq;
50164999
DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n",
50175000
intel_gpu_freq(dev_priv, dev_priv->rps.min_freq),
50185001
dev_priv->rps.min_freq);

0 commit comments

Comments
 (0)