Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Check current fb id before flip as well as after 

More debug sanity checks that pageflips work.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-10-23 20:52:55 +01:00
parent 90172d81ea
commit 388fd4a654
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sna/kgem.c
View File

@ -5353,7 +5353,7 @@ bool kgem_bo_is_fenced(struct kgem *kgem, struct kgem_bo *bo)
VG_CLEAR(tiling); VG_CLEAR(tiling);
tiling.handle = bo->handle; tiling.handle = bo->handle;
tiling.tiling_mode = 0; tiling.tiling_mode = bo->tiling;
(void)do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_GET_TILING, &tiling); (void)do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_GET_TILING, &tiling);
return tiling.tiling_mode == bo->tiling; /* assume pitch is fine! */ return tiling.tiling_mode == bo->tiling; /* assume pitch is fine! */
} }

22
src/sna/sna_display.c
View File

@ -564,6 +564,15 @@ static void assert_scanout(struct kgem *kgem, struct kgem_bo *bo,
#define assert_scanout(k, b, w, h) #define assert_scanout(k, b, w, h)
#endif #endif
static void assert_crtc_fb(struct sna *sna, struct sna_crtc *crtc)
{
#ifndef NDEBUG
struct drm_mode_crtc mode = { .crtc_id = __sna_crtc_id(crtc) };
drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode);
assert(mode.fb_id == fb_id(crtc->bo));
#endif
}
static unsigned get_fb(struct sna *sna, struct kgem_bo *bo, static unsigned get_fb(struct sna *sna, struct kgem_bo *bo,
int width, int height) int width, int height)
{ {
@ -6709,6 +6718,7 @@ sna_page_flip(struct sna *sna,
assert(crtc->bo->refcnt >= crtc->bo->active_scanout); assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
assert(crtc->flip_bo == NULL); assert(crtc->flip_bo == NULL);
assert_crtc_fb(sna, crtc);
if (data == NULL && crtc->bo == bo) if (data == NULL && crtc->bo == bo)
goto next_crtc; goto next_crtc;
@ -8881,6 +8891,7 @@ void sna_mode_redisplay(struct sna *sna)
sna_crtc_redisplay(crtc, &damage, bo); sna_crtc_redisplay(crtc, &damage, bo);
kgem_bo_submit(&sna->kgem, bo); kgem_bo_submit(&sna->kgem, bo);
assert_crtc_fb(sna, sna_crtc);
arg.crtc_id = __sna_crtc_id(sna_crtc); arg.crtc_id = __sna_crtc_id(sna_crtc);
arg.fb_id = get_fb(sna, bo, arg.fb_id = get_fb(sna, bo,
crtc->mode.HDisplay, crtc->mode.HDisplay,
@ -8998,6 +9009,7 @@ disable1:
assert(config->crtc[i]->enabled); assert(config->crtc[i]->enabled);
assert(crtc->flip_bo == NULL); assert(crtc->flip_bo == NULL);
assert_crtc_fb(sna, crtc);
arg.crtc_id = __sna_crtc_id(crtc); arg.crtc_id = __sna_crtc_id(crtc);
arg.user_data = (uintptr_t)crtc; arg.user_data = (uintptr_t)crtc;
@ -9213,14 +9225,6 @@ again:
assert(crtc->bo->active_scanout); assert(crtc->bo->active_scanout);
assert(crtc->bo->refcnt >= crtc->bo->active_scanout); assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
#ifndef NDEBUG
{
struct drm_mode_crtc mode = { .crtc_id = __sna_crtc_id(crtc) };
drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode);
assert(mode.fb_id == fb_id(crtc->flip_bo));
}
#endif
crtc->bo->active_scanout--; crtc->bo->active_scanout--;
kgem_bo_destroy(&sna->kgem, crtc->bo); kgem_bo_destroy(&sna->kgem, crtc->bo);
@ -9231,6 +9235,8 @@ again:
crtc->bo = crtc->flip_bo; crtc->bo = crtc->flip_bo;
crtc->flip_bo = NULL; crtc->flip_bo = NULL;
assert_crtc_fb(sna, crtc);
} else { } else {
crtc->flip_bo->active_scanout--; crtc->flip_bo->active_scanout--;
kgem_bo_destroy(&sna->kgem, crtc->flip_bo); kgem_bo_destroy(&sna->kgem, crtc->flip_bo);