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