v2 of https://patchwork.freedesktop.org/series/136621/ Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of "drm/xe/tests: remove unused leftover xe_call_for_each_device()" here. Due to the display dependency, I think it would be best to merge the whole thing via drm-intel-next, and do the first drm-intel-next pull request and backmerge from drm-next to drm-xe-next in fairly quick succession. BR, Jani. Jani Nikula (10): drm/xe/tests: remove unused leftover xe_call_for_each_device() drm/xe: use pdev_to_xe_device() instead of pci_get_drvdata() directly drm/xe: add kdev_to_xe_device() helper and use it drm/i915: use pdev_to_i915() instead of pci_get_drvdata() directly drm/i915 & drm/xe: save struct drm_device to drvdata drm/i915: support struct device and pci_dev in to_intel_display() drm/i915/audio: migrate away from kdev_to_i915() drm/i915/hdcp: migrate away from kdev_to_i915() in bind/unbind drm/i915/hdcp: migrate away from kdev_to_i915() in GSC messaging drm/xe/display: remove unused compat kdev_to_i915() and pdev_to_i915() drivers/gpu/drm/i915/display/intel_audio.c | 34 ++++++---- .../drm/i915/display/intel_display_types.h | 8 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 10 +-- .../drm/i915/display/intel_hdcp_gsc_message.c | 67 +++++++++++++------ drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 8 ++- drivers/gpu/drm/i915/i915_pci.c | 6 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 2 +- .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 6 -- drivers/gpu/drm/xe/tests/xe_pci.c | 52 -------------- drivers/gpu/drm/xe/tests/xe_pci_test.h | 1 - drivers/gpu/drm/xe/xe_device.h | 11 ++- drivers/gpu/drm/xe/xe_gsc_proxy.c | 9 +-- drivers/gpu/drm/xe/xe_pci.c | 4 +- 14 files changed, 104 insertions(+), 116 deletions(-) -- 2.39.2
