Merge tag 'topic/adl-s-enabling-2021-02-01-1' of git://anongit.freedesktop.org/drm...
authorJani Nikula <jani.nikula@intel.com>
Tue, 2 Feb 2021 10:50:04 +0000 (12:50 +0200)
committerJani Nikula <jani.nikula@intel.com>
Tue, 2 Feb 2021 10:50:04 +0000 (12:50 +0200)
commit29e92559013360c43886e7fb229ed12fd96f46ef
tree360c69b98d070ee1c0633fa9e373d92c8b6d47c1
parent6ee8d381257891c7fd2d620e9d2db1be9f0f7bf5
parent4043277ad18fc7cb9a79d0d043063fb5f42a6f06
Merge tag 'topic/adl-s-enabling-2021-02-01-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next

Driver Changes:
  - Add basic support for Alder Lake S, to be shared between
  drm-intel-next and drm-intel-gt-next

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
# Conflicts:
# drivers/gpu/drm/i915/i915_drv.h
From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210202025620.2212559-1-lucas.demarchi@intel.com
13 files changed:
drivers/gpu/drm/i915/display/intel_bios.c
drivers/gpu/drm/i915/display/intel_bw.c
drivers/gpu/drm/i915/display/intel_ddi.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_power.c
drivers/gpu/drm/i915/display/intel_hdmi.c
drivers/gpu/drm/i915/display/intel_psr.c
drivers/gpu/drm/i915/display/intel_sprite.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_pch.c
drivers/gpu/drm/i915/intel_pm.c