| 204,6 → 204,19 |
|---|
| gen6_gt_check_fifodbg(dev_priv); |
| } |
| |
| static void intel_uncore_forcewake_reset(struct drm_device *dev) |
| { |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| |
| if (IS_VALLEYVIEW(dev)) { |
| vlv_force_wake_reset(dev_priv); |
| } else if (INTEL_INFO(dev)->gen >= 6) { |
| __gen6_gt_force_wake_reset(dev_priv); |
| if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) |
| __gen6_gt_force_wake_mt_reset(dev_priv); |
| } |
| } |
| |
| void intel_uncore_early_sanitize(struct drm_device *dev) |
| { |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| 259,20 → 272,9 |
|---|
| dev_priv->uncore.funcs.force_wake_put = |
| __gen6_gt_force_wake_put; |
| } |
| } |
| |
| static void intel_uncore_forcewake_reset(struct drm_device *dev) |
| { |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| |
| if (IS_VALLEYVIEW(dev)) { |
| vlv_force_wake_reset(dev_priv); |
| } else if (INTEL_INFO(dev)->gen >= 6) { |
| __gen6_gt_force_wake_reset(dev_priv); |
| if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) |
| __gen6_gt_force_wake_mt_reset(dev_priv); |
| intel_uncore_forcewake_reset(dev); |
| } |
| } |
| |
| void intel_uncore_sanitize(struct drm_device *dev) |
| { |