[Intel-gfx] [PATCH v6 0/5] drm: Move struct drm_device.pdev to legacy

[Jani Nikula]

On Thu, 28 Jan 2021, Thomas Zimmermann <tzimmermann at suse.de> wrote:
> V6 of the patchset fixes i915/selftests to do the assigment of pdev
> in a later patch. This was forgotten in v5.
>
> The pdev field in struct drm_device points to a PCI device structure and
> goes back to UMS-only days when all DRM drivers were for PCI devices.
> Meanwhile we also support USB, SPI and platform devices. Each of those
> uses the generic device stored in struct drm_device.dev.
>
> To reduce duplication and remove the special case of PCI, this patchset
> converts all modesetting drivers from pdev to dev and makes pdev a field
> for legacy UMS drivers.
>
> For PCI devices, the pointer in struct drm_device.dev can be upcasted to
> struct pci_device; or tested for PCI with dev_is_pci(). In several places
> the code can use the dev field directly.
>
> After converting all drivers and the DRM core, the pdev fields becomes
> only relevant for legacy drivers. In a later patchset, we may want to
> convert these as well and remove pdev entirely.

Pushed patches 1-3 to topic branch topic/drm-device-pdev, and merged it
to drm-intel-next [1]. Joonas will merge it to drm-intel-gt-next. Let's
sort out patches 4-5 after the merge window.

Thanks for the patches.

BR,
Jani.


[1] http://lore.kernel.org/r/87y2g6fxxv.fsf@intel.com



>
> v6:
> 	* also remove assignment in i915/selftests in later patch (Chris)
> v5:
> 	* remove assignment in later patch (Chris)
> v4:
> 	* merged several patches
> 	* moved core changes into separate patch
> 	* vmwgfx build fix
> v3:
> 	* merged several patches
> 	* fix one pdev reference in nouveau (Jeremy)
> 	* rebases
> v2:
> 	* move whitespace fixes into separate patches (Alex, Sam)
> 	* move i915 gt/ and gvt/ changes into separate patches (Joonas)
>
> Thomas Zimmermann (5):
>   drm/i915: Remove references to struct drm_device.pdev
>   drm/i915/gt: Remove references to struct drm_device.pdev
>   drm/i915/gvt: Remove references to struct drm_device.pdev
>   drm/i915: Don't assign to struct drm_device.pdev
>   drm: Move struct drm_device.pdev to legacy section
>
>  drivers/gpu/drm/i915/display/intel_bios.c     |  2 +-
>  drivers/gpu/drm/i915/display/intel_cdclk.c    | 14 ++++++-------
>  drivers/gpu/drm/i915/display/intel_csr.c      |  2 +-
>  drivers/gpu/drm/i915/display/intel_dsi_vbt.c  |  2 +-
>  drivers/gpu/drm/i915/display/intel_fbdev.c    |  2 +-
>  drivers/gpu/drm/i915/display/intel_gmbus.c    |  2 +-
>  .../gpu/drm/i915/display/intel_lpe_audio.c    |  5 +++--
>  drivers/gpu/drm/i915/display/intel_opregion.c |  6 +++---
>  drivers/gpu/drm/i915/display/intel_overlay.c  |  2 +-
>  drivers/gpu/drm/i915/display/intel_panel.c    |  4 ++--
>  drivers/gpu/drm/i915/display/intel_quirks.c   |  2 +-
>  drivers/gpu/drm/i915/display/intel_sdvo.c     |  2 +-
>  drivers/gpu/drm/i915/display/intel_vga.c      |  8 ++++----
>  drivers/gpu/drm/i915/gem/i915_gem_phys.c      |  6 +++---
>  drivers/gpu/drm/i915/gem/i915_gem_shmem.c     |  2 +-
>  drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  2 +-
>  drivers/gpu/drm/i915/gt/intel_ggtt.c          | 10 +++++-----
>  drivers/gpu/drm/i915/gt/intel_ppgtt.c         |  2 +-
>  drivers/gpu/drm/i915/gt/intel_rc6.c           |  4 ++--
>  drivers/gpu/drm/i915/gt/intel_region_lmem.c   |  8 ++++----
>  drivers/gpu/drm/i915/gt/intel_reset.c         |  6 +++---
>  drivers/gpu/drm/i915/gvt/cfg_space.c          |  5 +++--
>  drivers/gpu/drm/i915/gvt/firmware.c           | 10 +++++-----
>  drivers/gpu/drm/i915/gvt/gtt.c                | 12 +++++------
>  drivers/gpu/drm/i915/gvt/gvt.c                |  6 +++---
>  drivers/gpu/drm/i915/gvt/kvmgt.c              |  4 ++--
>  drivers/gpu/drm/i915/i915_debugfs.c           |  2 +-
>  drivers/gpu/drm/i915/i915_drv.c               | 20 +++++++++----------
>  drivers/gpu/drm/i915/i915_drv.h               |  2 +-
>  drivers/gpu/drm/i915/i915_gem_gtt.c           |  5 ++---
>  drivers/gpu/drm/i915/i915_getparam.c          |  5 +++--
>  drivers/gpu/drm/i915/i915_gpu_error.c         |  2 +-
>  drivers/gpu/drm/i915/i915_irq.c               |  6 +++---
>  drivers/gpu/drm/i915/i915_pmu.c               |  2 +-
>  drivers/gpu/drm/i915/i915_suspend.c           |  4 ++--
>  drivers/gpu/drm/i915/i915_switcheroo.c        |  4 ++--
>  drivers/gpu/drm/i915/i915_vgpu.c              |  2 +-
>  drivers/gpu/drm/i915/intel_device_info.c      |  2 +-
>  drivers/gpu/drm/i915/intel_runtime_pm.c       |  2 +-
>  drivers/gpu/drm/i915/intel_uncore.c           |  4 ++--
>  .../gpu/drm/i915/selftests/mock_gem_device.c  |  1 -
>  drivers/gpu/drm/i915/selftests/mock_gtt.c     |  2 +-
>  include/drm/drm_device.h                      |  6 +++---
>  43 files changed, 100 insertions(+), 101 deletions(-)
>
>
> base-commit: 3836b7fdfad40e2bac5dc882332f42bed6942cf4
> prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
> --
> 2.30.0
>

-- 
Jani Nikula, Intel Open Source Graphics Center