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

sna: Detect Y-tiled scanout feature 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-03-24 21:05:58 +00:00
parent 019402f8ca
commit d377fd3d11
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/sna/kgem.c
View File

@ -84,6 +84,7 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
#define DBG_NO_HANDLE_LUT 0
#define DBG_NO_WT 0
#define DBG_NO_WC_MMAP 0
#define DBG_NO_SCANOUT_Y 0
#define DBG_DUMP 0
#define DBG_NO_MALLOC_CACHE 0
@ -1231,6 +1232,30 @@ static bool test_has_create2(struct kgem *kgem)
#endif
}
static bool test_can_scanout_y(struct kgem *kgem)
{
struct drm_mode_fb_cmd arg;
bool ret = false;
if (DBG_NO_SCANOUT_Y)
return false;
VG_CLEAR(arg);
arg.width = 32;
arg.height = 32;
arg.pitch = 4*32;
arg.bpp = 32;
arg.depth = 24;
arg.handle = gem_create(kgem->fd, 1);
if (gem_set_tiling(kgem->fd, arg.handle, I915_TILING_Y, arg.pitch))
ret = do_ioctl(kgem->fd, DRM_IOCTL_MODE_ADDFB, &arg) == 0;
do_ioctl(kgem->fd, DRM_IOCTL_MODE_RMFB, &arg.fb_id);
gem_close(kgem->fd, arg.handle);
return ret;
}
static bool test_has_secure_batches(struct kgem *kgem)
{
if (DBG_NO_SECURE_BATCHES)
@ -1604,6 +1629,10 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
DBG(("%s: can render to Y-tiled surfaces? %d\n", __FUNCTION__,
kgem->can_render_y));
kgem->can_scanout_y = test_can_scanout_y(kgem);
DBG(("%s: can render to Y-tiled surfaces? %d\n", __FUNCTION__,
kgem->can_scanout_y));
kgem->has_secure_batches = test_has_secure_batches(kgem);
DBG(("%s: can use privileged batchbuffers? %d\n", __FUNCTION__,
kgem->has_secure_batches));

1
src/sna/kgem.h
View File

@ -190,6 +190,7 @@ struct kgem {
uint32_t can_blt_cpu :1;
uint32_t can_render_y :1;
uint32_t can_scanout_y :1;
uint16_t fence_max;
uint16_t half_cpu_cache_pages;

1
src/sna/sna_present.c
View File

@ -583,6 +583,7 @@ get_flip_bo(PixmapPtr pixmap)
}
if (priv->gpu_bo->tiling == I915_TILING_Y &&
!sna->kgem.can_scanout_y &&
!sna_pixmap_change_tiling(pixmap, I915_TILING_X)) {
DBG(("%s: invalid Y-tiling, cannot convert\n", __FUNCTION__));
return NULL;