From 0eadf638e4e11394adcb574b986f5dea077d4a4c Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 8 Mar 2016 09:18:45 +0100 Subject: lib: Rename is_intel to has_known_intel_chipset As it reflects more clearly what the function actually does. Suggested-by: Chris Wilson Signed-off-by: Tomeu Vizoso Reviewed-by: Daniel Stone Acked-by: Daniel Vetter --- lib/drmtest.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/drmtest.c') diff --git a/lib/drmtest.c b/lib/drmtest.c index 01e874b7..02ba57ee 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -110,7 +110,7 @@ static bool is_vc4_device(int fd) return !ret && strcmp("vc4", name) == 0; } -static bool is_intel(int fd) +static bool has_known_intel_chipset(int fd) { struct drm_i915_getparam gp; int devid = 0; @@ -199,7 +199,7 @@ int drm_get_card(void) if (fd == -1) continue; - if (!is_i915_device(fd) || !is_intel(fd)) { + if (!is_i915_device(fd) || !has_known_intel_chipset(fd)) { close(fd); continue; } @@ -234,7 +234,9 @@ int __drm_open_driver(int chipset) if (fd == -1) continue; - found_intel = is_i915_device(fd) && is_intel(fd) && (chipset & DRIVER_INTEL); + found_intel = is_i915_device(fd) && + has_known_intel_chipset(fd) && + (chipset & DRIVER_INTEL); found_vc4 = is_vc4_device(fd) && (chipset & DRIVER_VC4); @@ -265,7 +267,7 @@ static int __drm_open_driver_render(int chipset) if (fd == -1) continue; - if (!is_i915_device(fd) || !is_intel(fd)) { + if (!is_i915_device(fd) || !has_known_intel_chipset(fd)) { close(fd); fd = -1; continue; -- cgit v1.2.3