Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bed8cad9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5ccc3874 b095cd0a

drivers/gpu/drm/i915/i915_reg.h

+4 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ 
# define MI_FLUSH_ENABLE				(1 << 11)



#define GFX_MODE	0x02520

#define GFX_MODE_GEN7	0x0229c

#define   GFX_RUN_LIST_ENABLE		(1<<15)

#define   GFX_TLB_INVALIDATE_ALWAYS	(1<<13)

#define   GFX_SURFACE_FAULT_ENABLE	(1<<12)
@@ -382,6 +383,9 @@ 
#define   GFX_PSMI_GRANULARITY		(1<<10)

#define   GFX_PPGTT_ENABLE		(1<<9)



#define GFX_MODE_ENABLE(bit) (((bit) << 16) | (bit))

#define GFX_MODE_DISABLE(bit) (((bit) << 16) | (0))



#define SCPD0		0x0209c /* 915+ only */

#define IER		0x020a0

#define IIR		0x020a4

drivers/gpu/drm/i915/intel_ringbuffer.c

+4 −0
Original line number Diff line number Diff line
@@ -290,6 +290,10 @@ static int init_render_ring(struct intel_ring_buffer *ring) 
		if (IS_GEN6(dev) || IS_GEN7(dev))

			mode |= MI_FLUSH_ENABLE << 16 | MI_FLUSH_ENABLE;

		I915_WRITE(MI_MODE, mode);

		if (IS_GEN7(dev))

			I915_WRITE(GFX_MODE_GEN7,

				   GFX_MODE_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) |

				   GFX_MODE_ENABLE(GFX_REPLAY_MODE));

	}



	if (INTEL_INFO(dev)->gen >= 6) {