Module: Mesa Branch: staging/21.2 Commit: 74e314e4ee984895fc7dbb5eeab1ed014bba7924 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=74e314e4ee984895fc7dbb5eeab1ed014bba7924
Author: Jordan Justen <[email protected]> Date: Thu Sep 16 15:40:21 2021 -0700 iris: Disable I915_FORMAT_MOD_Y_TILED_GEN12* on adl-p/display 13 Ref: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12908 Cc: mesa-stable Fixes: e435511b580 ("intel/dev: Add device info for ADL GT2") Signed-off-by: Jordan Justen <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12973> (cherry picked from commit d4174f5f052f614a10df2ebc905aec8c4897b057) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_resource.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 5bc2e440627..7ace7b4d6e2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -31,7 +31,7 @@ "description": "iris: Disable I915_FORMAT_MOD_Y_TILED_GEN12* on adl-p/display 13", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e435511b580287d1fab1b1028b2d36acce80dac9" }, diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 95af0d131ed..05c0f869243 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -97,6 +97,8 @@ modifier_is_supported(const struct intel_device_info *devinfo, case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC: if (devinfo->ver != 12) return false; + if (devinfo->display_ver != 12) + return false; break; case DRM_FORMAT_MOD_INVALID: default:
