Module: Mesa Branch: staging/22.2 Commit: 51cd3f89a170657a94c1c55e1630d401755ee0fb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=51cd3f89a170657a94c1c55e1630d401755ee0fb
Author: Kenneth Graunke <[email protected]> Date: Wed Apr 27 02:08:48 2022 -0700 iris: Delete unused iris_screen::aperture_bytes field This was effectively removed in bb3545a6, but the field wasn't deleted, leaving it there to troll people. screen->aperture_bytes is 0? What? Fixes: bb3545a6ee4 ("intel: Store the aperture size in devinfo.") Reviewed-by: Dave Airlie <[email protected]> Tested-by: Mark Janes [email protected] Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18311> (cherry picked from commit 6a1f7e623f776a8b4c0d4f43736469143b4f37ef) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_screen.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 92d9e9643b2..77b0360a447 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -7807,7 +7807,7 @@ "description": "iris: Delete unused iris_screen::aperture_bytes field", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "bb3545a6ee419c4802ac4153eb690a93dc2f339d" }, diff --git a/src/gallium/drivers/iris/iris_screen.h b/src/gallium/drivers/iris/iris_screen.h index c62322cd142..f3ad63209bc 100644 --- a/src/gallium/drivers/iris/iris_screen.h +++ b/src/gallium/drivers/iris/iris_screen.h @@ -188,8 +188,6 @@ struct iris_screen { unsigned kernel_features; #define KERNEL_HAS_WAIT_FOR_SUBMIT (1<<0) - uint64_t aperture_bytes; - /** * Last sequence number allocated by the cache tracking mechanism. *
