diff options
| author | Matt Roper <matthew.d.roper@intel.com> | 2021-07-14 17:54:25 -0700 |
|---|---|---|
| committer | Matt Roper <matthew.d.roper@intel.com> | 2021-07-14 17:55:21 -0700 |
| commit | d6e6ac294d91563131265fdf44537aeac2984c21 (patch) | |
| tree | 2dc8a17fc2fc57688d3feb9cad5ad2f731f13e13 /drivers/gpu/drm/i915/gt/intel_region_lmem.c | |
| parent | 8f88ca76b3942d82e2c1cea8735ec368d89ecc15 (diff) | |
| parent | eee42141e498fa3df3ce524846d52f67a92b6845 (diff) | |
Merge branch 'topic/revid_steppings' into drm-intel-gt-next
The switch from old old IS_FOO_REVID() macros to the new table-based
IS_FOO_{GT,DISP}_STEP() macros is needed on both drm-intel-next (for
display-based DMC matching) and drm-intel-gt-next (for workaround
guards). To avoid conflicts, we'll apply the patches to a topic branch
and merge it to both intel branches to ensure the transition to the
new macros is clean.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_region_lmem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c index 1f43aba2e9e2..50d11a84e7a9 100644 --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c @@ -157,7 +157,7 @@ intel_gt_setup_fake_lmem(struct intel_gt *gt) static bool get_legacy_lowmem_region(struct intel_uncore *uncore, u64 *start, u32 *size) { - if (!IS_DG1_REVID(uncore->i915, DG1_REVID_A0, DG1_REVID_B0)) + if (!IS_DG1_GT_STEP(uncore->i915, STEP_A0, STEP_B0)) return false; *start = 0; |