Skip to content

i915: Move display identification/probing under display/

Matt Roper intel-gfx 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest6 patches 1 replyIn review
  2. v26 patches 11 repliesSuperseded
  3. v15 patches 9 repliesSuperseded

Changes in v3 from the cover letter

- Use DISPLAY_INFO() in a few more places. (Andrzej)
- Redefine INTEL_VGA_DEVICE/INTEL_QUANTA_DEVICE in display probe to simplify code.
- Minor style cleanups (empty struct init syntax, explicit memcpy rather than "=," pass drm_i915_private instead of drm_device, whitespace/alignment tweaks, etc).

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6drm/i915/display: Move display device info to header under display/drivers/gpu/drm/i915/display/intel_display_device.h drivers/gpu/drm/i915/intel_device_info.h+62 -470 replies
2/6drm/i915: Convert INTEL_INFO()->display to a pointerdrivers/gpu/drm/i915/display/intel_color.c drivers/gpu/drm/i915/display/intel_cursor.c drivers/gpu/drm/i915/display/intel_display.h +9 more+452 -2310 replies
3/6drm/i915/display: Move display runtime info to display structuredrivers/gpu/drm/i915/display/intel_crtc.c drivers/gpu/drm/i915/display/intel_cursor.c drivers/gpu/drm/i915/display/intel_display.c +10 more+267 -1750 replies
4/6drm/i915/display: Make display responsible for probing its own IPdrivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/display/intel_display_device.c drivers/gpu/drm/i915/display/intel_display_device.h +3 more+729 -7020 replies
5/6drm/i915/display: Handle GMD_ID identification in display codedrivers/gpu/drm/i915/display/intel_display_device.c drivers/gpu/drm/i915/display/intel_display_device.h drivers/gpu/drm/i915/i915_driver.c +1 more+84 -160 replies
6/6drm/i915/display: Move feature test macros to intel_display_device.hdrivers/gpu/drm/i915/display/intel_display_device.h drivers/gpu/drm/i915/i915_drv.h+39 -600 replies

Reviews trailers per patch

All 6 patches have a Reviewed-by or Acked-by.

PatchAndrzej HajdaLucas De MarchiJani Nikula
1/6R-b R-b
2/6R-b A-b A-b
3/6R-b A-b
4/6R-b A-b
5/6R-b
6/6R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [Intel-gfx] [CI v3 0/6] i915: Move display identification/probing under display/

Since i915's display code will soon be shared by two DRM drivers (i915 and Xe), it makes sense for the display code itself to be responsible for recognizing the platform it's running on rather than relying on the making the top-level DRM driver handle this. This also becomes more important for all platforms MTL and beyond where we're not really supposed to identify platform behavior by PCI device ID anymore, but rather by the hardware IP version reported by the device through the GMD_ID register.

This series creates a more well-defined split between display and non-display deviceinfo/runtimeinfo and then moves the definition of the display-specific feature flags under the display/ code. Finally, it switches MTL (and all future platforms), to select the display feature flags based on the hardware's GMD_ID identification.

v2:
- Move DISPLAY_INFO() definition one patch earlier. (Andrzej)
- Rename display's runtime default structure to __runtime_defaults to make it more clear what the purpose is. (Andrzej)
- Simplify copy of runtime defaults to per-device runtime data. (Andrzej)
- Fix uninitialized ptr use on error path during device probe. (lkp)
- Add extra patch moving display-specific feature test macros to display/intel_display_device.h

v3:
- Use DISPLAY_INFO() in a few more places. (Andrzej)
- Redefine INTEL_VGA_DEVICE/INTEL_QUANTA_DEVICE in display probe to simplify code.
- Minor style cleanups (empty struct init syntax, explicit memcpy rather than "=," pass drm_i915_private instead of drm_device, whitespace/alignment tweaks, etc).

Cc Jani Nikula <[email protected]>
Cc Lucas De Marchi <[email protected]>
Cc Andrzej Hajda <[email protected]>

Matt Roper (6):
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

 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   | 775 ++++++++++++++++++
 .../drm/i915/display/intel_display_device.h   | 128 +++
 .../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            |  17 +-
 drivers/gpu/drm/i915/i915_drv.h               |  65 +-
 drivers/gpu/drm/i915/i915_pci.c               | 382 +--------
 drivers/gpu/drm/i915/i915_reg.h               |  33 -
 drivers/gpu/drm/i915/intel_device_info.c      | 116 +--
 drivers/gpu/drm/i915/intel_device_info.h      |  67 +-
 drivers/gpu/drm/i915/intel_step.c             |   8 +-
 23 files changed, 1043 insertions(+), 641 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
Signature · 1 line
2.40.1