From 9a362919004cc330b3bbee74d1dbef2cd75c75bc Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Thu, 15 May 2025 14:29:53 -0700 Subject: [PATCH] freedreno: Fix shader-clock when kernel exposes UCHE_TRAP_BASE Fixes: 4b1b4ee10c07 ("freedreno,tu: Read and pass to compiler uche_trap_base) Signed-off-by: Rob Clark Part-of: (cherry picked from commit 65e18a84944b559419aceaf2083936cf68ac3e79) --- .pick_status.json | 2 +- src/gallium/drivers/freedreno/freedreno_screen.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 679afbdf416..5a828f6f7c9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1514,7 +1514,7 @@ "description": "freedreno: Fix shader-clock when kernel exposes UCHE_TRAP_BASE", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "4b1b4ee10c0768a5a43dee508601e4e2b39520eb", "notes": null diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index 2323d0dbfb3..19c18671bcf 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.c +++ b/src/gallium/drivers/freedreno/freedreno_screen.c @@ -923,8 +923,11 @@ fd_screen_create(int fd, if (fd_device_version(dev) >= FD_VERSION_ROBUSTNESS) screen->has_robustness = true; - if (fd_pipe_get_param(screen->pipe, FD_UCHE_TRAP_BASE, &val)) + if (fd_pipe_get_param(screen->pipe, FD_UCHE_TRAP_BASE, &val)) { screen->uche_trap_base = screen->gen >= 6 ? 0x1fffffffff000ull : 0ull; + } else { + screen->uche_trap_base = val; + } screen->has_syncobj = fd_has_syncobj(screen->dev);