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

Commit 84f9f938 authored by Ben Widawsky's avatar Ben Widawsky Committed by Keith Packard
Browse files

drm/i915: Force sync command ordering (Gen6+) 



The docs say this is required for Gen7, and since the bit was added for
Gen6, we are also setting it there pit pf paranoia. Particularly as
Chris points out, if PIPE_CONTROL counts as a 3d state packet.

This was found through doc inspection by Ken and applies to Gen6+;

Reported-by: default avatarKenneth Graunke <kenneth@whitecape.org>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent e2971bda

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+7 −2
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
	struct intel_ring_buffer *ring;

	u32 exec_start, exec_len;

	u32 seqno;

	u32 mask;

	int ret, mode, i;



	if (!i915_gem_check_execbuffer(args)) {
@@ -1021,6 +1022,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
	}



	mode = args->flags & I915_EXEC_CONSTANTS_MASK;

	mask = I915_EXEC_CONSTANTS_MASK;

	switch (mode) {

	case I915_EXEC_CONSTANTS_REL_GENERAL:

	case I915_EXEC_CONSTANTS_ABSOLUTE:
@@ -1033,6 +1035,10 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
			if (INTEL_INFO(dev)->gen > 5 &&

			    mode == I915_EXEC_CONSTANTS_REL_SURFACE)

				return -EINVAL;



			/* The HW changed the meaning on this bit on gen6 */

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

				mask &= ~I915_EXEC_CONSTANTS_REL_SURFACE;

		}

		break;

	default:
@@ -1172,8 +1178,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
		intel_ring_emit(ring, MI_NOOP);

		intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1));

		intel_ring_emit(ring, INSTPM);

		intel_ring_emit(ring,

				I915_EXEC_CONSTANTS_MASK << 16 | mode);

		intel_ring_emit(ring, mask << 16 | mode);

		intel_ring_advance(ring);



		dev_priv->relative_constants_mode = mode;

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ 
#define   INSTPM_AGPBUSY_DIS (1<<11) /* gen3: when disabled, pending interrupts

					will not assert AGPBUSY# and will only

					be delivered when out of C3. */

#define   INSTPM_FORCE_ORDERING				(1<<7) /* GEN6+ */

#define ACTHD	        0x020c8

#define FW_BLC		0x020d8

#define FW_BLC2		0x020dc

drivers/gpu/drm/i915/intel_ringbuffer.c

+5 −0
Original line number Diff line number Diff line
@@ -414,6 +414,11 @@ static int init_render_ring(struct intel_ring_buffer *ring) 
			return ret;

	}



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

		I915_WRITE(INSTPM,

			   INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);

	}



	return ret;

}