v4 of [1]. Had to do some rebasing and add some more patches to accommodate dmc wakelock changes and their impact on intel_de.h. As a byproduct, convert intel_dmc_wl.[ch] to struct intel_display as well. With the __to_intel_display() shoved into a separate file, no changes are needed in xe side this time, could drop a patch, and the macro isn't duplicated. BR, Jani. [1] https://lore.kernel.org/r/cover.1712665176.git.jani.nikula@xxxxxxxxx Jani Nikula (9): drm/i915/display: add intel_display -> drm_device backpointer drm/i915/display: add generic to_intel_display() macro drm/i915: add generic __to_intel_display() drm/i915/display: accept either i915 or display for feature tests drm/i915/quirks: convert struct drm_i915_private to struct intel_display drm/i915/display: rename __intel_wait_for_register_nowl() to indicate intel_de_ drm/i915/dmc: convert dmc wakelock interface to struct intel_display drm/i915/de: allow intel_display and drm_i915_private for de functions drm/i915/dmc: use struct intel_display more .../gpu/drm/i915/display/intel_backlight.c | 40 ++--- drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- drivers/gpu/drm/i915/display/intel_de.h | 157 +++++++++++------- .../i915/display/intel_display_conversion.h | 22 +++ .../gpu/drm/i915/display/intel_display_core.h | 3 + .../drm/i915/display/intel_display_device.c | 3 + .../drm/i915/display/intel_display_device.h | 5 +- .../drm/i915/display/intel_display_driver.c | 5 +- .../i915/display/intel_display_power_well.c | 6 +- .../drm/i915/display/intel_display_types.h | 37 +++++ drivers/gpu/drm/i915/display/intel_dmc.c | 4 +- drivers/gpu/drm/i915/display/intel_dmc_wl.c | 72 ++++---- drivers/gpu/drm/i915/display/intel_dmc_wl.h | 12 +- drivers/gpu/drm/i915/display/intel_panel.c | 10 +- drivers/gpu/drm/i915/display/intel_pps.c | 6 +- drivers/gpu/drm/i915/display/intel_quirks.c | 56 +++---- drivers/gpu/drm/i915/display/intel_quirks.h | 6 +- 17 files changed, 275 insertions(+), 175 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_conversion.h -- 2.39.2
