Merge branch 'topic/revid_steppings' into drm-intel-next

Browse source

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>

...

This commit is contained in:

Matt Roper 2021-07-14 17:50:37 -07:00

parent 23bd991992 eee42141e4

commit 7ad2d09ccd

10 changed files with 120 additions and 199 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/i915/display/intel_display_power.c

View file

2

drivers/gpu/drm/i915/display/intel_dpll_mgr.c

View file

4

drivers/gpu/drm/i915/display/intel_psr.c

View file

2

drivers/gpu/drm/i915/gt/intel_region_lmem.c

View file

111

drivers/gpu/drm/i915/gt/intel_workarounds.c

View file

9

drivers/gpu/drm/i915/i915_drv.c

View file

79

drivers/gpu/drm/i915/i915_drv.h

View file

2

drivers/gpu/drm/i915/intel_pm.c

View file

104

drivers/gpu/drm/i915/intel_step.c

View file

4

drivers/gpu/drm/i915/intel_step.h

View file