From 552ac035f01fb3a173056442ca719477d77d394d Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 21 Jun 2023 15:22:39 +0100 Subject: [PATCH] asahi: drop unnecessary DRM_FORMAT_MOD_{LINEAR,INVALID} fallbacks Since afe134a49c ("asahi: Drop macOS backend"), `drm_fourcc.h` is unconditionally included, meaning these defines are now dead code. Fixes: afe134a49c5ef79ca612 ("asahi: Drop macOS backend") Signed-off-by: Eric Engestrom Part-of: (cherry picked from commit 63f44951ac4b4055b4137f57ef10c5fb078bf35e) --- .pick_status.json | 2 +- src/gallium/drivers/asahi/agx_pipe.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 342b175bf3d..27175d7b13d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1885,7 +1885,7 @@ "description": "asahi: drop unnecessary DRM_FORMAT_MOD_{LINEAR,INVALID} fallbacks", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "afe134a49c5ef79ca6125f0263331b440b9c0e49" }, diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c index cc29a79480e..f1fab000535 100644 --- a/src/gallium/drivers/asahi/agx_pipe.c +++ b/src/gallium/drivers/asahi/agx_pipe.c @@ -40,12 +40,6 @@ #include "agx_state.h" /* Fake values, pending UAPI upstreaming */ -#ifndef DRM_FORMAT_MOD_LINEAR -#define DRM_FORMAT_MOD_LINEAR 1 -#endif -#ifndef DRM_FORMAT_MOD_INVALID -#define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1) -#endif #ifndef DRM_FORMAT_MOD_APPLE_TWIDDLED #define DRM_FORMAT_MOD_APPLE_TWIDDLED (2) #endif