From 254ba0ecd3e73cb866bd13de5d759c42e5bd64a8 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 25 Aug 2023 23:42:17 +0300 Subject: [PATCH] intel: don't assume Linux minor dev node Signed-off-by: Lionel Landwerlin Cc: mesa-stable Acked-by: Emma Anholt Part-of: (cherry picked from commit a851dc5e3c08763151d110aab5f58949e9ce4d3f) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_utrace.c | 5 +---- src/intel/ds/intel_driver_ds.cc | 1 - src/intel/vulkan/anv_utrace.c | 2 +- src/intel/vulkan_hasvk/anv_utrace.c | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c3d64572814..2eae331897a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -850,7 +850,7 @@ "description": "intel: don't assume Linux minor dev node", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/iris/iris_utrace.c b/src/gallium/drivers/iris/iris_utrace.c index 415a4f416e5..4943a63a626 100644 --- a/src/gallium/drivers/iris/iris_utrace.c +++ b/src/gallium/drivers/iris/iris_utrace.c @@ -111,10 +111,7 @@ void iris_utrace_init(struct iris_context *ice) else minor = 0; - /* We could be dealing with /dev/dri/card0 or /dev/dri/renderD128 so to get - * a GPU ID we % 128 the minor number. - */ - intel_ds_device_init(&ice->ds, screen->devinfo, screen->fd, minor % 128, + intel_ds_device_init(&ice->ds, screen->devinfo, screen->fd, minor, INTEL_DS_API_OPENGL); u_trace_pipe_context_init(&ice->ds.trace_context, &ice->ctx, iris_utrace_record_ts, diff --git a/src/intel/ds/intel_driver_ds.cc b/src/intel/ds/intel_driver_ds.cc index d9287a87b34..21a186fc317 100644 --- a/src/intel/ds/intel_driver_ds.cc +++ b/src/intel/ds/intel_driver_ds.cc @@ -543,7 +543,6 @@ intel_ds_device_init(struct intel_ds_device *device, { memset(device, 0, sizeof(*device)); - assert(gpu_id < 128); device->gpu_id = gpu_id; device->gpu_clock_id = intel_pps_clock_id(gpu_id); device->fd = drm_fd; diff --git a/src/intel/vulkan/anv_utrace.c b/src/intel/vulkan/anv_utrace.c index 486f9c1f6d9..99dfc50d4ae 100644 --- a/src/intel/vulkan/anv_utrace.c +++ b/src/intel/vulkan/anv_utrace.c @@ -288,7 +288,7 @@ anv_device_utrace_init(struct anv_device *device) { anv_bo_pool_init(&device->utrace_bo_pool, device, "utrace"); intel_ds_device_init(&device->ds, device->info, device->fd, - device->physical->local_minor - 128, + device->physical->local_minor, INTEL_DS_API_VULKAN); u_trace_context_init(&device->ds.trace_context, &device->ds, diff --git a/src/intel/vulkan_hasvk/anv_utrace.c b/src/intel/vulkan_hasvk/anv_utrace.c index d78ab07efba..5b2289d2871 100644 --- a/src/intel/vulkan_hasvk/anv_utrace.c +++ b/src/intel/vulkan_hasvk/anv_utrace.c @@ -271,7 +271,7 @@ anv_device_utrace_init(struct anv_device *device) { anv_bo_pool_init(&device->utrace_bo_pool, device, "utrace"); intel_ds_device_init(&device->ds, device->info, device->fd, - device->physical->local_minor - 128, + device->physical->local_minor, INTEL_DS_API_VULKAN); u_trace_context_init(&device->ds.trace_context, &device->ds,