Commit eb973a5e authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Drop some more CHV pre-production workarounds 



Drop WaDisablePwrmtrEvent:chv as it's no longer needed.

Also remove the WaSetMaskForGfxBusyness:chv note, but we still
leave the GEN6_RP_MEDIA_IS_GFX bit enabled as that's still the
recommended setting.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 14bc16e3

drivers/gpu/drm/i915/intel_pm.c

+1 −5
Original line number Diff line number Diff line
@@ -4789,14 +4789,10 @@ static void cherryview_enable_rps(struct drm_device *dev) 


	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);



	/* WaDisablePwrmtrEvent:chv (pre-production hw) */

	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);

	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);



	/* 5: Enable RPS */

	I915_WRITE(GEN6_RP_CONTROL,

		   GEN6_RP_MEDIA_HW_NORMAL_MODE |

		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */

		   GEN6_RP_MEDIA_IS_GFX |

		   GEN6_RP_ENABLE |

		   GEN6_RP_UP_BUSY_AVG |

		   GEN6_RP_DOWN_IDLE_AVG);

CRA Git | Maintained and supported by SUSTech CRA and CCSE