mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
99 lines
3.5 KiB
Diff
99 lines
3.5 KiB
Diff
From 04029d7c030fddf168b85e9f39f76fcc282b768b Mon Sep 17 00:00:00 2001
|
|
From: Ben Widawsky <ben@bwidawsk.net>
|
|
Date: Mon, 12 Dec 2011 19:21:58 -0800
|
|
Subject: [PATCH 106/165] drm/i915: Force sync command ordering (Gen6+)
|
|
|
|
commit 84f9f938be4156e4baea466688bd6abae1c9e6ba upstream.
|
|
|
|
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: Kenneth Graunke <kenneth@whitecape.org>
|
|
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
|
|
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
|
|
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 +++++++--
|
|
drivers/gpu/drm/i915/i915_reg.h | 1 +
|
|
drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++
|
|
3 files changed, 13 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
|
index 7d64f83..ed00f29 100644
|
|
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
|
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
|
@@ -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;
|
|
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
|
|
index 2f99fd4..beca72f 100644
|
|
--- a/drivers/gpu/drm/i915/i915_reg.h
|
|
+++ b/drivers/gpu/drm/i915/i915_reg.h
|
|
@@ -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
|
|
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
|
|
index 8673581..3c9c086 100644
|
|
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
|
|
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
|
|
@@ -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;
|
|
}
|
|
|
|
--
|
|
1.7.7.6
|
|
|