]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'topic/revid_steppings' into drm-intel-next
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 15 Jul 2021 00:50:37 +0000 (17:50 -0700)
committerMatt Roper <matthew.d.roper@intel.com>
Thu, 15 Jul 2021 00:57:51 +0000 (17:57 -0700)
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>
1  2 
drivers/gpu/drm/i915/display/intel_display_power.c
drivers/gpu/drm/i915/display/intel_psr.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_pm.c

Simple merge
Simple merge