Module: Mesa Branch: staging/23.2 Commit: 94d14d477f02a4c51f7de32c420a51ca737f60fc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=94d14d477f02a4c51f7de32c420a51ca737f60fc
Author: Lionel Landwerlin <[email protected]> Date: Fri Aug 25 23:42:17 2023 +0300 intel: don't assume Linux minor dev node Signed-off-by: Lionel Landwerlin <[email protected]> Cc: mesa-stable Acked-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24744> (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 e2486fcf2d0..8d0eddbfd96 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -74,7 +74,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, "notes": null diff --git a/src/gallium/drivers/iris/iris_utrace.c b/src/gallium/drivers/iris/iris_utrace.c index d9f2fbd0ba9..7e746369e05 100644 --- a/src/gallium/drivers/iris/iris_utrace.c +++ b/src/gallium/drivers/iris/iris_utrace.c @@ -183,10 +183,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_context_init(&ice->ds.trace_context, &ice->ctx, diff --git a/src/intel/ds/intel_driver_ds.cc b/src/intel/ds/intel_driver_ds.cc index 854130a3a0d..e5916cee62c 100644 --- a/src/intel/ds/intel_driver_ds.cc +++ b/src/intel/ds/intel_driver_ds.cc @@ -548,7 +548,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 a7b40366bb9..58b128cb6c6 100644 --- a/src/intel/vulkan/anv_utrace.c +++ b/src/intel/vulkan/anv_utrace.c @@ -348,7 +348,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,
