Rev 4293 | Rev 4560 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4293 | Rev 4371 | ||
|---|---|---|---|
| Line 202... | Line 202... | ||
| 202 | _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL)); |
202 | _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL)); |
| 203 | /* The below doubles as a POSTING_READ */ |
203 | /* The below doubles as a POSTING_READ */ |
| 204 | gen6_gt_check_fifodbg(dev_priv); |
204 | gen6_gt_check_fifodbg(dev_priv); |
| 205 | } |
205 | } |
| Line -... | Line 206... | ||
| - | 206 | ||
| - | 207 | static void intel_uncore_forcewake_reset(struct drm_device *dev) |
|
| - | 208 | { |
|
| - | 209 | struct drm_i915_private *dev_priv = dev->dev_private; |
|
| - | 210 | ||
| - | 211 | if (IS_VALLEYVIEW(dev)) { |
|
| - | 212 | vlv_force_wake_reset(dev_priv); |
|
| - | 213 | } else if (INTEL_INFO(dev)->gen >= 6) { |
|
| - | 214 | __gen6_gt_force_wake_reset(dev_priv); |
|
| - | 215 | if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) |
|
| - | 216 | __gen6_gt_force_wake_mt_reset(dev_priv); |
|
| - | 217 | } |
|
| - | 218 | } |
|
| 206 | 219 | ||
| 207 | void intel_uncore_early_sanitize(struct drm_device *dev) |
220 | void intel_uncore_early_sanitize(struct drm_device *dev) |
| 208 | { |
221 | { |
| Line 209... | Line 222... | ||
| 209 | struct drm_i915_private *dev_priv = dev->dev_private; |
222 | struct drm_i915_private *dev_priv = dev->dev_private; |
| Line 257... | Line 270... | ||
| 257 | dev_priv->uncore.funcs.force_wake_get = |
270 | dev_priv->uncore.funcs.force_wake_get = |
| 258 | __gen6_gt_force_wake_get; |
271 | __gen6_gt_force_wake_get; |
| 259 | dev_priv->uncore.funcs.force_wake_put = |
272 | dev_priv->uncore.funcs.force_wake_put = |
| 260 | __gen6_gt_force_wake_put; |
273 | __gen6_gt_force_wake_put; |
| 261 | } |
274 | } |
| 262 | } |
- | |
| Line 263... | Line -... | ||
| 263 | - | ||
| 264 | static void intel_uncore_forcewake_reset(struct drm_device *dev) |
- | |
| 265 | { |
- | |
| 266 | struct drm_i915_private *dev_priv = dev->dev_private; |
- | |
| 267 | - | ||
| 268 | if (IS_VALLEYVIEW(dev)) { |
- | |
| 269 | vlv_force_wake_reset(dev_priv); |
- | |
| 270 | } else if (INTEL_INFO(dev)->gen >= 6) { |
275 | |
| 271 | __gen6_gt_force_wake_reset(dev_priv); |
- | |
| 272 | if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) |
- | |
| 273 | __gen6_gt_force_wake_mt_reset(dev_priv); |
- | |
| 274 | } |
276 | intel_uncore_forcewake_reset(dev); |
| Line 275... | Line 277... | ||
| 275 | } |
277 | } |
| 276 | 278 | ||
| 277 | void intel_uncore_sanitize(struct drm_device *dev) |
279 | void intel_uncore_sanitize(struct drm_device *dev) |