From c81d293aed94fea9c48899187016a1b28f8989d5 Mon Sep 17 00:00:00 2001 From: Micah Fedke Date: Wed, 22 Jul 2015 21:54:02 +0000 Subject: convert drm_open_any*() calls to drm_open_driver*(DRIVER_INTEL) calls with cocci Apply the new API to all call sites within the test suite using the following semantic patch: // Semantic patch for replacing drm_open_any* with arch-specific drm_open_driver* calls @@ identifier i =~ "\bdrm_open_any\b"; @@ - i() + drm_open_driver(DRIVER_INTEL) @@ identifier i =~ "\bdrm_open_any_master\b"; @@ - i() + drm_open_driver_master(DRIVER_INTEL) @@ identifier i =~ "\bdrm_open_any_render\b"; @@ - i() + drm_open_driver_render(DRIVER_INTEL) @@ identifier i =~ "\b__drm_open_any\b"; @@ - i() + __drm_open_driver(DRIVER_INTEL) Signed-off-by: Micah Fedke Signed-off-by: Thomas Wood --- tools/intel_display_poller.c | 2 +- tools/intel_gpu_frequency.c | 2 +- tools/intel_l3_parity.c | 2 +- tools/intel_perf_counters.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c index a6ae8d46..56dcd447 100644 --- a/tools/intel_display_poller.c +++ b/tools/intel_display_poller.c @@ -1045,7 +1045,7 @@ int main(int argc, char *argv[]) } } - fd = drm_open_any(); + fd = drm_open_driver(DRIVER_INTEL); devid = intel_get_drm_devid(fd); close(fd); diff --git a/tools/intel_gpu_frequency.c b/tools/intel_gpu_frequency.c index c5359c08..5ae47e77 100644 --- a/tools/intel_gpu_frequency.c +++ b/tools/intel_gpu_frequency.c @@ -308,7 +308,7 @@ int main(int argc, char *argv[]) bool write, fail, targets[MAX+1] = {false}; int i, try = 1, set_freq[MAX+1] = {0}; - devid = intel_get_drm_devid(drm_open_any()); + devid = intel_get_drm_devid(drm_open_driver(DRIVER_INTEL)); device = drm_get_card(); write = parse(argc, argv, targets, ARRAY_SIZE(targets), set_freq); diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c index a4b7d738..4810f7a9 100644 --- a/tools/intel_l3_parity.c +++ b/tools/intel_l3_parity.c @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) int row = 0, bank = 0, sbank = 0; int fd[REAL_MAX_SLICES] = {0}, ret, i; int action = '0'; - int drm_fd = drm_open_any(); + int drm_fd = drm_open_driver(DRIVER_INTEL); int daemonize = 0; devid = intel_get_drm_devid(drm_fd); diff --git a/tools/intel_perf_counters.c b/tools/intel_perf_counters.c index 739f926d..04a6aba9 100644 --- a/tools/intel_perf_counters.c +++ b/tools/intel_perf_counters.c @@ -454,7 +454,7 @@ main(int argc, char **argv) int fd; int l; - fd = drm_open_any(); + fd = drm_open_driver(DRIVER_INTEL); devid = intel_get_drm_devid(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); -- cgit v1.2.3