aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h1
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9cd870fb1472..241f5e16cee6 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -987,6 +987,7 @@ struct intel_gen6_power_mgmt {
987 u8 rp1_delay; 987 u8 rp1_delay;
988 u8 rp0_delay; 988 u8 rp0_delay;
989 u8 hw_max; 989 u8 hw_max;
990 u8 min_freq;
990 991
991 bool rp_up_masked; 992 bool rp_up_masked;
992 bool rp_down_masked; 993 bool rp_down_masked;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index dd3a1216eab0..dd631d19b2bd 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3354,7 +3354,7 @@ static void gen6_enable_rps(struct drm_device *dev)
3354 3354
3355 /* In units of 50MHz */ 3355 /* In units of 50MHz */
3356 dev_priv->rps.hw_max = hw_max = rp_state_cap & 0xff; 3356 dev_priv->rps.hw_max = hw_max = rp_state_cap & 0xff;
3357 hw_min = (rp_state_cap >> 16) & 0xff; 3357 dev_priv->rps.min_freq = hw_min = (rp_state_cap >> 16) & 0xff;
3358 dev_priv->rps.rp1_delay = (rp_state_cap >> 8) & 0xff; 3358 dev_priv->rps.rp1_delay = (rp_state_cap >> 8) & 0xff;
3359 dev_priv->rps.rp0_delay = (rp_state_cap >> 0) & 0xff; 3359 dev_priv->rps.rp0_delay = (rp_state_cap >> 0) & 0xff;
3360 dev_priv->rps.rpe_delay = dev_priv->rps.rp1_delay; 3360 dev_priv->rps.rpe_delay = dev_priv->rps.rp1_delay;