xf86-video-intel: 3 commits - src/sna/kgem.c src/sna/kgem_debug.c src/sna/sna_display.c src/sna/sna_dri2.c
Chris Wilson
ickle at kemper.freedesktop.org
Tue Jun 10 13:31:22 PDT 2014
src/sna/kgem.c | 39 +++++++++-
src/sna/kgem_debug.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++++-
src/sna/sna_display.c | 3
src/sna/sna_dri2.c | 10 ++
4 files changed, 241 insertions(+), 6 deletions(-)
New commits:
commit e2bfa715a9e115921263d572b9f4c496b550a494
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Jun 10 21:28:32 2014 +0100
sna/dri2: Check that the window covers the whole CRTC before xchg
Fixes TearFre regression from
commit 3932e97057fca16615adaefbc1eb25a0d51a1d8b [2.99.912]
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jun 9 08:58:15 2014 +0100
sna/dri2: Allow TearFree flipping to individual CRTC
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index dcbe622..7169779 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -332,6 +332,7 @@ static unsigned get_fb(struct sna *sna, struct kgem_bo *bo,
assert(bo->refcnt);
assert(bo->proxy == NULL);
assert(!bo->snoop);
+ assert(8*bo->pitch >= width * scrn->bitsPerPixel);
assert(height * bo->pitch <= kgem_bo_size(bo)); /* XXX crtc offset */
if (bo->delta) {
DBG(("%s: reusing fb=%d for handle=%d\n",
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 1baaf2b..e196464 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -1605,6 +1605,16 @@ can_xchg_one(struct sna *sna,
return false;
}
+ if (memcmp(&win->clipList.extents, &crtc->bounds, sizeof(crtc->bounds))) {
+ DBG(("%s: no, window [(%d, %d), (%d, %d)] does not cover CRTC [(%d, %d), (%d, %d)]\n",
+ __FUNCTION__,
+ win->clipList.extents.x1, win->clipList.extents.y1,
+ win->clipList.extents.x2, win->clipList.extents.y2,
+ crtc->bounds.x1, crtc->bounds.y1,
+ crtc->bounds.x2, crtc->bounds.y2));
+ return false;
+ }
+
if (sna_crtc_is_transformed(crtc)) {
DBG(("%s: no, CRTC is rotated\n", __FUNCTION__));
return false;
commit d0f32a9d3afed4ea45644723fa1134957b981125
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Jun 10 16:37:24 2014 +0100
sna: Cast away compiler warning
sna_display.c: In function 'has_user_backlight_override':
sna_display.c:595:3: warning: return discards 'const' qualifier from pointer target type [enabled by default]
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index e014b27..dcbe622 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -592,7 +592,7 @@ has_user_backlight_override(xf86OutputPtr output)
DBG(("%s(%s) requested %s\n", __FUNCTION__, output->name, str));
if (*str == '\0')
- return str;
+ return (char *)str;
if (backlight_exists(str) == BL_NONE) {
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
commit 216beed6dfcb3a8d6b0b480d0281fcadb0cd3036
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Jun 10 09:09:30 2014 +0100
sna: Expand debugging to cover gen8 BLT variations
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 45a2572..f29f8fd 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -90,7 +90,8 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
#define DEBUG_SYNC 0
#endif
-#define SHOW_BATCH 0
+#define SHOW_BATCH_BEFORE 0
+#define SHOW_BATCH_AFTER 0
#if 0
#define ASSERT_IDLE(kgem__, handle__) assert(!__kgem_busy(kgem__, handle__))
@@ -1793,7 +1794,6 @@ static void kgem_fixup_self_relocs(struct kgem *kgem, struct kgem_bo *bo)
}
}
-
}
static void kgem_bo_binding_free(struct kgem *kgem, struct kgem_bo *bo)
@@ -2544,6 +2544,29 @@ bool __kgem_ring_is_idle(struct kgem *kgem, int ring)
return true;
}
+#if 0
+static void kgem_commit__check_reloc(struct kgem *kgem)
+{
+ struct kgem_request *rq = kgem->next_request;
+ struct kgem_bo *bo;
+ bool has_64bit = kgem->gen >= 0100;
+ int i;
+
+ for (i = 0; i < kgem->nreloc; i++) {
+ list_for_each_entry(bo, &rq->buffers, request) {
+ if (bo->target_handle == kgem->reloc[i].target_handle) {
+ uint64_t value = 0;
+ gem_read(kgem->fd, rq->bo->handle, &value, kgem->reloc[i].offset, has_64bit ? 8 : 4);
+ assert(bo->exec->offset == -1 || value == bo->exec->offset + (int)kgem->reloc[i].delta);
+ break;
+ }
+ }
+ }
+}
+#else
+#define kgem_commit__check_reloc(kgem)
+#endif
+
#ifndef NDEBUG
static void kgem_commit__check_buffers(struct kgem *kgem)
{
@@ -2561,6 +2584,8 @@ static void kgem_commit(struct kgem *kgem)
struct kgem_request *rq = kgem->next_request;
struct kgem_bo *bo, *next;
+ kgem_commit__check_reloc(kgem);
+
list_for_each_entry_safe(bo, next, &rq->buffers, request) {
assert(next->request.prev == &bo->request);
@@ -3170,7 +3195,7 @@ void _kgem_submit(struct kgem *kgem)
kgem_finish_buffers(kgem);
-#if SHOW_BATCH
+#if SHOW_BATCH_BEFORE
__kgem_batch_debug(kgem, batch_end);
#endif
@@ -3305,6 +3330,10 @@ void _kgem_submit(struct kgem *kgem)
}
}
}
+#if SHOW_BATCH_AFTER
+ if (gem_read(kgem->fd, rq->bo->handle, kgem->batch, 0, batch_end*sizeof(uint32_t)))
+ __kgem_batch_debug(kgem, batch_end);
+#endif
kgem_commit(kgem);
if (kgem->wedged)
kgem_cleanup(kgem);
@@ -5574,6 +5603,8 @@ uint64_t kgem_add_reloc64(struct kgem *kgem,
assert(bo->rq == MAKE_REQUEST(kgem->next_request, kgem->ring));
assert(RQ_RING(bo->rq) == kgem->ring);
+ DBG(("%s[%d] = (delta=%d, target handle=%d, presumed=%llx)\n",
+ __FUNCTION__, index, delta, bo->target_handle, (long long)bo->presumed_offset));
kgem->reloc[index].delta = delta;
kgem->reloc[index].target_handle = bo->target_handle;
kgem->reloc[index].presumed_offset = bo->presumed_offset;
@@ -5585,6 +5616,8 @@ uint64_t kgem_add_reloc64(struct kgem *kgem,
delta += bo->presumed_offset;
} else {
+ DBG(("%s[%d] = (delta=%d, target handle=batch)\n",
+ __FUNCTION__, index, delta));
kgem->reloc[index].delta = delta;
kgem->reloc[index].target_handle = ~0U;
kgem->reloc[index].presumed_offset = 0;
diff --git a/src/sna/kgem_debug.c b/src/sna/kgem_debug.c
index 48c7588..d90e543 100644
--- a/src/sna/kgem_debug.c
+++ b/src/sna/kgem_debug.c
@@ -192,7 +192,7 @@ decode_mi(struct kgem *kgem, uint32_t offset)
}
static int
-decode_2d(struct kgem *kgem, uint32_t offset)
+__decode_2d(struct kgem *kgem, uint32_t offset)
{
static const struct {
uint32_t opcode;
@@ -369,9 +369,199 @@ decode_2d(struct kgem *kgem, uint32_t offset)
return 1;
}
+static int
+__decode_2d_gen8(struct kgem *kgem, uint32_t offset)
+{
+ static const struct {
+ uint32_t opcode;
+ int min_len;
+ int max_len;
+ const char *name;
+ } opcodes[] = {
+ { 0x43, 8, 8, "SRC_COPY_BLT" },
+ { 0x01, 8, 8, "XY_SETUP_BLT" },
+ { 0x11, 10, 10, "XY_SETUP_MONO_PATTERN_SL_BLT" },
+ { 0x03, 3, 3, "XY_SETUP_CLIP_BLT" },
+ { 0x24, 2, 2, "XY_PIXEL_BLT" },
+ { 0x25, 3, 3, "XY_SCANLINES_BLT" },
+ { 0x26, 4, 4, "Y_TEXT_BLT" },
+ { 0x31, 5, 134, "XY_TEXT_IMMEDIATE_BLT" },
+ { 0x50, 7, 7, "XY_COLOR_BLT" },
+ { 0x51, 6, 6, "XY_PAT_BLT" },
+ { 0x76, 8, 8, "XY_PAT_CHROMA_BLT" },
+ { 0x72, 7, 135, "XY_PAT_BLT_IMMEDIATE" },
+ { 0x77, 9, 137, "XY_PAT_CHROMA_BLT_IMMEDIATE" },
+ { 0x52, 9, 9, "XY_MONO_PAT_BLT" },
+ { 0x59, 7, 7, "XY_MONO_PAT_FIXED_BLT" },
+ { 0x53, 8, 8, "XY_SRC_COPY_BLT" },
+ { 0x54, 8, 8, "XY_MONO_SRC_COPY_BLT" },
+ { 0x71, 9, 137, "XY_MONO_SRC_COPY_IMMEDIATE_BLT" },
+ { 0x55, 9, 9, "XY_FULL_BLT" },
+ { 0x55, 9, 137, "XY_FULL_IMMEDIATE_PATTERN_BLT" },
+ { 0x56, 9, 9, "XY_FULL_MONO_SRC_BLT" },
+ { 0x75, 10, 138, "XY_FULL_MONO_SRC_IMMEDIATE_PATTERN_BLT" },
+ { 0x57, 12, 12, "XY_FULL_MONO_PATTERN_BLT" },
+ { 0x58, 12, 12, "XY_FULL_MONO_PATTERN_MONO_SRC_BLT" },
+ };
+
+ unsigned int op, len;
+ const char *format = NULL;
+ uint32_t *data = kgem->batch + offset;
+ struct drm_i915_gem_relocation_entry *reloc;
+
+ /* Special case the two most common ops that we detail in full */
+ switch ((data[0] & 0x1fc00000) >> 22) {
+ case 0x50:
+ kgem_debug_print(data, offset, 0,
+ "XY_COLOR_BLT (rgb %sabled, alpha %sabled, dst tile %d)\n",
+ (data[0] & (1 << 20)) ? "en" : "dis",
+ (data[0] & (1 << 21)) ? "en" : "dis",
+ (data[0] >> 11) & 1);
+
+ len = (data[0] & 0x000000ff) + 2;
+ assert(len == 7);
+
+ switch ((data[1] >> 24) & 0x3) {
+ case 0:
+ format="8";
+ break;
+ case 1:
+ format="565";
+ break;
+ case 2:
+ format="1555";
+ break;
+ case 3:
+ format="8888";
+ break;
+ }
+
+ kgem_debug_print(data, offset, 1, "format %s, rop %x, pitch %d, "
+ "clipping %sabled\n", format,
+ (data[1] >> 16) & 0xff,
+ (short)(data[1] & 0xffff),
+ data[1] & (1 << 30) ? "en" : "dis");
+ kgem_debug_print(data, offset, 2, "(%d,%d)\n",
+ data[2] & 0xffff, data[2] >> 16);
+ kgem_debug_print(data, offset, 3, "(%d,%d)\n",
+ data[3] & 0xffff, data[3] >> 16);
+ reloc = kgem_debug_get_reloc_entry(kgem, offset+4);
+ kgem_debug_print(data, offset, 4, "dst offset 0x%016llx [handle=%d, delta=%d, read=%x, write=%x (fenced? %d, tiling? %d)]\n",
+ (long long)*(uint64_t *)&data[4],
+ reloc->target_handle, reloc->delta,
+ reloc->read_domains, reloc->write_domain,
+ kgem_debug_handle_is_fenced(kgem, reloc->target_handle),
+ kgem_debug_handle_tiling(kgem, reloc->target_handle));
+ kgem_debug_print(data, offset, 6, "color\n");
+ return len;
+
+ case 0x53:
+ kgem_debug_print(data, offset, 0,
+ "XY_SRC_COPY_BLT (rgb %sabled, alpha %sabled, "
+ "src tile %d, dst tile %d)\n",
+ (data[0] & (1 << 20)) ? "en" : "dis",
+ (data[0] & (1 << 21)) ? "en" : "dis",
+ (data[0] >> 15) & 1,
+ (data[0] >> 11) & 1);
+
+ len = (data[0] & 0x000000ff) + 2;
+ assert(len == 10);
+
+ switch ((data[1] >> 24) & 0x3) {
+ case 0:
+ format="8";
+ break;
+ case 1:
+ format="565";
+ break;
+ case 2:
+ format="1555";
+ break;
+ case 3:
+ format="8888";
+ break;
+ }
+
+ kgem_debug_print(data, offset, 1, "format %s, rop %x, dst pitch %d, "
+ "clipping %sabled\n", format,
+ (data[1] >> 16) & 0xff,
+ (short)(data[1] & 0xffff),
+ data[1] & (1 << 30) ? "en" : "dis");
+ kgem_debug_print(data, offset, 2, "dst (%d,%d)\n",
+ data[2] & 0xffff, data[2] >> 16);
+ kgem_debug_print(data, offset, 3, "dst (%d,%d)\n",
+ data[3] & 0xffff, data[3] >> 16);
+ reloc = kgem_debug_get_reloc_entry(kgem, offset+4);
+ assert(reloc);
+ kgem_debug_print(data, offset, 4, "dst offset 0x%016llx [handle=%d, delta=%d, read=%x, write=%x, (fenced? %d, tiling? %d)]\n",
+ (long long)*(uint64_t *)&data[4],
+ reloc->target_handle, reloc->delta,
+ reloc->read_domains, reloc->write_domain,
+ kgem_debug_handle_is_fenced(kgem, reloc->target_handle),
+ kgem_debug_handle_tiling(kgem, reloc->target_handle));
+
+ kgem_debug_print(data, offset, 6, "src (%d,%d)\n",
+ data[6] & 0xffff, data[6] >> 16);
+ kgem_debug_print(data, offset, 7, "src pitch %d\n",
+ (short)(data[7] & 0xffff));
+ reloc = kgem_debug_get_reloc_entry(kgem, offset+8);
+ assert(reloc);
+ kgem_debug_print(data, offset, 8, "src offset 0x%016llx [handle=%d, delta=%d, read=%x, write=%x (fenced? %d, tiling? %d)]\n",
+ (long long)*(uint64_t *)&data[8],
+ reloc->target_handle, reloc->delta,
+ reloc->read_domains, reloc->write_domain,
+ kgem_debug_handle_is_fenced(kgem, reloc->target_handle),
+ kgem_debug_handle_tiling(kgem, reloc->target_handle));
+
+ return len;
+ }
+
+ for (op = 0; op < ARRAY_SIZE(opcodes); op++) {
+ if ((data[0] & 0x1fc00000) >> 22 == opcodes[op].opcode) {
+ unsigned int i;
+
+ len = 1;
+ kgem_debug_print(data, offset, 0, "%s\n", opcodes[op].name);
+ if (opcodes[op].max_len > 1) {
+ len = (data[0] & 0x000000ff) + 2;
+ assert(len >= opcodes[op].min_len &&
+ len <= opcodes[op].max_len);
+ }
+
+ for (i = 1; i < len; i++)
+ kgem_debug_print(data, offset, i, "dword %d\n", i);
+
+ return len;
+ }
+ }
+
+ kgem_debug_print(data, offset, 0, "2D UNKNOWN\n");
+ assert(0);
+ return 1;
+}
+
+static int (*decode_2d(int gen))(struct kgem*, uint32_t)
+{
+ if (gen >= 0100)
+ return __decode_2d_gen8;
+ else
+ return __decode_2d;
+}
+
+static int kgem_nop_decode_3d(struct kgem *kgem, uint32_t offset)
+{
+ uint32_t *data = kgem->batch + offset;
+ return (data[0] & 0xf) + 2;
+}
+
+static void kgem_nop_finish_state(struct kgem *kgem)
+{
+}
+
static int (*decode_3d(int gen))(struct kgem*, uint32_t)
{
if (gen >= 0100) {
+ return kgem_nop_decode_3d;
} else if (gen >= 070) {
return kgem_gen7_decode_3d;
} else if (gen >= 060) {
@@ -391,6 +581,7 @@ static int (*decode_3d(int gen))(struct kgem*, uint32_t)
static void (*finish_state(int gen))(struct kgem*)
{
if (gen >= 0100) {
+ return kgem_nop_finish_state;
} else if (gen >= 070) {
return kgem_gen7_finish_state;
} else if (gen >= 060) {
@@ -412,7 +603,7 @@ void __kgem_batch_debug(struct kgem *kgem, uint32_t nbatch)
int (*const decode[])(struct kgem *, uint32_t) = {
decode_mi,
decode_nop,
- decode_2d,
+ decode_2d(kgem->gen),
decode_3d(kgem->gen),
};
uint32_t offset = 0;
More information about the xorg-commit
mailing list