From: Jani Nikula Date: Mon, 2 Jan 2023 09:31:03 +0000 (+0200) Subject: Merge drm/drm-next into drm-intel-next X-Git-Tag: v6.3-rc1~135^2~24^2~10 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/0d8eae7b124e2ddaee00f186fe922450faad0ed7 Merge drm/drm-next into drm-intel-next Sync up with v6.2-rc1. Signed-off-by: Jani Nikula --- 0d8eae7b124e2ddaee00f186fe922450faad0ed7 diff --cc drivers/gpu/drm/i915/i915_drv.h index 05b84196216c,a380db36d52c..360743a8a163 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@@ -727,10 -722,10 +724,14 @@@ IS_SUBPLATFORM(const struct drm_i915_pr #define IS_XEHPSDV_GRAPHICS_STEP(__i915, since, until) \ (IS_XEHPSDV(__i915) && IS_GRAPHICS_STEP(__i915, since, until)) + #define IS_MTL_GRAPHICS_STEP(__i915, variant, since, until) \ + (IS_SUBPLATFORM(__i915, INTEL_METEORLAKE, INTEL_SUBPLATFORM_##variant) && \ + IS_GRAPHICS_STEP(__i915, since, until)) + +#define IS_MTL_DISPLAY_STEP(__i915, since, until) \ + (IS_METEORLAKE(__i915) && \ + IS_DISPLAY_STEP(__i915, since, until)) + /* * DG2 hardware steppings are a bit unusual. The hardware design was forked to * create three variants (G10, G11, and G12) which each have distinct