diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-08-12 19:52:10 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-08-12 19:52:10 -0700 |
| commit | 3c0232c76029b92aee02037b09da588a7a8b440e (patch) | |
| tree | 26145d6b29a83214eb28f8a9fc289ccd2574a7bb /patches/collateral-evolutions/drm | |
| parent | f3194b4f935ab2691511c04084fa69ef19a12e4d (diff) | |
backports: refresh patches for v3.11-rc5
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/drm')
| -rw-r--r-- | patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch index 9722df0c..082194d1 100644 --- a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch +++ b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4184,8 +4184,10 @@ i915_gem_init_hw(struct drm_device *dev) +@@ -4154,8 +4154,10 @@ i915_gem_init_hw(struct drm_device *dev) drm_i915_private_t *dev_priv = dev->dev_private; int ret; @@ -9,5 +9,5 @@ return -EIO; +#endif - if (dev_priv->ellc_size) - I915_WRITE(HSW_IDICR, I915_READ(HSW_IDICR) | IDIHASHMSK(0xf)); + if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1)) + I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000); |