Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel:
drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge
+8
+4
drivers/gpu/drm/i915/i915_reg.h
+4
drivers/gpu/drm/i915/i915_reg.h
···
375
375
# define MI_FLUSH_ENABLE (1 << 11)
376
376
377
377
#define GFX_MODE 0x02520
378
+
#define GFX_MODE_GEN7 0x0229c
378
379
#define GFX_RUN_LIST_ENABLE (1<<15)
379
380
#define GFX_TLB_INVALIDATE_ALWAYS (1<<13)
380
381
#define GFX_SURFACE_FAULT_ENABLE (1<<12)
381
382
#define GFX_REPLAY_MODE (1<<11)
382
383
#define GFX_PSMI_GRANULARITY (1<<10)
383
384
#define GFX_PPGTT_ENABLE (1<<9)
385
+
386
+
#define GFX_MODE_ENABLE(bit) (((bit) << 16) | (bit))
387
+
#define GFX_MODE_DISABLE(bit) (((bit) << 16) | (0))
384
388
385
389
#define SCPD0 0x0209c /* 915+ only */
386
390
#define IER 0x020a0
+4
drivers/gpu/drm/i915/intel_ringbuffer.c
+4
drivers/gpu/drm/i915/intel_ringbuffer.c
···
290
290
if (IS_GEN6(dev) || IS_GEN7(dev))
291
291
mode |= MI_FLUSH_ENABLE << 16 | MI_FLUSH_ENABLE;
292
292
I915_WRITE(MI_MODE, mode);
293
+
if (IS_GEN7(dev))
294
+
I915_WRITE(GFX_MODE_GEN7,
295
+
GFX_MODE_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) |
296
+
GFX_MODE_ENABLE(GFX_REPLAY_MODE));
293
297
}
294
298
295
299
if (INTEL_INFO(dev)->gen >= 6) {