flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 10:26:12 +00:00
Code Issues Releases Wiki Activity

lib: Call intel_get_drm_devid only from intel code

Browse Source 
It only makes sense when testing the i915 driver, so don't call it
otherwise.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Tomeu Vizoso 2016-02-24 08:39:53 +01:00 committed by Daniel Stone
parent 644f364da2
commit 85a1d45c4a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/igt_fb.c
View File

@ -76,15 +76,14 @@ static struct format_desc_struct {
static void igt_get_fb_tile_size(int fd, uint64_t tiling, int fb_bpp, static void igt_get_fb_tile_size(int fd, uint64_t tiling, int fb_bpp,
unsigned *width_ret, unsigned *height_ret) unsigned *width_ret, unsigned *height_ret)
{ {
uint32_t devid = intel_get_drm_devid(fd);
switch (tiling) { switch (tiling) {
case LOCAL_DRM_FORMAT_MOD_NONE: case LOCAL_DRM_FORMAT_MOD_NONE:
*width_ret = 64; *width_ret = 64;
*height_ret = 1; *height_ret = 1;
break; break;
case LOCAL_I915_FORMAT_MOD_X_TILED: case LOCAL_I915_FORMAT_MOD_X_TILED:
if (intel_gen(devid) == 2) { igt_require_intel(fd);
if (intel_gen(intel_get_drm_devid(fd)) == 2) {
*width_ret = 128; *width_ret = 128;
*height_ret = 16; *height_ret = 16;
} else { } else {
@ -93,10 +92,11 @@ static void igt_get_fb_tile_size(int fd, uint64_t tiling, int fb_bpp,
} }
break; break;
case LOCAL_I915_FORMAT_MOD_Y_TILED: case LOCAL_I915_FORMAT_MOD_Y_TILED:
if (intel_gen(devid) == 2) { igt_require_intel(fd);
if (intel_gen(intel_get_drm_devid(fd)) == 2) {
*width_ret = 128; *width_ret = 128;
*height_ret = 16; *height_ret = 16;
} else if (IS_915(devid)) { } else if (IS_915(intel_get_drm_devid(fd))) {
*width_ret = 512; *width_ret = 512;
*height_ret = 8; *height_ret = 8;
} else { } else {
@ -105,6 +105,7 @@ static void igt_get_fb_tile_size(int fd, uint64_t tiling, int fb_bpp,
} }
break; break;
case LOCAL_I915_FORMAT_MOD_Yf_TILED: case LOCAL_I915_FORMAT_MOD_Yf_TILED:
igt_require_intel(fd);
switch (fb_bpp) { switch (fb_bpp) {
case 8: case 8:
*width_ret = 64; *width_ret = 64;
@ -150,8 +151,8 @@ void igt_calc_fb_size(int fd, int width, int height, int bpp, uint64_t tiling,
igt_get_fb_tile_size(fd, tiling, bpp, &tile_width, &tile_height); igt_get_fb_tile_size(fd, tiling, bpp, &tile_width, &tile_height);
if (intel_gen(intel_get_drm_devid(fd)) <= 3 && if (tiling != LOCAL_DRM_FORMAT_MOD_NONE &&
tiling != LOCAL_DRM_FORMAT_MOD_NONE) { intel_gen(intel_get_drm_devid(fd)) <= 3) {
int v; int v;
/* Round the tiling up to the next power-of-two and the region /* Round the tiling up to the next power-of-two and the region