[Intel-xe] [PATCH v2 00/10] Utilize i915 display probing

Matt Roper matthew.d.roper at intel.com
Tue Jun 6 23:52:32 UTC 2023


Now that i915 has moved display IP probing into the display/ directory,
we can re-use that directly from Xe and eliminate a big chunk of Xe's
display shim.

This is mostly cherry-picks of the new i915 patches from drm-tip,
followed by an update to the Xe-specific display layer to use the new
interface.

v2:
 - Rebase on latest drm-xe-next, which has now fixed the earlier
   mis-squashing of display code.
 - Include additional cherry-pick of i915's display vs non-display
   intel_device_info_runtime_init separation.

A future step to further eliminate the display shim will be to split
i915's display-specific handling out of intel_device_info_runtime_init() 
into a function under display/ that can be called directly by Xe.

Cc: Lucas De Marchi <lucas.demarchi at intel.com>
Cc: Balasubramani Vivekanandan <balasubramani.vivekanandan at intel.com>

Matt Roper (10):
  drm/i915/display: Move display device info to header under display/
  drm/i915: Convert INTEL_INFO()->display to a pointer
  drm/i915/display: Move display runtime info to display structure
  drm/i915/display: Make display responsible for probing its own IP
  drm/i915/display: Handle GMD_ID identification in display code
  drm/i915/display: Move feature test macros to intel_display_device.h
  drm/i915/display: Include of display limits doesn't need 'display/'
  drm/i915: Fix error handling if driver creation fails during probe
  drm/i915/display: Extract display init from
    intel_device_info_runtime_init
  fixup! drm/xe/display: Implement display support

 drivers/gpu/drm/i915/Makefile                 |   2 +
 drivers/gpu/drm/i915/display/intel_color.c    |  31 +-
 drivers/gpu/drm/i915/display/intel_crtc.c     |   2 +-
 drivers/gpu/drm/i915/display/intel_cursor.c   |   4 +-
 drivers/gpu/drm/i915/display/intel_display.c  |   2 +-
 drivers/gpu/drm/i915/display/intel_display.h  |  10 +-
 .../drm/i915/display/intel_display_device.c   | 902 ++++++++++++++++++
 .../drm/i915/display/intel_display_device.h   | 129 +++
 .../drm/i915/display/intel_display_power.c    |   6 +-
 .../drm/i915/display/intel_display_reg_defs.h |  14 +-
 drivers/gpu/drm/i915/display/intel_fb_pin.c   |   2 +-
 drivers/gpu/drm/i915/display/intel_fbc.c      |   6 +-
 drivers/gpu/drm/i915/display/intel_hdcp.c     |   2 +-
 drivers/gpu/drm/i915/display/intel_hti.c      |   2 +-
 .../drm/i915/display/skl_universal_plane.c    |   2 +-
 drivers/gpu/drm/i915/display/skl_watermark.c  |   8 +-
 drivers/gpu/drm/i915/i915_driver.c            |  15 +-
 drivers/gpu/drm/i915/i915_drv.h               |  66 +-
 drivers/gpu/drm/i915/i915_pci.c               | 384 +-------
 drivers/gpu/drm/i915/i915_reg.h               |  33 -
 drivers/gpu/drm/i915/intel_device_info.c      | 192 +---
 drivers/gpu/drm/i915/intel_device_info.h      |  67 +-
 drivers/gpu/drm/i915/intel_step.c             |   8 +-
 drivers/gpu/drm/xe/Makefile                   |   2 +
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h |  40 +-
 .../drm/xe/display/ext/intel_device_info.c    |  94 +-
 drivers/gpu/drm/xe/xe_device_types.h          |  56 +-
 drivers/gpu/drm/xe/xe_display.c               | 166 +---
 28 files changed, 1199 insertions(+), 1048 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_device.c
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_device.h

-- 
2.40.1



More information about the Intel-xe mailing list