Uwe Kleine-König
2023-Jul-12 09:46 UTC
[Nouveau] [PATCH RFC v1 00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev
Hello,
while I debugged an issue in the imx-lcdc driver I was constantly
irritated about struct drm_device pointer variables being named "dev"
because with that name I usually expect a struct device pointer.
I think there is a big benefit when these are all renamed to
"drm_dev".
I have no strong preference here though, so "drmdev" or
"drm" are fine
for me, too. Let the bikesheding begin!
Some statistics:
$ git grep -ohE 'struct drm_device *\* *[^ (),;]*' v6.5-rc1 | sort |
uniq -c | sort -n
1 struct drm_device *adev_to_drm
1 struct drm_device *drm_
1 struct drm_device *drm_dev
1 struct drm_device *drm_dev
1 struct drm_device *pdev
1 struct drm_device *rdev
1 struct drm_device *vdev
2 struct drm_device *dcss_drv_dev_to_drm
2 struct drm_device **ddev
2 struct drm_device *drm_dev_alloc
2 struct drm_device *mock
2 struct drm_device *p_ddev
5 struct drm_device *device
9 struct drm_device * dev
25 struct drm_device *d
95 struct drm_device *
216 struct drm_device *ddev
234 struct drm_device *drm_dev
611 struct drm_device *drm
4190 struct drm_device *dev
This series starts with renaming struct drm_crtc::dev to drm_dev. If
it's not only me and others like the result of this effort it should be
followed up by adapting the other structs and the individual usages in
the different drivers.
To make this series a bit easier handleable, I first added an alias for
drm_crtc::dev, then converted the drivers one after another and the last
patch drops the "dev" name. This has the advantage of being easier to
review, and if I should have missed an instance only the last patch must
be dropped/reverted. Also this series might conflict with other patches,
in this case the remaining patches can still go in (apart from the last
one of course). Maybe it also makes sense to delay applying the last
patch by one development cycle?
The series was compile tested for arm, arm64, powerpc and amd64 using an
allmodconfig (though I only build drivers/gpu/).
Best regards
Uwe
Uwe Kleine-K?nig (52):
drm/crtc: Start renaming struct drm_crtc::dev to drm_dev
drm/core: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/amd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/armada: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/arm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/aspeed: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/ast: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/atmel-hlcdc: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/exynos: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/fsl-dcu: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/gma500: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/gud: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/hisilicon: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/hyperv: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/i915: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/imx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/ingenic: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/kmb: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/logicvc: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/mcde: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/mediatek: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/meson: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/mgag200: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/msm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/mxsfb: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/nouveau: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/omapdrm: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/panel-ili9341: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/pl111: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/qxl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/radeon: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/renesas: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/rockchip: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/solomon: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/sprd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/sti: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/stm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/sun4i: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/tegra: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/tidss: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/tilcdc: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/tiny: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/tve200: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/udl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/vboxvideo: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/virtio: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/vkms: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/vmwgfx: Use struct drm_crtc::drm_dev instead of struct
drm_crtc::dev
drm/xen: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/xlnx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
drm/crtc: Complete renaming struct drm_crtc::dev to drm_dev
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 18 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 8 +-
drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 22 +--
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 26 +--
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 28 ++--
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 26 +--
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 26 +--
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 ++--
.../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 20 +--
.../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 8 +-
.../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 22 +--
.../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +-
.../gpu/drm/arm/display/komeda/komeda_crtc.c | 24 +--
.../gpu/drm/arm/display/komeda/komeda_kms.c | 2 +-
drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +-
drivers/gpu/drm/arm/malidp_crtc.c | 7 +-
drivers/gpu/drm/armada/armada_crtc.c | 10 +-
drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 6 +-
drivers/gpu/drm/ast/ast_dp.c | 2 +-
drivers/gpu/drm/ast/ast_mode.c | 26 +--
.../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 10 +-
drivers/gpu/drm/drm_atomic.c | 22 +--
drivers/gpu/drm/drm_atomic_helper.c | 20 ++-
drivers/gpu/drm/drm_atomic_state_helper.c | 2 +-
drivers/gpu/drm/drm_atomic_uapi.c | 22 +--
drivers/gpu/drm/drm_blend.c | 2 +-
drivers/gpu/drm/drm_color_mgmt.c | 10 +-
drivers/gpu/drm/drm_crtc.c | 19 ++-
drivers/gpu/drm/drm_crtc_helper.c | 10 +-
drivers/gpu/drm/drm_debugfs.c | 2 +-
drivers/gpu/drm/drm_debugfs_crc.c | 2 +-
drivers/gpu/drm/drm_fb_helper.c | 6 +-
drivers/gpu/drm/drm_mipi_dbi.c | 4 +-
drivers/gpu/drm/drm_plane.c | 2 +-
drivers/gpu/drm/drm_plane_helper.c | 2 +-
drivers/gpu/drm/drm_self_refresh_helper.c | 2 +-
drivers/gpu/drm/drm_vblank.c | 40 ++---
drivers/gpu/drm/drm_vblank_work.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_crtc.c | 8 +-
drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 16 +-
drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
drivers/gpu/drm/gma500/gma_display.c | 20 +--
drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +-
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 4 +-
drivers/gpu/drm/gma500/psb_intel_display.c | 2 +-
drivers/gpu/drm/gma500/psb_irq.c | 6 +-
drivers/gpu/drm/gud/gud_pipe.c | 6 +-
.../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 20 +--
.../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +-
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 6 +-
drivers/gpu/drm/i915/display/g4x_dp.c | 4 +-
drivers/gpu/drm/i915/display/hsw_ips.c | 16 +-
drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +-
drivers/gpu/drm/i915/display/i9xx_wm.c | 40 ++---
drivers/gpu/drm/i915/display/icl_dsi.c | 2 +-
drivers/gpu/drm/i915/display/intel_atomic.c | 2 +-
.../gpu/drm/i915/display/intel_atomic_plane.c | 4 +-
drivers/gpu/drm/i915/display/intel_audio.c | 2 +-
drivers/gpu/drm/i915/display/intel_bw.c | 10 +-
drivers/gpu/drm/i915/display/intel_cdclk.c | 6 +-
drivers/gpu/drm/i915/display/intel_color.c | 124 +++++++-------
drivers/gpu/drm/i915/display/intel_crtc.c | 20 +--
.../drm/i915/display/intel_crtc_state_dump.c | 4 +-
drivers/gpu/drm/i915/display/intel_cursor.c | 2 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 28 ++--
drivers/gpu/drm/i915/display/intel_display.c | 154 +++++++++---------
.../gpu/drm/i915/display/intel_display_irq.c | 22 +--
.../gpu/drm/i915/display/intel_display_rps.c | 2 +-
.../drm/i915/display/intel_display_trace.h | 12 +-
drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
drivers/gpu/drm/i915/display/intel_dpll.c | 38 ++---
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 44 ++---
drivers/gpu/drm/i915/display/intel_dpt.c | 2 +-
drivers/gpu/drm/i915/display/intel_drrs.c | 10 +-
drivers/gpu/drm/i915/display/intel_dsb.c | 8 +-
drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
drivers/gpu/drm/i915/display/intel_fdi.c | 22 +--
.../drm/i915/display/intel_fifo_underrun.c | 6 +-
drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
.../drm/i915/display/intel_modeset_setup.c | 22 +--
.../drm/i915/display/intel_modeset_verify.c | 2 +-
drivers/gpu/drm/i915/display/intel_panel.c | 4 +-
.../gpu/drm/i915/display/intel_pch_display.c | 32 ++--
.../gpu/drm/i915/display/intel_pch_refclk.c | 2 +-
drivers/gpu/drm/i915/display/intel_pipe_crc.c | 10 +-
.../drm/i915/display/intel_plane_initial.c | 6 +-
drivers/gpu/drm/i915/display/intel_psr.c | 14 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
drivers/gpu/drm/i915/display/intel_vblank.c | 24 +--
drivers/gpu/drm/i915/display/intel_vdsc.c | 18 +-
drivers/gpu/drm/i915/display/intel_vrr.c | 18 +-
drivers/gpu/drm/i915/display/skl_scaler.c | 10 +-
.../drm/i915/display/skl_universal_plane.c | 6 +-
drivers/gpu/drm/i915/display/skl_watermark.c | 42 ++---
drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
drivers/gpu/drm/imx/dcss/dcss-crtc.c | 20 +--
drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 15 +-
drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 16 +-
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +-
drivers/gpu/drm/kmb/kmb_crtc.c | 16 +-
drivers/gpu/drm/logicvc/logicvc_crtc.c | 14 +-
drivers/gpu/drm/mcde/mcde_display.c | 18 +-
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 22 +--
drivers/gpu/drm/meson/meson_crtc.c | 12 +-
drivers/gpu/drm/mgag200/mgag200_g200.c | 4 +-
drivers/gpu/drm/mgag200/mgag200_g200eh.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 +-
drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 +-
drivers/gpu/drm/mgag200/mgag200_g200se.c | 6 +-
drivers/gpu/drm/mgag200/mgag200_g200wb.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_mode.c | 10 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 6 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 70 ++++----
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +-
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 12 +-
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 20 +--
drivers/gpu/drm/msm/msm_drv.c | 4 +-
drivers/gpu/drm/mxsfb/lcdif_kms.c | 18 +-
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 16 +-
drivers/gpu/drm/nouveau/dispnv04/crtc.c | 58 +++----
drivers/gpu/drm/nouveau/dispnv04/cursor.c | 10 +-
drivers/gpu/drm/nouveau/dispnv50/atom.h | 2 +-
drivers/gpu/drm/nouveau/dispnv50/crc.c | 30 ++--
drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 6 +-
drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 6 +-
drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +-
drivers/gpu/drm/nouveau/dispnv50/head.c | 4 +-
drivers/gpu/drm/nouveau/dispnv50/head507d.c | 26 +--
drivers/gpu/drm/nouveau/dispnv50/head827d.c | 10 +-
drivers/gpu/drm/nouveau/dispnv50/head907d.c | 26 +--
drivers/gpu/drm/nouveau/dispnv50/head917d.c | 6 +-
drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 18 +-
drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 10 +-
drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +-
drivers/gpu/drm/nouveau/nouveau_display.c | 2 +-
drivers/gpu/drm/omapdrm/omap_crtc.c | 56 +++----
drivers/gpu/drm/omapdrm/omap_irq.c | 6 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +-
drivers/gpu/drm/pl111/pl111_display.c | 16 +-
drivers/gpu/drm/qxl/qxl_display.c | 2 +-
drivers/gpu/drm/radeon/atombios_crtc.c | 54 +++---
drivers/gpu/drm/radeon/radeon_cursor.c | 14 +-
drivers/gpu/drm/radeon/radeon_display.c | 28 ++--
drivers/gpu/drm/radeon/radeon_kms.c | 6 +-
drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +-
.../gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 14 +-
.../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 20 +--
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +-
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 15 +-
drivers/gpu/drm/solomon/ssd130x.c | 2 +-
drivers/gpu/drm/sprd/sprd_dpu.c | 6 +-
drivers/gpu/drm/sti/sti_crtc.c | 14 +-
drivers/gpu/drm/stm/ltdc.c | 12 +-
drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 +-
drivers/gpu/drm/tegra/dc.c | 12 +-
drivers/gpu/drm/tidss/tidss_crtc.c | 19 ++-
drivers/gpu/drm/tidss/tidss_irq.c | 4 +-
drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 43 ++---
drivers/gpu/drm/tiny/bochs.c | 6 +-
drivers/gpu/drm/tiny/cirrus.c | 2 +-
drivers/gpu/drm/tiny/gm12u320.c | 4 +-
drivers/gpu/drm/tiny/hx8357d.c | 4 +-
drivers/gpu/drm/tiny/ili9163.c | 4 +-
drivers/gpu/drm/tiny/ili9225.c | 8 +-
drivers/gpu/drm/tiny/ili9341.c | 4 +-
drivers/gpu/drm/tiny/ili9486.c | 4 +-
drivers/gpu/drm/tiny/mi0283qt.c | 4 +-
drivers/gpu/drm/tiny/ofdrm.c | 8 +-
drivers/gpu/drm/tiny/panel-mipi-dbi.c | 6 +-
drivers/gpu/drm/tiny/repaper.c | 8 +-
drivers/gpu/drm/tiny/simpledrm.c | 2 +-
drivers/gpu/drm/tiny/st7586.c | 6 +-
drivers/gpu/drm/tiny/st7735r.c | 4 +-
drivers/gpu/drm/tve200/tve200_display.c | 14 +-
drivers/gpu/drm/udl/udl_modeset.c | 4 +-
drivers/gpu/drm/vboxvideo/vbox_mode.c | 6 +-
drivers/gpu/drm/vc4/vc4_crtc.c | 38 ++---
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
drivers/gpu/drm/vc4/vc4_hvs.c | 12 +-
drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_display.c | 4 +-
drivers/gpu/drm/vkms/vkms_crtc.c | 12 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +-
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 8 +-
drivers/gpu/drm/xen/xen_drm_front_kms.c | 10 +-
drivers/gpu/drm/xlnx/zynqmp_kms.c | 8 +-
include/drm/drm_atomic_helper.h | 2 +-
include/drm/drm_crtc.h | 4 +-
194 files changed, 1296 insertions(+), 1264 deletions(-)
base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
--
2.39.2
Uwe Kleine-König
2023-Jul-12 09:46 UTC
[Nouveau] [PATCH RFC v1 26/52] drm/nouveau: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev
Prepare dropping the alias "dev" for struct drm_crtc::drm_dev.
"drm_dev"
is the better name as "dev" is usually a struct device pointer.
No semantic changes.
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig at pengutronix.de>
---
drivers/gpu/drm/nouveau/dispnv04/crtc.c | 58 +++++++++++----------
drivers/gpu/drm/nouveau/dispnv04/cursor.c | 10 ++--
drivers/gpu/drm/nouveau/dispnv50/atom.h | 2 +-
drivers/gpu/drm/nouveau/dispnv50/crc.c | 30 +++++------
drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 6 +--
drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 6 +--
drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +-
drivers/gpu/drm/nouveau/dispnv50/head.c | 4 +-
drivers/gpu/drm/nouveau/dispnv50/head507d.c | 26 ++++-----
drivers/gpu/drm/nouveau/dispnv50/head827d.c | 10 ++--
drivers/gpu/drm/nouveau/dispnv50/head907d.c | 26 ++++-----
drivers/gpu/drm/nouveau/dispnv50/head917d.c | 6 +--
drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 18 +++----
drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 10 ++--
drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +-
drivers/gpu/drm/nouveau/nouveau_display.c | 2 +-
17 files changed, 113 insertions(+), 110 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index a6f2e681bde9..fad5c6dc2cf7 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -56,18 +56,18 @@ nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
static void
crtc_wr_cio_state(struct drm_crtc *crtc, struct nv04_crtc_reg *crtcstate, int
index)
{
- NVWriteVgaCrtc(crtc->dev, nouveau_crtc(crtc)->index, index,
+ NVWriteVgaCrtc(crtc->drm_dev, nouveau_crtc(crtc)->index, index,
crtcstate->CRTC[index]);
}
static void nv_crtc_set_digital_vibrance(struct drm_crtc *crtc, int level)
{
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nv04_crtc_reg *regp =
&nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];
regp->CRTC[NV_CIO_CRE_CSB] = nv_crtc->saturation = level;
- if (nv_crtc->saturation && nv_gf4_disp_arch(crtc->dev)) {
+ if (nv_crtc->saturation && nv_gf4_disp_arch(crtc->drm_dev)) {
regp->CRTC[NV_CIO_CRE_CSB] = 0x80;
regp->CRTC[NV_CIO_CRE_5B] = nv_crtc->saturation << 2;
crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_5B);
@@ -78,14 +78,15 @@ static void nv_crtc_set_digital_vibrance(struct drm_crtc
*crtc, int level)
static void nv_crtc_set_image_sharpening(struct drm_crtc *crtc, int level)
{
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nv04_crtc_reg *regp =
&nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];
nv_crtc->sharpness = level;
if (level < 0) /* blur is in hw range 0x3f -> 0x20 */
level += 0x40;
regp->ramdac_634 = level;
- NVWriteRAMDAC(crtc->dev, nv_crtc->index, NV_PRAMDAC_634,
regp->ramdac_634);
+ NVWriteRAMDAC(crtc->drm_dev, nv_crtc->index, NV_PRAMDAC_634,
+ regp->ramdac_634);
}
#define PLLSEL_VPLL1_MASK \
@@ -116,7 +117,7 @@ static void nv_crtc_set_image_sharpening(struct drm_crtc
*crtc, int level)
static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct
drm_display_mode * mode, int dot_clock)
{
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nouveau_drm *drm = nouveau_drm(dev);
struct nvkm_bios *bios = nvxx_bios(&drm->client.device);
struct nvkm_clk *clk = nvxx_clk(&drm->client.device);
@@ -175,7 +176,7 @@ static void
nv_crtc_dpms(struct drm_crtc *crtc, int mode)
{
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nouveau_drm *drm = nouveau_drm(dev);
unsigned char seq1 = 0, crtc17 = 0;
unsigned char crtc1A;
@@ -236,7 +237,7 @@ nv_crtc_dpms(struct drm_crtc *crtc, int mode)
static void
nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode)
{
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
struct nv04_crtc_reg *regp =
&nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];
struct drm_framebuffer *fb = crtc->primary->fb;
@@ -460,7 +461,7 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct
drm_display_mode *mode)
static void
nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode)
{
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nouveau_drm *drm = nouveau_drm(dev);
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
struct nv04_crtc_reg *regp =
&nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];
@@ -609,7 +610,7 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct
drm_display_mode * mode)
static int
nv_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb)
{
- struct nv04_display *disp = nv04_display(crtc->dev);
+ struct nv04_display *disp = nv04_display(crtc->drm_dev);
struct drm_framebuffer *fb = crtc->primary->fb;
struct nouveau_bo *nvbo = nouveau_gem_object(fb->obj[0]);
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
@@ -638,7 +639,7 @@ nv_crtc_mode_set(struct drm_crtc *crtc, struct
drm_display_mode *mode,
struct drm_display_mode *adjusted_mode,
int x, int y, struct drm_framebuffer *old_fb)
{
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
struct nouveau_drm *drm = nouveau_drm(dev);
int ret;
@@ -665,16 +666,16 @@ nv_crtc_mode_set(struct drm_crtc *crtc, struct
drm_display_mode *mode,
static void nv_crtc_save(struct drm_crtc *crtc)
{
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nv04_mode_state *state = &nv04_display(dev)->mode_reg;
struct nv04_crtc_reg *crtc_state = &state->crtc_reg[nv_crtc->index];
struct nv04_mode_state *saved = &nv04_display(dev)->saved_reg;
struct nv04_crtc_reg *crtc_saved = &saved->crtc_reg[nv_crtc->index];
- if (nv_two_heads(crtc->dev))
- NVSetOwner(crtc->dev, nv_crtc->index);
+ if (nv_two_heads(crtc->drm_dev))
+ NVSetOwner(crtc->drm_dev, nv_crtc->index);
- nouveau_hw_save_state(crtc->dev, nv_crtc->index, saved);
+ nouveau_hw_save_state(crtc->drm_dev, nv_crtc->index, saved);
/* init some state to saved value */
state->sel_clk = saved->sel_clk & ~(0x5 << 16);
@@ -686,22 +687,23 @@ static void nv_crtc_save(struct drm_crtc *crtc)
static void nv_crtc_restore(struct drm_crtc *crtc)
{
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
int head = nv_crtc->index;
uint8_t saved_cr21 =
nv04_display(dev)->saved_reg.crtc_reg[head].CRTC[NV_CIO_CRE_21];
- if (nv_two_heads(crtc->dev))
- NVSetOwner(crtc->dev, head);
+ if (nv_two_heads(crtc->drm_dev))
+ NVSetOwner(crtc->drm_dev, head);
- nouveau_hw_load_state(crtc->dev, head,
&nv04_display(dev)->saved_reg);
- nv_lock_vga_crtc_shadow(crtc->dev, head, saved_cr21);
+ nouveau_hw_load_state(crtc->drm_dev, head,
+ &nv04_display(dev)->saved_reg);
+ nv_lock_vga_crtc_shadow(crtc->drm_dev, head, saved_cr21);
nv_crtc->last_dpms = NV_DPMS_CLEARED;
}
static void nv_crtc_prepare(struct drm_crtc *crtc)
{
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nouveau_drm *drm = nouveau_drm(dev);
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
const struct drm_crtc_helper_funcs *funcs = crtc->helper_private;
@@ -724,7 +726,7 @@ static void nv_crtc_prepare(struct drm_crtc *crtc)
static void nv_crtc_commit(struct drm_crtc *crtc)
{
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
const struct drm_crtc_helper_funcs *funcs = crtc->helper_private;
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
@@ -746,7 +748,7 @@ static void nv_crtc_commit(struct drm_crtc *crtc)
static void nv_crtc_destroy(struct drm_crtc *crtc)
{
- struct nv04_display *disp = nv04_display(crtc->dev);
+ struct nv04_display *disp = nv04_display(crtc->drm_dev);
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
if (!nv_crtc)
@@ -770,7 +772,7 @@ static void
nv_crtc_gamma_load(struct drm_crtc *crtc)
{
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
- struct drm_device *dev = nv_crtc->base.dev;
+ struct drm_device *dev = nv_crtc->base.drm_dev;
struct rgb { uint8_t r, g, b; } __attribute__((packed)) *rgbs;
u16 *r, *g, *b;
int i;
@@ -792,7 +794,7 @@ nv_crtc_gamma_load(struct drm_crtc *crtc)
static void
nv_crtc_disable(struct drm_crtc *crtc)
{
- struct nv04_display *disp = nv04_display(crtc->dev);
+ struct nv04_display *disp = nv04_display(crtc->drm_dev);
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
if (disp->image[nv_crtc->index])
nouveau_bo_unpin(disp->image[nv_crtc->index]);
@@ -827,7 +829,7 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,
int x, int y, bool atomic)
{
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nouveau_drm *drm = nouveau_drm(dev);
struct nv04_crtc_reg *regp =
&nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];
struct nouveau_bo *nvbo;
@@ -982,7 +984,7 @@ static int
nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
uint32_t buffer_handle, uint32_t width, uint32_t height)
{
- struct nouveau_drm *drm = nouveau_drm(crtc->dev);
+ struct nouveau_drm *drm = nouveau_drm(crtc->drm_dev);
struct drm_device *dev = drm->dev;
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
struct nouveau_bo *cursor = NULL;
@@ -1140,7 +1142,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct
drm_framebuffer *fb,
struct drm_modeset_acquire_ctx *ctx)
{
const int swap_interval = (flags & DRM_MODE_PAGE_FLIP_ASYNC) ? 0 : 1;
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nouveau_drm *drm = nouveau_drm(dev);
struct drm_framebuffer *old_fb = crtc->primary->fb;
struct nouveau_bo *old_bo = nouveau_gem_object(old_fb->obj[0]);
diff --git a/drivers/gpu/drm/nouveau/dispnv04/cursor.c
b/drivers/gpu/drm/nouveau/dispnv04/cursor.c
index 4c6440d29c3f..d7dbe411525b 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/cursor.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/cursor.c
@@ -8,20 +8,20 @@
static void
nv04_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
{
- nv_show_cursor(nv_crtc->base.dev, nv_crtc->index, true);
+ nv_show_cursor(nv_crtc->base.drm_dev, nv_crtc->index, true);
}
static void
nv04_cursor_hide(struct nouveau_crtc *nv_crtc, bool update)
{
- nv_show_cursor(nv_crtc->base.dev, nv_crtc->index, false);
+ nv_show_cursor(nv_crtc->base.drm_dev, nv_crtc->index, false);
}
static void
nv04_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y)
{
nv_crtc->cursor_saved_x = x; nv_crtc->cursor_saved_y = y;
- NVWriteRAMDAC(nv_crtc->base.dev, nv_crtc->index,
+ NVWriteRAMDAC(nv_crtc->base.drm_dev, nv_crtc->index,
NV_PRAMDAC_CU_START_POS,
XLATE(y, 0, NV_PRAMDAC_CU_START_POS_Y) |
XLATE(x, 0, NV_PRAMDAC_CU_START_POS_X));
@@ -30,14 +30,14 @@ nv04_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int
y)
static void
crtc_wr_cio_state(struct drm_crtc *crtc, struct nv04_crtc_reg *crtcstate, int
index)
{
- NVWriteVgaCrtc(crtc->dev, nouveau_crtc(crtc)->index, index,
+ NVWriteVgaCrtc(crtc->drm_dev, nouveau_crtc(crtc)->index, index,
crtcstate->CRTC[index]);
}
static void
nv04_cursor_set_offset(struct nouveau_crtc *nv_crtc, uint32_t offset)
{
- struct drm_device *dev = nv_crtc->base.dev;
+ struct drm_device *dev = nv_crtc->base.drm_dev;
struct nouveau_drm *drm = nouveau_drm(dev);
struct nv04_crtc_reg *regp =
&nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];
struct drm_crtc *crtc = &nv_crtc->base;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/atom.h
b/drivers/gpu/drm/nouveau/dispnv50/atom.h
index 93f8f4f64578..27804c0bbc42 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/atom.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/atom.h
@@ -163,7 +163,7 @@ nv50_head_atom_get_encoder(struct nv50_head_atom *atom)
struct drm_encoder *encoder;
/* We only ever have a single encoder */
- drm_for_each_encoder_mask(encoder, atom->state.crtc->dev,
+ drm_for_each_encoder_mask(encoder, atom->state.crtc->drm_dev,
atom->state.encoder_mask)
return encoder;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c
b/drivers/gpu/drm/nouveau/dispnv50/crc.c
index 9c942fbd836d..308bf99e2a44 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
@@ -48,7 +48,7 @@ int
nv50_crc_verify_source(struct drm_crtc *crtc, const char *source_name,
size_t *values_cnt)
{
- struct nouveau_drm *drm = nouveau_drm(crtc->dev);
+ struct nouveau_drm *drm = nouveau_drm(crtc->drm_dev);
enum nv50_crc_source source;
if (nv50_crc_parse_source(source_name, &source) < 0) {
@@ -70,7 +70,7 @@ static void
nv50_crc_program_ctx(struct nv50_head *head,
struct nv50_crc_notifier_ctx *ctx)
{
- struct nv50_disp *disp = nv50_disp(head->base.base.dev);
+ struct nv50_disp *disp = nv50_disp(head->base.base.drm_dev);
struct nv50_core *core = disp->core;
u32 interlock[NV50_DISP_INTERLOCK__SIZE] = { 0 };
@@ -84,7 +84,7 @@ static void nv50_crc_ctx_flip_work(struct kthread_work *base)
struct nv50_crc *crc = container_of(work, struct nv50_crc, flip_work);
struct nv50_head *head = container_of(crc, struct nv50_head, crc);
struct drm_crtc *crtc = &head->base.base;
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nv50_disp *disp = nv50_disp(dev);
const uint64_t start_vbl = drm_crtc_vblank_count(crtc);
uint64_t end_vbl;
@@ -154,7 +154,7 @@ void nv50_crc_handle_vblank(struct nv50_head *head)
struct drm_crtc *crtc = &head->base.base;
struct nv50_crc *crc = &head->crc;
const struct nv50_crc_func *func -
nv50_disp(head->base.base.dev)->core->func->crc;
+ nv50_disp(head->base.base.drm_dev)->core->func->crc;
struct nv50_crc_notifier_ctx *ctx;
bool need_reschedule = false;
@@ -193,7 +193,7 @@ void nv50_crc_handle_vblank(struct nv50_head *head)
* updates back-to-back without waiting, we'll just be
* optimistic and assume we always miss exactly one frame.
*/
- drm_dbg_kms(head->base.base.dev,
+ drm_dbg_kms(head->base.base.drm_dev,
"Notifier ctx flip for head-%d finished, lost CRC for frame
%llu\n",
head->base.index, crc->frame);
crc->frame++;
@@ -219,7 +219,7 @@ static void nv50_crc_wait_ctx_finished(struct nv50_head
*head,
const struct nv50_crc_func *func,
struct nv50_crc_notifier_ctx *ctx)
{
- struct drm_device *dev = head->base.base.dev;
+ struct drm_device *dev = head->base.base.drm_dev;
struct nouveau_drm *drm = nouveau_drm(dev);
s64 ret;
@@ -256,7 +256,7 @@ void nv50_crc_atomic_stop_reporting(struct drm_atomic_state
*state)
drm_crtc_vblank_put(crtc);
drm_vblank_work_cancel_sync(&crc->flip_work);
- NV_ATOMIC(nouveau_drm(crtc->dev),
+ NV_ATOMIC(nouveau_drm(crtc->drm_dev),
"CRC reporting on vblank for head-%d disabled\n",
head->base.index);
@@ -340,7 +340,7 @@ void nv50_crc_atomic_start_reporting(struct drm_atomic_state
*state)
true);
spin_unlock_irq(&crc->lock);
- NV_ATOMIC(nouveau_drm(crtc->dev),
+ NV_ATOMIC(nouveau_drm(crtc->drm_dev),
"CRC reporting on vblank for head-%d enabled\n",
head->base.index);
}
@@ -449,7 +449,7 @@ void nv50_crc_atomic_set(struct nv50_head *head,
struct nv50_head_atom *asyh)
{
struct drm_crtc *crtc = &head->base.base;
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct nv50_crc *crc = &head->crc;
const struct nv50_crc_func *func = nv50_disp(dev)->core->func->crc;
struct nouveau_encoder *outp;
@@ -470,7 +470,7 @@ void nv50_crc_atomic_set(struct nv50_head *head,
void nv50_crc_atomic_clr(struct nv50_head *head)
{
const struct nv50_crc_func *func -
nv50_disp(head->base.base.dev)->core->func->crc;
+ nv50_disp(head->base.base.drm_dev)->core->func->crc;
func->set_src(head, 0, NV50_CRC_SOURCE_TYPE_NONE, NULL);
}
@@ -500,7 +500,7 @@ static inline int
nv50_crc_ctx_init(struct nv50_head *head, struct nvif_mmu *mmu,
struct nv50_crc_notifier_ctx *ctx, size_t len, int idx)
{
- struct nv50_core *core = nv50_disp(head->base.base.dev)->core;
+ struct nv50_core *core = nv50_disp(head->base.base.drm_dev)->core;
int ret;
ret = nvif_mem_ctor_map(mmu, "kmsCrcNtfy", NVIF_MEM_VRAM, len,
&ctx->mem);
@@ -537,7 +537,7 @@ nv50_crc_ctx_fini(struct nv50_crc_notifier_ctx *ctx)
int nv50_crc_set_source(struct drm_crtc *crtc, const char *source_str)
{
- struct drm_device *dev = crtc->dev;
+ struct drm_device *dev = crtc->drm_dev;
struct drm_atomic_state *state;
struct drm_modeset_acquire_ctx ctx;
struct nv50_head *head = nv50_head(crtc);
@@ -656,10 +656,10 @@ nv50_crc_debugfs_flip_threshold_set(struct file *file,
struct nv50_head *head = m->private;
struct nv50_head_atom *armh;
struct drm_crtc *crtc = &head->base.base;
- struct nouveau_drm *drm = nouveau_drm(crtc->dev);
+ struct nouveau_drm *drm = nouveau_drm(crtc->drm_dev);
struct nv50_crc *crc = &head->crc;
const struct nv50_crc_func *func -
nv50_disp(crtc->dev)->core->func->crc;
+ nv50_disp(crtc->drm_dev)->core->func->crc;
int value, ret;
ret = kstrtoint_from_user(ubuf, len, 10, &value);
@@ -706,7 +706,7 @@ int nv50_head_crc_late_register(struct nv50_head *head)
{
struct drm_crtc *crtc = &head->base.base;
const struct nv50_crc_func *func -
nv50_disp(crtc->dev)->core->func->crc;
+ nv50_disp(crtc->drm_dev)->core->func->crc;
struct dentry *root;
if (!func || !crtc->debugfs_entry)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
b/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
index f9ad641555b7..1cd83c4dca10 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
@@ -26,7 +26,7 @@ static int
crc907d_set_src(struct nv50_head *head, int or, enum nv50_crc_source_type
source,
struct nv50_crc_notifier_ctx *ctx)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u32 crc_args = NVDEF(NV907D, HEAD_SET_CRC_CONTROL, CONTROLLING_CHANNEL, CORE)
|
NVDEF(NV907D, HEAD_SET_CRC_CONTROL, EXPECT_BUFFER_COLLAPSE, FALSE) |
@@ -74,7 +74,7 @@ crc907d_set_src(struct nv50_head *head, int or, enum
nv50_crc_source_type source
static int
crc907d_set_ctx(struct nv50_head *head, struct nv50_crc_notifier_ctx *ctx)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -97,7 +97,7 @@ static u32 crc907d_get_entry(struct nv50_head *head,
static bool crc907d_ctx_finished(struct nv50_head *head,
struct nv50_crc_notifier_ctx *ctx)
{
- struct nouveau_drm *drm = nouveau_drm(head->base.base.dev);
+ struct nouveau_drm *drm = nouveau_drm(head->base.base.drm_dev);
struct crc907d_notifier __iomem *notifier = ctx->mem.object.map.ptr;
const u32 status = ioread32_native(¬ifier->status);
const u32 overflow = status & 0x0000003e;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
b/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
index f10f6c484408..dee8c99a6a13 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
@@ -15,7 +15,7 @@ static int
crcc37d_set_src(struct nv50_head *head, int or, enum nv50_crc_source_type
source,
struct nv50_crc_notifier_ctx *ctx)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u32 crc_args = NVVAL(NVC37D, HEAD_SET_CRC_CONTROL, CONTROLLING_CHANNEL, i * 4)
|
NVDEF(NVC37D, HEAD_SET_CRC_CONTROL, EXPECT_BUFFER_COLLAPSE, FALSE) |
@@ -53,7 +53,7 @@ crcc37d_set_src(struct nv50_head *head, int or, enum
nv50_crc_source_type source
int crcc37d_set_ctx(struct nv50_head *head, struct nv50_crc_notifier_ctx *ctx)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -81,7 +81,7 @@ u32 crcc37d_get_entry(struct nv50_head *head, struct
nv50_crc_notifier_ctx *ctx,
bool crcc37d_ctx_finished(struct nv50_head *head, struct nv50_crc_notifier_ctx
*ctx)
{
- struct nouveau_drm *drm = nouveau_drm(head->base.base.dev);
+ struct nouveau_drm *drm = nouveau_drm(head->base.base.drm_dev);
struct crcc37d_notifier __iomem *notifier = ctx->mem.object.map.ptr;
const u32 status = ioread32_native(¬ifier->status);
const u32 overflow = status & 0x0000007e;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/crcc57d.c
b/drivers/gpu/drm/nouveau/dispnv50/crcc57d.c
index cc0130e3d496..b37fb18fd286 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/crcc57d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crcc57d.c
@@ -13,7 +13,7 @@
static int crcc57d_set_src(struct nv50_head *head, int or, enum
nv50_crc_source_type source,
struct nv50_crc_notifier_ctx *ctx)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u32 crc_args = NVDEF(NVC57D, HEAD_SET_CRC_CONTROL, CONTROLLING_CHANNEL, CORE)
|
NVDEF(NVC57D, HEAD_SET_CRC_CONTROL, EXPECT_BUFFER_COLLAPSE, FALSE) |
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 42e1665ba11a..ecf0c1b972c1 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -2213,9 +2213,10 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state
*state)
/* Get correct count/ts if racing with vblank irq */
if (new_crtc_state->active)
drm_crtc_accurate_vblank_count(crtc);
- spin_lock_irqsave(&crtc->dev->event_lock, flags);
+ spin_lock_irqsave(&crtc->drm_dev->event_lock, flags);
drm_crtc_send_vblank_event(crtc, new_crtc_state->event);
- spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
+ spin_unlock_irqrestore(&crtc->drm_dev->event_lock,
+ flags);
new_crtc_state->event = NULL;
if (new_crtc_state->active)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c
b/drivers/gpu/drm/nouveau/dispnv50/head.c
index 5f490fbf1877..6d40bb470110 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head.c
@@ -225,7 +225,7 @@ static int
nv50_head_atomic_check_lut(struct nv50_head *head,
struct nv50_head_atom *asyh)
{
- struct drm_device *dev = head->base.base.dev;
+ struct drm_device *dev = head->base.base.drm_dev;
struct drm_crtc *crtc = &head->base.base;
struct nv50_disp *disp = nv50_disp(dev);
struct nouveau_drm *drm = nouveau_drm(dev);
@@ -336,7 +336,7 @@ nv50_head_atomic_check(struct drm_crtc *crtc, struct
drm_atomic_state *state)
crtc);
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
crtc);
- struct nouveau_drm *drm = nouveau_drm(crtc->dev);
+ struct nouveau_drm *drm = nouveau_drm(crtc->drm_dev);
struct nv50_head *head = nv50_head(crtc);
struct nv50_head_atom *armh = nv50_head_atom(old_crtc_state);
struct nv50_head_atom *asyh = nv50_head_atom(crtc_state);
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head507d.c
b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
index 0edd4e520c8e..fd499a530724 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
@@ -29,7 +29,7 @@
int
head507d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -48,7 +48,7 @@ head507d_procamp(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
head507d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -66,7 +66,7 @@ head507d_dither(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
head507d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u32 bounds = 0;
int ret;
@@ -94,7 +94,7 @@ head507d_ovly(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
head507d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u32 bounds = 0;
int ret;
@@ -122,7 +122,7 @@ head507d_base(struct nv50_head *head, struct nv50_head_atom
*asyh)
static int
head507d_curs_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -139,7 +139,7 @@ head507d_curs_clr(struct nv50_head *head)
static int
head507d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -188,7 +188,7 @@ head507d_curs_layout(struct nv50_head *head, struct
nv50_wndw_atom *asyw,
int
head507d_core_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -202,7 +202,7 @@ head507d_core_clr(struct nv50_head *head)
static int
head507d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -246,7 +246,7 @@ head507d_core_set(struct nv50_head *head, struct
nv50_head_atom *asyh)
void
head507d_core_calc(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nv50_disp *disp = nv50_disp(head->base.base.dev);
+ struct nv50_disp *disp = nv50_disp(head->base.base.drm_dev);
if ((asyh->core.visible = (asyh->base.cpp != 0))) {
asyh->core.x = asyh->base.x;
asyh->core.y = asyh->base.y;
@@ -278,7 +278,7 @@ head507d_core_calc(struct nv50_head *head, struct
nv50_head_atom *asyh)
static int
head507d_olut_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -293,7 +293,7 @@ head507d_olut_clr(struct nv50_head *head)
static int
head507d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -345,7 +345,7 @@ head507d_olut(struct nv50_head *head, struct nv50_head_atom
*asyh, int size)
int
head507d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
struct nv50_head_mode *m = &asyh->mode;
const int i = head->base.index;
int ret;
@@ -400,7 +400,7 @@ head507d_mode(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
head507d_view(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head827d.c
b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
index 194d1771c481..1a9cbeaf0713 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head827d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
@@ -29,7 +29,7 @@
static int
head827d_curs_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -48,7 +48,7 @@ head827d_curs_clr(struct nv50_head *head)
static int
head827d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -73,7 +73,7 @@ head827d_curs_set(struct nv50_head *head, struct
nv50_head_atom *asyh)
static int
head827d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -110,7 +110,7 @@ head827d_core_set(struct nv50_head *head, struct
nv50_head_atom *asyh)
static int
head827d_olut_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -127,7 +127,7 @@ head827d_olut_clr(struct nv50_head *head)
static int
head827d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head907d.c
b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
index 18fe4c1e2d6a..d09206cfc3f7 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
@@ -36,7 +36,7 @@
int
head907d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -57,7 +57,7 @@ head907d_or(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
head907d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -77,7 +77,7 @@ head907d_procamp(struct nv50_head *head, struct nv50_head_atom
*asyh)
static int
head907d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -95,7 +95,7 @@ head907d_dither(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
head907d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u32 bounds = 0;
int ret;
@@ -124,7 +124,7 @@ head907d_ovly(struct nv50_head *head, struct nv50_head_atom
*asyh)
static int
head907d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u32 bounds = 0;
int ret;
@@ -152,7 +152,7 @@ head907d_base(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
head907d_curs_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -171,7 +171,7 @@ head907d_curs_clr(struct nv50_head *head)
int
head907d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -195,7 +195,7 @@ head907d_curs_set(struct nv50_head *head, struct
nv50_head_atom *asyh)
int
head907d_core_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -209,7 +209,7 @@ head907d_core_clr(struct nv50_head *head)
int
head907d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -246,7 +246,7 @@ head907d_core_set(struct nv50_head *head, struct
nv50_head_atom *asyh)
int
head907d_olut_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -263,7 +263,7 @@ head907d_olut_clr(struct nv50_head *head)
int
head907d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -322,7 +322,7 @@ bool head907d_ilut_check(int size)
int
head907d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
struct nv50_head_mode *m = &asyh->mode;
const int i = head->base.index;
int ret;
@@ -378,7 +378,7 @@ head907d_mode(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
head907d_view(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head917d.c
b/drivers/gpu/drm/nouveau/dispnv50/head917d.c
index 4ce47b55f72c..17234667771d 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head917d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head917d.c
@@ -30,7 +30,7 @@
static int
head917d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -48,7 +48,7 @@ head917d_dither(struct nv50_head *head, struct nv50_head_atom
*asyh)
static int
head917d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u32 bounds = 0;
int ret;
@@ -77,7 +77,7 @@ head917d_base(struct nv50_head *head, struct nv50_head_atom
*asyh)
static int
head917d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
index a4a3b78ea42c..3adc33279315 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
@@ -30,7 +30,7 @@
static int
headc37d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u8 depth;
int ret;
@@ -64,7 +64,7 @@ headc37d_or(struct nv50_head *head, struct nv50_head_atom
*asyh)
static int
headc37d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -85,7 +85,7 @@ headc37d_procamp(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
headc37d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -104,7 +104,7 @@ headc37d_dither(struct nv50_head *head, struct
nv50_head_atom *asyh)
int
headc37d_curs_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -122,7 +122,7 @@ headc37d_curs_clr(struct nv50_head *head)
int
headc37d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -161,7 +161,7 @@ headc37d_curs_format(struct nv50_head *head, struct
nv50_wndw_atom *asyw,
static int
headc37d_olut_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -175,7 +175,7 @@ headc37d_olut_clr(struct nv50_head *head)
static int
headc37d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -209,7 +209,7 @@ headc37d_olut(struct nv50_head *head, struct nv50_head_atom
*asyh, int size)
static int
headc37d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
struct nv50_head_mode *m = &asyh->mode;
const int i = head->base.index;
int ret;
@@ -254,7 +254,7 @@ headc37d_mode(struct nv50_head *head, struct nv50_head_atom
*asyh)
int
headc37d_view(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
index 543f08ceaad6..08b7dded554f 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
@@ -30,7 +30,7 @@
static int
headc57d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
u8 depth;
int ret;
@@ -65,7 +65,7 @@ headc57d_or(struct nv50_head *head, struct nv50_head_atom
*asyh)
static int
headc57d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -83,7 +83,7 @@ headc57d_procamp(struct nv50_head *head, struct nv50_head_atom
*asyh)
static int
headc57d_olut_clr(struct nv50_head *head)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -97,7 +97,7 @@ headc57d_olut_clr(struct nv50_head *head)
static int
headc57d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
const int i = head->base.index;
int ret;
@@ -188,7 +188,7 @@ headc57d_olut(struct nv50_head *head, struct nv50_head_atom
*asyh, int size)
static int
headc57d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
{
- struct nvif_push *push =
nv50_disp(head->base.base.dev)->core->chan.push;
+ struct nvif_push *push =
nv50_disp(head->base.base.drm_dev)->core->chan.push;
struct nv50_head_mode *m = &asyh->mode;
const int i = head->base.index;
int ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h
b/drivers/gpu/drm/nouveau/nouveau_connector.h
index 35bcb541722b..26bb8b162235 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.h
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
@@ -181,7 +181,7 @@ nouveau_connector_is_mst(struct drm_connector *connector)
static inline struct nouveau_connector *
nouveau_crtc_connector_get(struct nouveau_crtc *nv_crtc)
{
- struct drm_device *dev = nv_crtc->base.dev;
+ struct drm_device *dev = nv_crtc->base.drm_dev;
struct drm_connector *connector;
struct drm_connector_list_iter conn_iter;
struct nouveau_connector *nv_connector = NULL;
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c
b/drivers/gpu/drm/nouveau/nouveau_display.c
index ec3ffff487fc..2301db014be3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -83,7 +83,7 @@ static bool
nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos,
ktime_t *stime, ktime_t *etime)
{
- struct drm_vblank_crtc *vblank =
&crtc->dev->vblank[drm_crtc_index(crtc)];
+ struct drm_vblank_crtc *vblank =
&crtc->drm_dev->vblank[drm_crtc_index(crtc)];
struct nvif_head *head = &nouveau_crtc(crtc)->head;
struct nvif_head_scanoutpos_v0 args;
int retry = 20;
--
2.39.2
Paul Kocialkowski
2023-Jul-12 10:13 UTC
[Nouveau] [PATCH RFC v1 00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev
Hi Uwe, On Wed 12 Jul 23, 11:46, Uwe Kleine-K?nig wrote:> Hello, > > while I debugged an issue in the imx-lcdc driver I was constantly > irritated about struct drm_device pointer variables being named "dev" > because with that name I usually expect a struct device pointer.Well personally I usually expect that the "dev" member of a subsystem-specific struct refers to a device of that subsystem, so for me having "dev" refer to a drm_device for e.g. drm_crtc makes good sense. I would only expect dev to refer to a struct device in the subsystem-specific device structure (drm_device). I don't think it makes much sense to carry the struct device in any other subsystem-specific structure anyway. So IMO things are fine as-is but this is not a very strong opinion either.> I think there is a big benefit when these are all renamed to "drm_dev". > I have no strong preference here though, so "drmdev" or "drm" are fine > for me, too. Let the bikesheding begin!I would definitely prefer "drm_dev" over "drmdev" (hard to read, feels like aborted camelcase, pretty ugly) or "drm" (too vague). Cheers, Paul> Some statistics: > > $ git grep -ohE 'struct drm_device *\* *[^ (),;]*' v6.5-rc1 | sort | uniq -c | sort -n > 1 struct drm_device *adev_to_drm > 1 struct drm_device *drm_ > 1 struct drm_device *drm_dev > 1 struct drm_device *drm_dev > 1 struct drm_device *pdev > 1 struct drm_device *rdev > 1 struct drm_device *vdev > 2 struct drm_device *dcss_drv_dev_to_drm > 2 struct drm_device **ddev > 2 struct drm_device *drm_dev_alloc > 2 struct drm_device *mock > 2 struct drm_device *p_ddev > 5 struct drm_device *device > 9 struct drm_device * dev > 25 struct drm_device *d > 95 struct drm_device * > 216 struct drm_device *ddev > 234 struct drm_device *drm_dev > 611 struct drm_device *drm > 4190 struct drm_device *dev > > This series starts with renaming struct drm_crtc::dev to drm_dev. If > it's not only me and others like the result of this effort it should be > followed up by adapting the other structs and the individual usages in > the different drivers. > > To make this series a bit easier handleable, I first added an alias for > drm_crtc::dev, then converted the drivers one after another and the last > patch drops the "dev" name. This has the advantage of being easier to > review, and if I should have missed an instance only the last patch must > be dropped/reverted. Also this series might conflict with other patches, > in this case the remaining patches can still go in (apart from the last > one of course). Maybe it also makes sense to delay applying the last > patch by one development cycle? > > The series was compile tested for arm, arm64, powerpc and amd64 using an > allmodconfig (though I only build drivers/gpu/). > > Best regards > Uwe > > Uwe Kleine-K?nig (52): > drm/crtc: Start renaming struct drm_crtc::dev to drm_dev > drm/core: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/amd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/armada: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/arm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/aspeed: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/ast: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/atmel-hlcdc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/exynos: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/fsl-dcu: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/gma500: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/gud: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/hisilicon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/hyperv: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/i915: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/imx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/ingenic: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/kmb: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/logicvc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/mcde: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/mediatek: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/meson: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/mgag200: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/msm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/mxsfb: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/nouveau: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/omapdrm: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/panel-ili9341: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/pl111: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/qxl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/radeon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/renesas: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/rockchip: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/solomon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/sprd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/sti: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/stm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/sun4i: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tegra: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tidss: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tilcdc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tiny: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/tve200: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/udl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/vboxvideo: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/virtio: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/vkms: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/vmwgfx: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/xen: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/xlnx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/crtc: Complete renaming struct drm_crtc::dev to drm_dev > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 8 +- > drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 22 +-- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 28 ++-- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 26 +-- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 ++-- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 20 +-- > .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 8 +- > .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 22 +-- > .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- > .../gpu/drm/arm/display/komeda/komeda_crtc.c | 24 +-- > .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- > drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +- > drivers/gpu/drm/arm/malidp_crtc.c | 7 +- > drivers/gpu/drm/armada/armada_crtc.c | 10 +- > drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 6 +- > drivers/gpu/drm/ast/ast_dp.c | 2 +- > drivers/gpu/drm/ast/ast_mode.c | 26 +-- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 10 +- > drivers/gpu/drm/drm_atomic.c | 22 +-- > drivers/gpu/drm/drm_atomic_helper.c | 20 ++- > drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- > drivers/gpu/drm/drm_atomic_uapi.c | 22 +-- > drivers/gpu/drm/drm_blend.c | 2 +- > drivers/gpu/drm/drm_color_mgmt.c | 10 +- > drivers/gpu/drm/drm_crtc.c | 19 ++- > drivers/gpu/drm/drm_crtc_helper.c | 10 +- > drivers/gpu/drm/drm_debugfs.c | 2 +- > drivers/gpu/drm/drm_debugfs_crc.c | 2 +- > drivers/gpu/drm/drm_fb_helper.c | 6 +- > drivers/gpu/drm/drm_mipi_dbi.c | 4 +- > drivers/gpu/drm/drm_plane.c | 2 +- > drivers/gpu/drm/drm_plane_helper.c | 2 +- > drivers/gpu/drm/drm_self_refresh_helper.c | 2 +- > drivers/gpu/drm/drm_vblank.c | 40 ++--- > drivers/gpu/drm/drm_vblank_work.c | 2 +- > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 8 +- > drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 16 +- > drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +- > drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- > drivers/gpu/drm/gma500/gma_display.c | 20 +-- > drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- > drivers/gpu/drm/gma500/oaktrail_hdmi.c | 4 +- > drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- > drivers/gpu/drm/gma500/psb_irq.c | 6 +- > drivers/gpu/drm/gud/gud_pipe.c | 6 +- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 20 +-- > .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +- > drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 6 +- > drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- > drivers/gpu/drm/i915/display/hsw_ips.c | 16 +- > drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +- > drivers/gpu/drm/i915/display/i9xx_wm.c | 40 ++--- > drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- > drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- > .../gpu/drm/i915/display/intel_atomic_plane.c | 4 +- > drivers/gpu/drm/i915/display/intel_audio.c | 2 +- > drivers/gpu/drm/i915/display/intel_bw.c | 10 +- > drivers/gpu/drm/i915/display/intel_cdclk.c | 6 +- > drivers/gpu/drm/i915/display/intel_color.c | 124 +++++++------- > drivers/gpu/drm/i915/display/intel_crtc.c | 20 +-- > .../drm/i915/display/intel_crtc_state_dump.c | 4 +- > drivers/gpu/drm/i915/display/intel_cursor.c | 2 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 28 ++-- > drivers/gpu/drm/i915/display/intel_display.c | 154 +++++++++--------- > .../gpu/drm/i915/display/intel_display_irq.c | 22 +-- > .../gpu/drm/i915/display/intel_display_rps.c | 2 +- > .../drm/i915/display/intel_display_trace.h | 12 +- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > drivers/gpu/drm/i915/display/intel_dpll.c | 38 ++--- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 44 ++--- > drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- > drivers/gpu/drm/i915/display/intel_drrs.c | 10 +- > drivers/gpu/drm/i915/display/intel_dsb.c | 8 +- > drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- > drivers/gpu/drm/i915/display/intel_fdi.c | 22 +-- > .../drm/i915/display/intel_fifo_underrun.c | 6 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- > .../drm/i915/display/intel_modeset_setup.c | 22 +-- > .../drm/i915/display/intel_modeset_verify.c | 2 +- > drivers/gpu/drm/i915/display/intel_panel.c | 4 +- > .../gpu/drm/i915/display/intel_pch_display.c | 32 ++-- > .../gpu/drm/i915/display/intel_pch_refclk.c | 2 +- > drivers/gpu/drm/i915/display/intel_pipe_crc.c | 10 +- > .../drm/i915/display/intel_plane_initial.c | 6 +- > drivers/gpu/drm/i915/display/intel_psr.c | 14 +- > drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- > drivers/gpu/drm/i915/display/intel_vblank.c | 24 +-- > drivers/gpu/drm/i915/display/intel_vdsc.c | 18 +- > drivers/gpu/drm/i915/display/intel_vrr.c | 18 +- > drivers/gpu/drm/i915/display/skl_scaler.c | 10 +- > .../drm/i915/display/skl_universal_plane.c | 6 +- > drivers/gpu/drm/i915/display/skl_watermark.c | 42 ++--- > drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- > drivers/gpu/drm/imx/dcss/dcss-crtc.c | 20 +-- > drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 15 +- > drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 16 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +- > drivers/gpu/drm/kmb/kmb_crtc.c | 16 +- > drivers/gpu/drm/logicvc/logicvc_crtc.c | 14 +- > drivers/gpu/drm/mcde/mcde_display.c | 18 +- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 22 +-- > drivers/gpu/drm/meson/meson_crtc.c | 12 +- > drivers/gpu/drm/mgag200/mgag200_g200.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200eh.c | 2 +- > drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200se.c | 6 +- > drivers/gpu/drm/mgag200/mgag200_g200wb.c | 2 +- > drivers/gpu/drm/mgag200/mgag200_mode.c | 10 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 6 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 70 ++++---- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 12 +- > drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 20 +-- > drivers/gpu/drm/msm/msm_drv.c | 4 +- > drivers/gpu/drm/mxsfb/lcdif_kms.c | 18 +- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 16 +- > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 58 +++---- > drivers/gpu/drm/nouveau/dispnv04/cursor.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/atom.h | 2 +- > drivers/gpu/drm/nouveau/dispnv50/crc.c | 30 ++-- > drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 2 +- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- > drivers/gpu/drm/nouveau/dispnv50/head.c | 4 +- > drivers/gpu/drm/nouveau/dispnv50/head507d.c | 26 +-- > drivers/gpu/drm/nouveau/dispnv50/head827d.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/head907d.c | 26 +-- > drivers/gpu/drm/nouveau/dispnv50/head917d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 18 +- > drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 10 +- > drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- > drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- > drivers/gpu/drm/omapdrm/omap_crtc.c | 56 +++---- > drivers/gpu/drm/omapdrm/omap_irq.c | 6 +- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +- > drivers/gpu/drm/pl111/pl111_display.c | 16 +- > drivers/gpu/drm/qxl/qxl_display.c | 2 +- > drivers/gpu/drm/radeon/atombios_crtc.c | 54 +++--- > drivers/gpu/drm/radeon/radeon_cursor.c | 14 +- > drivers/gpu/drm/radeon/radeon_display.c | 28 ++-- > drivers/gpu/drm/radeon/radeon_kms.c | 6 +- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +- > .../gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 14 +- > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 20 +-- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 15 +- > drivers/gpu/drm/solomon/ssd130x.c | 2 +- > drivers/gpu/drm/sprd/sprd_dpu.c | 6 +- > drivers/gpu/drm/sti/sti_crtc.c | 14 +- > drivers/gpu/drm/stm/ltdc.c | 12 +- > drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 +- > drivers/gpu/drm/tegra/dc.c | 12 +- > drivers/gpu/drm/tidss/tidss_crtc.c | 19 ++- > drivers/gpu/drm/tidss/tidss_irq.c | 4 +- > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 43 ++--- > drivers/gpu/drm/tiny/bochs.c | 6 +- > drivers/gpu/drm/tiny/cirrus.c | 2 +- > drivers/gpu/drm/tiny/gm12u320.c | 4 +- > drivers/gpu/drm/tiny/hx8357d.c | 4 +- > drivers/gpu/drm/tiny/ili9163.c | 4 +- > drivers/gpu/drm/tiny/ili9225.c | 8 +- > drivers/gpu/drm/tiny/ili9341.c | 4 +- > drivers/gpu/drm/tiny/ili9486.c | 4 +- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +- > drivers/gpu/drm/tiny/ofdrm.c | 8 +- > drivers/gpu/drm/tiny/panel-mipi-dbi.c | 6 +- > drivers/gpu/drm/tiny/repaper.c | 8 +- > drivers/gpu/drm/tiny/simpledrm.c | 2 +- > drivers/gpu/drm/tiny/st7586.c | 6 +- > drivers/gpu/drm/tiny/st7735r.c | 4 +- > drivers/gpu/drm/tve200/tve200_display.c | 14 +- > drivers/gpu/drm/udl/udl_modeset.c | 4 +- > drivers/gpu/drm/vboxvideo/vbox_mode.c | 6 +- > drivers/gpu/drm/vc4/vc4_crtc.c | 38 ++--- > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > drivers/gpu/drm/vc4/vc4_hvs.c | 12 +- > drivers/gpu/drm/vc4/vc4_txp.c | 2 +- > drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- > drivers/gpu/drm/vkms/vkms_crtc.c | 12 +- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 8 +- > drivers/gpu/drm/xen/xen_drm_front_kms.c | 10 +- > drivers/gpu/drm/xlnx/zynqmp_kms.c | 8 +- > include/drm/drm_atomic_helper.h | 2 +- > include/drm/drm_crtc.h | 4 +- > 194 files changed, 1296 insertions(+), 1264 deletions(-) > > base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 > -- > 2.39.2 >-- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <https://lists.freedesktop.org/archives/nouveau/attachments/20230712/f9ec06fe/attachment-0001.sig>
Thomas Zimmermann
2023-Jul-12 10:19 UTC
[PATCH RFC v1 00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev
Hi Am 12.07.23 um 11:46 schrieb Uwe Kleine-K?nig:> Hello, > > while I debugged an issue in the imx-lcdc driver I was constantly > irritated about struct drm_device pointer variables being named "dev" > because with that name I usually expect a struct device pointer. > > I think there is a big benefit when these are all renamed to "drm_dev".If you rename drm_crtc.dev, you should also address *all* other data structures.> I have no strong preference here though, so "drmdev" or "drm" are fine > for me, too. Let the bikesheding begin!We've discussed this to death. IIRC 'drm' would be the prefered choice. Best regards Thomas> > Some statistics: > > $ git grep -ohE 'struct drm_device *\* *[^ (),;]*' v6.5-rc1 | sort | uniq -c | sort -n > 1 struct drm_device *adev_to_drm > 1 struct drm_device *drm_ > 1 struct drm_device *drm_dev > 1 struct drm_device *drm_dev > 1 struct drm_device *pdev > 1 struct drm_device *rdev > 1 struct drm_device *vdev > 2 struct drm_device *dcss_drv_dev_to_drm > 2 struct drm_device **ddev > 2 struct drm_device *drm_dev_alloc > 2 struct drm_device *mock > 2 struct drm_device *p_ddev > 5 struct drm_device *device > 9 struct drm_device * dev > 25 struct drm_device *d > 95 struct drm_device * > 216 struct drm_device *ddev > 234 struct drm_device *drm_dev > 611 struct drm_device *drm > 4190 struct drm_device *dev > > This series starts with renaming struct drm_crtc::dev to drm_dev. If > it's not only me and others like the result of this effort it should be > followed up by adapting the other structs and the individual usages in > the different drivers. > > To make this series a bit easier handleable, I first added an alias for > drm_crtc::dev, then converted the drivers one after another and the last > patch drops the "dev" name. This has the advantage of being easier to > review, and if I should have missed an instance only the last patch must > be dropped/reverted. Also this series might conflict with other patches, > in this case the remaining patches can still go in (apart from the last > one of course). Maybe it also makes sense to delay applying the last > patch by one development cycle? > > The series was compile tested for arm, arm64, powerpc and amd64 using an > allmodconfig (though I only build drivers/gpu/). > > Best regards > Uwe > > Uwe Kleine-K?nig (52): > drm/crtc: Start renaming struct drm_crtc::dev to drm_dev > drm/core: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/amd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/armada: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/arm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/aspeed: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/ast: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/atmel-hlcdc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/exynos: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/fsl-dcu: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/gma500: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/gud: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/hisilicon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/hyperv: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/i915: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/imx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/ingenic: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/kmb: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/logicvc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/mcde: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/mediatek: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/meson: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/mgag200: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/msm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/mxsfb: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/nouveau: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/omapdrm: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/panel-ili9341: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/pl111: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/qxl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/radeon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/renesas: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/rockchip: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/solomon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/sprd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/sti: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/stm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/sun4i: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tegra: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tidss: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tilcdc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tiny: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/tve200: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/udl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/vboxvideo: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/virtio: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/vkms: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/vmwgfx: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/xen: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/xlnx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/crtc: Complete renaming struct drm_crtc::dev to drm_dev > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 8 +- > drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 22 +-- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 28 ++-- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 26 +-- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 ++-- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 20 +-- > .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 8 +- > .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 22 +-- > .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- > .../gpu/drm/arm/display/komeda/komeda_crtc.c | 24 +-- > .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- > drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +- > drivers/gpu/drm/arm/malidp_crtc.c | 7 +- > drivers/gpu/drm/armada/armada_crtc.c | 10 +- > drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 6 +- > drivers/gpu/drm/ast/ast_dp.c | 2 +- > drivers/gpu/drm/ast/ast_mode.c | 26 +-- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 10 +- > drivers/gpu/drm/drm_atomic.c | 22 +-- > drivers/gpu/drm/drm_atomic_helper.c | 20 ++- > drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- > drivers/gpu/drm/drm_atomic_uapi.c | 22 +-- > drivers/gpu/drm/drm_blend.c | 2 +- > drivers/gpu/drm/drm_color_mgmt.c | 10 +- > drivers/gpu/drm/drm_crtc.c | 19 ++- > drivers/gpu/drm/drm_crtc_helper.c | 10 +- > drivers/gpu/drm/drm_debugfs.c | 2 +- > drivers/gpu/drm/drm_debugfs_crc.c | 2 +- > drivers/gpu/drm/drm_fb_helper.c | 6 +- > drivers/gpu/drm/drm_mipi_dbi.c | 4 +- > drivers/gpu/drm/drm_plane.c | 2 +- > drivers/gpu/drm/drm_plane_helper.c | 2 +- > drivers/gpu/drm/drm_self_refresh_helper.c | 2 +- > drivers/gpu/drm/drm_vblank.c | 40 ++--- > drivers/gpu/drm/drm_vblank_work.c | 2 +- > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 8 +- > drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 16 +- > drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +- > drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- > drivers/gpu/drm/gma500/gma_display.c | 20 +-- > drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- > drivers/gpu/drm/gma500/oaktrail_hdmi.c | 4 +- > drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- > drivers/gpu/drm/gma500/psb_irq.c | 6 +- > drivers/gpu/drm/gud/gud_pipe.c | 6 +- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 20 +-- > .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +- > drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 6 +- > drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- > drivers/gpu/drm/i915/display/hsw_ips.c | 16 +- > drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +- > drivers/gpu/drm/i915/display/i9xx_wm.c | 40 ++--- > drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- > drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- > .../gpu/drm/i915/display/intel_atomic_plane.c | 4 +- > drivers/gpu/drm/i915/display/intel_audio.c | 2 +- > drivers/gpu/drm/i915/display/intel_bw.c | 10 +- > drivers/gpu/drm/i915/display/intel_cdclk.c | 6 +- > drivers/gpu/drm/i915/display/intel_color.c | 124 +++++++------- > drivers/gpu/drm/i915/display/intel_crtc.c | 20 +-- > .../drm/i915/display/intel_crtc_state_dump.c | 4 +- > drivers/gpu/drm/i915/display/intel_cursor.c | 2 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 28 ++-- > drivers/gpu/drm/i915/display/intel_display.c | 154 +++++++++--------- > .../gpu/drm/i915/display/intel_display_irq.c | 22 +-- > .../gpu/drm/i915/display/intel_display_rps.c | 2 +- > .../drm/i915/display/intel_display_trace.h | 12 +- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > drivers/gpu/drm/i915/display/intel_dpll.c | 38 ++--- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 44 ++--- > drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- > drivers/gpu/drm/i915/display/intel_drrs.c | 10 +- > drivers/gpu/drm/i915/display/intel_dsb.c | 8 +- > drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- > drivers/gpu/drm/i915/display/intel_fdi.c | 22 +-- > .../drm/i915/display/intel_fifo_underrun.c | 6 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- > .../drm/i915/display/intel_modeset_setup.c | 22 +-- > .../drm/i915/display/intel_modeset_verify.c | 2 +- > drivers/gpu/drm/i915/display/intel_panel.c | 4 +- > .../gpu/drm/i915/display/intel_pch_display.c | 32 ++-- > .../gpu/drm/i915/display/intel_pch_refclk.c | 2 +- > drivers/gpu/drm/i915/display/intel_pipe_crc.c | 10 +- > .../drm/i915/display/intel_plane_initial.c | 6 +- > drivers/gpu/drm/i915/display/intel_psr.c | 14 +- > drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- > drivers/gpu/drm/i915/display/intel_vblank.c | 24 +-- > drivers/gpu/drm/i915/display/intel_vdsc.c | 18 +- > drivers/gpu/drm/i915/display/intel_vrr.c | 18 +- > drivers/gpu/drm/i915/display/skl_scaler.c | 10 +- > .../drm/i915/display/skl_universal_plane.c | 6 +- > drivers/gpu/drm/i915/display/skl_watermark.c | 42 ++--- > drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- > drivers/gpu/drm/imx/dcss/dcss-crtc.c | 20 +-- > drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 15 +- > drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 16 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +- > drivers/gpu/drm/kmb/kmb_crtc.c | 16 +- > drivers/gpu/drm/logicvc/logicvc_crtc.c | 14 +- > drivers/gpu/drm/mcde/mcde_display.c | 18 +- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 22 +-- > drivers/gpu/drm/meson/meson_crtc.c | 12 +- > drivers/gpu/drm/mgag200/mgag200_g200.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200eh.c | 2 +- > drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200se.c | 6 +- > drivers/gpu/drm/mgag200/mgag200_g200wb.c | 2 +- > drivers/gpu/drm/mgag200/mgag200_mode.c | 10 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 6 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 70 ++++---- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 12 +- > drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 20 +-- > drivers/gpu/drm/msm/msm_drv.c | 4 +- > drivers/gpu/drm/mxsfb/lcdif_kms.c | 18 +- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 16 +- > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 58 +++---- > drivers/gpu/drm/nouveau/dispnv04/cursor.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/atom.h | 2 +- > drivers/gpu/drm/nouveau/dispnv50/crc.c | 30 ++-- > drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 2 +- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- > drivers/gpu/drm/nouveau/dispnv50/head.c | 4 +- > drivers/gpu/drm/nouveau/dispnv50/head507d.c | 26 +-- > drivers/gpu/drm/nouveau/dispnv50/head827d.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/head907d.c | 26 +-- > drivers/gpu/drm/nouveau/dispnv50/head917d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 18 +- > drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 10 +- > drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- > drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- > drivers/gpu/drm/omapdrm/omap_crtc.c | 56 +++---- > drivers/gpu/drm/omapdrm/omap_irq.c | 6 +- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +- > drivers/gpu/drm/pl111/pl111_display.c | 16 +- > drivers/gpu/drm/qxl/qxl_display.c | 2 +- > drivers/gpu/drm/radeon/atombios_crtc.c | 54 +++--- > drivers/gpu/drm/radeon/radeon_cursor.c | 14 +- > drivers/gpu/drm/radeon/radeon_display.c | 28 ++-- > drivers/gpu/drm/radeon/radeon_kms.c | 6 +- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +- > .../gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 14 +- > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 20 +-- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 15 +- > drivers/gpu/drm/solomon/ssd130x.c | 2 +- > drivers/gpu/drm/sprd/sprd_dpu.c | 6 +- > drivers/gpu/drm/sti/sti_crtc.c | 14 +- > drivers/gpu/drm/stm/ltdc.c | 12 +- > drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 +- > drivers/gpu/drm/tegra/dc.c | 12 +- > drivers/gpu/drm/tidss/tidss_crtc.c | 19 ++- > drivers/gpu/drm/tidss/tidss_irq.c | 4 +- > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 43 ++--- > drivers/gpu/drm/tiny/bochs.c | 6 +- > drivers/gpu/drm/tiny/cirrus.c | 2 +- > drivers/gpu/drm/tiny/gm12u320.c | 4 +- > drivers/gpu/drm/tiny/hx8357d.c | 4 +- > drivers/gpu/drm/tiny/ili9163.c | 4 +- > drivers/gpu/drm/tiny/ili9225.c | 8 +- > drivers/gpu/drm/tiny/ili9341.c | 4 +- > drivers/gpu/drm/tiny/ili9486.c | 4 +- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +- > drivers/gpu/drm/tiny/ofdrm.c | 8 +- > drivers/gpu/drm/tiny/panel-mipi-dbi.c | 6 +- > drivers/gpu/drm/tiny/repaper.c | 8 +- > drivers/gpu/drm/tiny/simpledrm.c | 2 +- > drivers/gpu/drm/tiny/st7586.c | 6 +- > drivers/gpu/drm/tiny/st7735r.c | 4 +- > drivers/gpu/drm/tve200/tve200_display.c | 14 +- > drivers/gpu/drm/udl/udl_modeset.c | 4 +- > drivers/gpu/drm/vboxvideo/vbox_mode.c | 6 +- > drivers/gpu/drm/vc4/vc4_crtc.c | 38 ++--- > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > drivers/gpu/drm/vc4/vc4_hvs.c | 12 +- > drivers/gpu/drm/vc4/vc4_txp.c | 2 +- > drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- > drivers/gpu/drm/vkms/vkms_crtc.c | 12 +- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 8 +- > drivers/gpu/drm/xen/xen_drm_front_kms.c | 10 +- > drivers/gpu/drm/xlnx/zynqmp_kms.c | 8 +- > include/drm/drm_atomic_helper.h | 2 +- > include/drm/drm_crtc.h | 4 +- > 194 files changed, 1296 insertions(+), 1264 deletions(-) > > base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg) -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenPGP_signature Type: application/pgp-signature Size: 840 bytes Desc: OpenPGP digital signature URL: <http://lists.linuxfoundation.org/pipermail/virtualization/attachments/20230712/ab07816a/attachment-0001.sig>
Christian König
2023-Jul-12 10:46 UTC
[PATCH RFC v1 00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev
Am 12.07.23 um 11:46 schrieb Uwe Kleine-K?nig:> Hello, > > while I debugged an issue in the imx-lcdc driver I was constantly > irritated about struct drm_device pointer variables being named "dev" > because with that name I usually expect a struct device pointer. > > I think there is a big benefit when these are all renamed to "drm_dev". > I have no strong preference here though, so "drmdev" or "drm" are fine > for me, too. Let the bikesheding begin! > > Some statistics: > > $ git grep -ohE 'struct drm_device *\* *[^ (),;]*' v6.5-rc1 | sort | uniq -c | sort -n > 1 struct drm_device *adev_to_drm > 1 struct drm_device *drm_ > 1 struct drm_device *drm_dev > 1 struct drm_device *drm_dev > 1 struct drm_device *pdev > 1 struct drm_device *rdev > 1 struct drm_device *vdev > 2 struct drm_device *dcss_drv_dev_to_drm > 2 struct drm_device **ddev > 2 struct drm_device *drm_dev_alloc > 2 struct drm_device *mock > 2 struct drm_device *p_ddev > 5 struct drm_device *device > 9 struct drm_device * dev > 25 struct drm_device *d > 95 struct drm_device * > 216 struct drm_device *ddev > 234 struct drm_device *drm_dev > 611 struct drm_device *drm > 4190 struct drm_device *dev > > This series starts with renaming struct drm_crtc::dev to drm_dev. If > it's not only me and others like the result of this effort it should be > followed up by adapting the other structs and the individual usages in > the different drivers. > > To make this series a bit easier handleable, I first added an alias for > drm_crtc::dev, then converted the drivers one after another and the last > patch drops the "dev" name. This has the advantage of being easier to > review, and if I should have missed an instance only the last patch must > be dropped/reverted. Also this series might conflict with other patches, > in this case the remaining patches can still go in (apart from the last > one of course). Maybe it also makes sense to delay applying the last > patch by one development cycle?When you automatically generate the patch (with cocci for example) I usually prefer a single patch instead. Background is that this makes merge conflicts easier to handle and detect. When you have multiple patches and a merge conflict because of some added lines using the old field the build breaks only on the last patch which removes the old field. In such cases reviewing the patch just means automatically re-generating it and double checking that you don't see anything funky. Apart from that I honestly absolutely don't care what the name is. Cheers, Christian.> > The series was compile tested for arm, arm64, powerpc and amd64 using an > allmodconfig (though I only build drivers/gpu/). > > Best regards > Uwe > > Uwe Kleine-K?nig (52): > drm/crtc: Start renaming struct drm_crtc::dev to drm_dev > drm/core: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/amd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/armada: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/arm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/aspeed: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/ast: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/atmel-hlcdc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/exynos: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/fsl-dcu: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/gma500: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/gud: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/hisilicon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/hyperv: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/i915: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/imx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/ingenic: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/kmb: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/logicvc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/mcde: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/mediatek: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/meson: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/mgag200: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/msm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/mxsfb: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/nouveau: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/omapdrm: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/panel-ili9341: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/pl111: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/qxl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/radeon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/renesas: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/rockchip: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/solomon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/sprd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/sti: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/stm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/sun4i: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tegra: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tidss: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tilcdc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tiny: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/tve200: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/udl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/vboxvideo: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/virtio: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/vkms: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/vmwgfx: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/xen: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/xlnx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/crtc: Complete renaming struct drm_crtc::dev to drm_dev > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 8 +- > drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 22 +-- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 28 ++-- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 26 +-- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 ++-- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 20 +-- > .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 8 +- > .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 22 +-- > .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- > .../gpu/drm/arm/display/komeda/komeda_crtc.c | 24 +-- > .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- > drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +- > drivers/gpu/drm/arm/malidp_crtc.c | 7 +- > drivers/gpu/drm/armada/armada_crtc.c | 10 +- > drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 6 +- > drivers/gpu/drm/ast/ast_dp.c | 2 +- > drivers/gpu/drm/ast/ast_mode.c | 26 +-- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 10 +- > drivers/gpu/drm/drm_atomic.c | 22 +-- > drivers/gpu/drm/drm_atomic_helper.c | 20 ++- > drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- > drivers/gpu/drm/drm_atomic_uapi.c | 22 +-- > drivers/gpu/drm/drm_blend.c | 2 +- > drivers/gpu/drm/drm_color_mgmt.c | 10 +- > drivers/gpu/drm/drm_crtc.c | 19 ++- > drivers/gpu/drm/drm_crtc_helper.c | 10 +- > drivers/gpu/drm/drm_debugfs.c | 2 +- > drivers/gpu/drm/drm_debugfs_crc.c | 2 +- > drivers/gpu/drm/drm_fb_helper.c | 6 +- > drivers/gpu/drm/drm_mipi_dbi.c | 4 +- > drivers/gpu/drm/drm_plane.c | 2 +- > drivers/gpu/drm/drm_plane_helper.c | 2 +- > drivers/gpu/drm/drm_self_refresh_helper.c | 2 +- > drivers/gpu/drm/drm_vblank.c | 40 ++--- > drivers/gpu/drm/drm_vblank_work.c | 2 +- > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 8 +- > drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 16 +- > drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +- > drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- > drivers/gpu/drm/gma500/gma_display.c | 20 +-- > drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- > drivers/gpu/drm/gma500/oaktrail_hdmi.c | 4 +- > drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- > drivers/gpu/drm/gma500/psb_irq.c | 6 +- > drivers/gpu/drm/gud/gud_pipe.c | 6 +- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 20 +-- > .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +- > drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 6 +- > drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- > drivers/gpu/drm/i915/display/hsw_ips.c | 16 +- > drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +- > drivers/gpu/drm/i915/display/i9xx_wm.c | 40 ++--- > drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- > drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- > .../gpu/drm/i915/display/intel_atomic_plane.c | 4 +- > drivers/gpu/drm/i915/display/intel_audio.c | 2 +- > drivers/gpu/drm/i915/display/intel_bw.c | 10 +- > drivers/gpu/drm/i915/display/intel_cdclk.c | 6 +- > drivers/gpu/drm/i915/display/intel_color.c | 124 +++++++------- > drivers/gpu/drm/i915/display/intel_crtc.c | 20 +-- > .../drm/i915/display/intel_crtc_state_dump.c | 4 +- > drivers/gpu/drm/i915/display/intel_cursor.c | 2 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 28 ++-- > drivers/gpu/drm/i915/display/intel_display.c | 154 +++++++++--------- > .../gpu/drm/i915/display/intel_display_irq.c | 22 +-- > .../gpu/drm/i915/display/intel_display_rps.c | 2 +- > .../drm/i915/display/intel_display_trace.h | 12 +- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > drivers/gpu/drm/i915/display/intel_dpll.c | 38 ++--- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 44 ++--- > drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- > drivers/gpu/drm/i915/display/intel_drrs.c | 10 +- > drivers/gpu/drm/i915/display/intel_dsb.c | 8 +- > drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- > drivers/gpu/drm/i915/display/intel_fdi.c | 22 +-- > .../drm/i915/display/intel_fifo_underrun.c | 6 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- > .../drm/i915/display/intel_modeset_setup.c | 22 +-- > .../drm/i915/display/intel_modeset_verify.c | 2 +- > drivers/gpu/drm/i915/display/intel_panel.c | 4 +- > .../gpu/drm/i915/display/intel_pch_display.c | 32 ++-- > .../gpu/drm/i915/display/intel_pch_refclk.c | 2 +- > drivers/gpu/drm/i915/display/intel_pipe_crc.c | 10 +- > .../drm/i915/display/intel_plane_initial.c | 6 +- > drivers/gpu/drm/i915/display/intel_psr.c | 14 +- > drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- > drivers/gpu/drm/i915/display/intel_vblank.c | 24 +-- > drivers/gpu/drm/i915/display/intel_vdsc.c | 18 +- > drivers/gpu/drm/i915/display/intel_vrr.c | 18 +- > drivers/gpu/drm/i915/display/skl_scaler.c | 10 +- > .../drm/i915/display/skl_universal_plane.c | 6 +- > drivers/gpu/drm/i915/display/skl_watermark.c | 42 ++--- > drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- > drivers/gpu/drm/imx/dcss/dcss-crtc.c | 20 +-- > drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 15 +- > drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 16 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +- > drivers/gpu/drm/kmb/kmb_crtc.c | 16 +- > drivers/gpu/drm/logicvc/logicvc_crtc.c | 14 +- > drivers/gpu/drm/mcde/mcde_display.c | 18 +- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 22 +-- > drivers/gpu/drm/meson/meson_crtc.c | 12 +- > drivers/gpu/drm/mgag200/mgag200_g200.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200eh.c | 2 +- > drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200se.c | 6 +- > drivers/gpu/drm/mgag200/mgag200_g200wb.c | 2 +- > drivers/gpu/drm/mgag200/mgag200_mode.c | 10 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 6 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 70 ++++---- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 12 +- > drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 20 +-- > drivers/gpu/drm/msm/msm_drv.c | 4 +- > drivers/gpu/drm/mxsfb/lcdif_kms.c | 18 +- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 16 +- > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 58 +++---- > drivers/gpu/drm/nouveau/dispnv04/cursor.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/atom.h | 2 +- > drivers/gpu/drm/nouveau/dispnv50/crc.c | 30 ++-- > drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 2 +- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- > drivers/gpu/drm/nouveau/dispnv50/head.c | 4 +- > drivers/gpu/drm/nouveau/dispnv50/head507d.c | 26 +-- > drivers/gpu/drm/nouveau/dispnv50/head827d.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/head907d.c | 26 +-- > drivers/gpu/drm/nouveau/dispnv50/head917d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 18 +- > drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 10 +- > drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- > drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- > drivers/gpu/drm/omapdrm/omap_crtc.c | 56 +++---- > drivers/gpu/drm/omapdrm/omap_irq.c | 6 +- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +- > drivers/gpu/drm/pl111/pl111_display.c | 16 +- > drivers/gpu/drm/qxl/qxl_display.c | 2 +- > drivers/gpu/drm/radeon/atombios_crtc.c | 54 +++--- > drivers/gpu/drm/radeon/radeon_cursor.c | 14 +- > drivers/gpu/drm/radeon/radeon_display.c | 28 ++-- > drivers/gpu/drm/radeon/radeon_kms.c | 6 +- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +- > .../gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 14 +- > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 20 +-- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 15 +- > drivers/gpu/drm/solomon/ssd130x.c | 2 +- > drivers/gpu/drm/sprd/sprd_dpu.c | 6 +- > drivers/gpu/drm/sti/sti_crtc.c | 14 +- > drivers/gpu/drm/stm/ltdc.c | 12 +- > drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 +- > drivers/gpu/drm/tegra/dc.c | 12 +- > drivers/gpu/drm/tidss/tidss_crtc.c | 19 ++- > drivers/gpu/drm/tidss/tidss_irq.c | 4 +- > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 43 ++--- > drivers/gpu/drm/tiny/bochs.c | 6 +- > drivers/gpu/drm/tiny/cirrus.c | 2 +- > drivers/gpu/drm/tiny/gm12u320.c | 4 +- > drivers/gpu/drm/tiny/hx8357d.c | 4 +- > drivers/gpu/drm/tiny/ili9163.c | 4 +- > drivers/gpu/drm/tiny/ili9225.c | 8 +- > drivers/gpu/drm/tiny/ili9341.c | 4 +- > drivers/gpu/drm/tiny/ili9486.c | 4 +- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +- > drivers/gpu/drm/tiny/ofdrm.c | 8 +- > drivers/gpu/drm/tiny/panel-mipi-dbi.c | 6 +- > drivers/gpu/drm/tiny/repaper.c | 8 +- > drivers/gpu/drm/tiny/simpledrm.c | 2 +- > drivers/gpu/drm/tiny/st7586.c | 6 +- > drivers/gpu/drm/tiny/st7735r.c | 4 +- > drivers/gpu/drm/tve200/tve200_display.c | 14 +- > drivers/gpu/drm/udl/udl_modeset.c | 4 +- > drivers/gpu/drm/vboxvideo/vbox_mode.c | 6 +- > drivers/gpu/drm/vc4/vc4_crtc.c | 38 ++--- > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > drivers/gpu/drm/vc4/vc4_hvs.c | 12 +- > drivers/gpu/drm/vc4/vc4_txp.c | 2 +- > drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- > drivers/gpu/drm/vkms/vkms_crtc.c | 12 +- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 8 +- > drivers/gpu/drm/xen/xen_drm_front_kms.c | 10 +- > drivers/gpu/drm/xlnx/zynqmp_kms.c | 8 +- > include/drm/drm_atomic_helper.h | 2 +- > include/drm/drm_crtc.h | 4 +- > 194 files changed, 1296 insertions(+), 1264 deletions(-) > > base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
Uwe Kleine-König
2023-Jul-12 10:54 UTC
[Nouveau] [PATCH RFC v1 00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev
Hello Thomas, On Wed, Jul 12, 2023 at 12:19:37PM +0200, Thomas Zimmermann wrote:> Am 12.07.23 um 11:46 schrieb Uwe Kleine-K?nig: > > Hello, > > > > while I debugged an issue in the imx-lcdc driver I was constantly > > irritated about struct drm_device pointer variables being named "dev" > > because with that name I usually expect a struct device pointer. > > > > I think there is a big benefit when these are all renamed to "drm_dev". > > If you rename drm_crtc.dev, you should also address *all* other data > structures.Yes. Changing drm_crtc::dev was some effort, so I thought to send that one out before doing the same to drm_dp_mst_topology_mgr drm_atomic_state drm_master drm_bridge drm_client_dev drm_connector drm_debugfs_entry drm_encoder drm_fb_helper drm_minor drm_framebuffer drm_gem_object drm_plane drm_property drm_property_blob drm_vblank_crtc when in the end the intention isn't welcome.> > I have no strong preference here though, so "drmdev" or "drm" are fine > > for me, too. Let the bikesheding begin! > > We've discussed this to death. IIRC 'drm' would be the prefered choice."drm" at least has the advantage to be the 2nd most common name. With Paul Kocialkowski prefering "drm_dev" there is no clear favourite yet. Maybe all the other people with strong opinions are dead if this was "discussed to death" before? :-) Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | https://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <https://lists.freedesktop.org/archives/nouveau/attachments/20230712/d1463546/attachment-0001.sig>
Uwe Kleine-König
2023-Jul-12 11:02 UTC
[Nouveau] [PATCH RFC v1 00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev
On Wed, Jul 12, 2023 at 12:46:33PM +0200, Christian K?nig wrote:> Am 12.07.23 um 11:46 schrieb Uwe Kleine-K?nig: > > Hello, > > > > while I debugged an issue in the imx-lcdc driver I was constantly > > irritated about struct drm_device pointer variables being named "dev" > > because with that name I usually expect a struct device pointer. > > > > I think there is a big benefit when these are all renamed to "drm_dev". > > I have no strong preference here though, so "drmdev" or "drm" are fine > > for me, too. Let the bikesheding begin! > > > > Some statistics: > > > > $ git grep -ohE 'struct drm_device *\* *[^ (),;]*' v6.5-rc1 | sort | uniq -c | sort -n > > 1 struct drm_device *adev_to_drm > > 1 struct drm_device *drm_ > > 1 struct drm_device *drm_dev > > 1 struct drm_device *drm_dev > > 1 struct drm_device *pdev > > 1 struct drm_device *rdev > > 1 struct drm_device *vdev > > 2 struct drm_device *dcss_drv_dev_to_drm > > 2 struct drm_device **ddev > > 2 struct drm_device *drm_dev_alloc > > 2 struct drm_device *mock > > 2 struct drm_device *p_ddev > > 5 struct drm_device *device > > 9 struct drm_device * dev > > 25 struct drm_device *d > > 95 struct drm_device * > > 216 struct drm_device *ddev > > 234 struct drm_device *drm_dev > > 611 struct drm_device *drm > > 4190 struct drm_device *dev > > > > This series starts with renaming struct drm_crtc::dev to drm_dev. If > > it's not only me and others like the result of this effort it should be > > followed up by adapting the other structs and the individual usages in > > the different drivers. > > > > To make this series a bit easier handleable, I first added an alias for > > drm_crtc::dev, then converted the drivers one after another and the last > > patch drops the "dev" name. This has the advantage of being easier to > > review, and if I should have missed an instance only the last patch must > > be dropped/reverted. Also this series might conflict with other patches, > > in this case the remaining patches can still go in (apart from the last > > one of course). Maybe it also makes sense to delay applying the last > > patch by one development cycle? > > When you automatically generate the patch (with cocci for example) I usually > prefer a single patch instead.Maybe I'm too stupid, but only parts of this patch were created by coccinelle. I failed to convert code like - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); Added Julia to Cc, maybe she has a hint?! (Up to now it's only @@ struct drm_crtc *crtc; @@ -crtc->dev +crtc->drm_dev )> Background is that this makes merge conflicts easier to handle and detect.Really? Each file (apart from include/drm/drm_crtc.h) is only touched once. So unless I'm missing something you don't get less or easier conflicts by doing it all in a single patch. But you gain the freedom to drop a patch for one driver without having to drop the rest with it. So I still like the split version better, but I'm open to a more verbose reasoning from your side.> When you have multiple patches and a merge conflict because of some added > lines using the old field the build breaks only on the last patch which > removes the old field.Then you can revert/drop the last patch without having to respin the whole single patch and thus caring for still more conflicts that arise until the new version is sent. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | https://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <https://lists.freedesktop.org/archives/nouveau/attachments/20230712/c0800bcd/attachment-0001.sig>
Jani Nikula
2023-Jul-12 14:34 UTC
[Nouveau] [PATCH RFC v1 00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev
On Wed, 12 Jul 2023, Uwe Kleine-K?nig <u.kleine-koenig at pengutronix.de> wrote:> Hello, > > while I debugged an issue in the imx-lcdc driver I was constantly > irritated about struct drm_device pointer variables being named "dev" > because with that name I usually expect a struct device pointer. > > I think there is a big benefit when these are all renamed to "drm_dev". > I have no strong preference here though, so "drmdev" or "drm" are fine > for me, too. Let the bikesheding begin! > > Some statistics: > > $ git grep -ohE 'struct drm_device *\* *[^ (),;]*' v6.5-rc1 | sort | uniq -c | sort -n > 1 struct drm_device *adev_to_drm > 1 struct drm_device *drm_ > 1 struct drm_device *drm_dev > 1 struct drm_device *drm_dev > 1 struct drm_device *pdev > 1 struct drm_device *rdev > 1 struct drm_device *vdev > 2 struct drm_device *dcss_drv_dev_to_drm > 2 struct drm_device **ddev > 2 struct drm_device *drm_dev_alloc > 2 struct drm_device *mock > 2 struct drm_device *p_ddev > 5 struct drm_device *device > 9 struct drm_device * dev > 25 struct drm_device *d > 95 struct drm_device * > 216 struct drm_device *ddev > 234 struct drm_device *drm_dev > 611 struct drm_device *drm > 4190 struct drm_device *dev > > This series starts with renaming struct drm_crtc::dev to drm_dev. If > it's not only me and others like the result of this effort it should be > followed up by adapting the other structs and the individual usages in > the different drivers.I think this is an unnecessary change. In drm, a dev is usually a drm device, i.e. struct drm_device *. As shown by the numbers above. If folks insist on following through with this anyway, I'm firmly in the camp the name should be "drm" and nothing else. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center
Thomas Zimmermann
2023-Jul-13 07:54 UTC
[PATCH RFC v1 00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev
Hi Am 12.07.23 um 11:46 schrieb Uwe Kleine-K?nig:> Hello, > > while I debugged an issue in the imx-lcdc driver I was constantly > irritated about struct drm_device pointer variables being named "dev" > because with that name I usually expect a struct device pointer.Rather than renaming dev in all the DRM structs, did you consider renaming struct drm_device.dev instead? Everyone in DRM-land knows that 'dev' is the DRM device. But for struct drm_device.dev a more expressive name would be helpful. Maybe 'parent'. (It's also much less churn.) Best regards Thomas> > I think there is a big benefit when these are all renamed to "drm_dev". > I have no strong preference here though, so "drmdev" or "drm" are fine > for me, too. Let the bikesheding begin! > > Some statistics: > > $ git grep -ohE 'struct drm_device *\* *[^ (),;]*' v6.5-rc1 | sort | uniq -c | sort -n > 1 struct drm_device *adev_to_drm > 1 struct drm_device *drm_ > 1 struct drm_device *drm_dev > 1 struct drm_device *drm_dev > 1 struct drm_device *pdev > 1 struct drm_device *rdev > 1 struct drm_device *vdev > 2 struct drm_device *dcss_drv_dev_to_drm > 2 struct drm_device **ddev > 2 struct drm_device *drm_dev_alloc > 2 struct drm_device *mock > 2 struct drm_device *p_ddev > 5 struct drm_device *device > 9 struct drm_device * dev > 25 struct drm_device *d > 95 struct drm_device * > 216 struct drm_device *ddev > 234 struct drm_device *drm_dev > 611 struct drm_device *drm > 4190 struct drm_device *dev > > This series starts with renaming struct drm_crtc::dev to drm_dev. If > it's not only me and others like the result of this effort it should be > followed up by adapting the other structs and the individual usages in > the different drivers. > > To make this series a bit easier handleable, I first added an alias for > drm_crtc::dev, then converted the drivers one after another and the last > patch drops the "dev" name. This has the advantage of being easier to > review, and if I should have missed an instance only the last patch must > be dropped/reverted. Also this series might conflict with other patches, > in this case the remaining patches can still go in (apart from the last > one of course). Maybe it also makes sense to delay applying the last > patch by one development cycle? > > The series was compile tested for arm, arm64, powerpc and amd64 using an > allmodconfig (though I only build drivers/gpu/). > > Best regards > Uwe > > Uwe Kleine-K?nig (52): > drm/crtc: Start renaming struct drm_crtc::dev to drm_dev > drm/core: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/amd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/armada: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/arm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/aspeed: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/ast: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/atmel-hlcdc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/exynos: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/fsl-dcu: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/gma500: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/gud: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/hisilicon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/hyperv: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/i915: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/imx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/ingenic: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/kmb: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/logicvc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/mcde: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/mediatek: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/meson: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/mgag200: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/msm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/mxsfb: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/nouveau: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/omapdrm: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/panel-ili9341: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/pl111: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/qxl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/radeon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/renesas: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/rockchip: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/solomon: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/sprd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/sti: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/stm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/sun4i: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tegra: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tidss: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tilcdc: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/tiny: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/tve200: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/udl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/vboxvideo: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/virtio: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/vkms: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/vmwgfx: Use struct drm_crtc::drm_dev instead of struct > drm_crtc::dev > drm/xen: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/xlnx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev > drm/crtc: Complete renaming struct drm_crtc::dev to drm_dev > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 18 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 8 +- > drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 22 +-- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 28 ++-- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 26 +-- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 ++-- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 20 +-- > .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 8 +- > .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 22 +-- > .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- > .../gpu/drm/arm/display/komeda/komeda_crtc.c | 24 +-- > .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- > drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +- > drivers/gpu/drm/arm/malidp_crtc.c | 7 +- > drivers/gpu/drm/armada/armada_crtc.c | 10 +- > drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 6 +- > drivers/gpu/drm/ast/ast_dp.c | 2 +- > drivers/gpu/drm/ast/ast_mode.c | 26 +-- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 10 +- > drivers/gpu/drm/drm_atomic.c | 22 +-- > drivers/gpu/drm/drm_atomic_helper.c | 20 ++- > drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- > drivers/gpu/drm/drm_atomic_uapi.c | 22 +-- > drivers/gpu/drm/drm_blend.c | 2 +- > drivers/gpu/drm/drm_color_mgmt.c | 10 +- > drivers/gpu/drm/drm_crtc.c | 19 ++- > drivers/gpu/drm/drm_crtc_helper.c | 10 +- > drivers/gpu/drm/drm_debugfs.c | 2 +- > drivers/gpu/drm/drm_debugfs_crc.c | 2 +- > drivers/gpu/drm/drm_fb_helper.c | 6 +- > drivers/gpu/drm/drm_mipi_dbi.c | 4 +- > drivers/gpu/drm/drm_plane.c | 2 +- > drivers/gpu/drm/drm_plane_helper.c | 2 +- > drivers/gpu/drm/drm_self_refresh_helper.c | 2 +- > drivers/gpu/drm/drm_vblank.c | 40 ++--- > drivers/gpu/drm/drm_vblank_work.c | 2 +- > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 8 +- > drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 +- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 16 +- > drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +- > drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- > drivers/gpu/drm/gma500/gma_display.c | 20 +-- > drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- > drivers/gpu/drm/gma500/oaktrail_hdmi.c | 4 +- > drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- > drivers/gpu/drm/gma500/psb_irq.c | 6 +- > drivers/gpu/drm/gud/gud_pipe.c | 6 +- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 20 +-- > .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +- > drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 6 +- > drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- > drivers/gpu/drm/i915/display/hsw_ips.c | 16 +- > drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +- > drivers/gpu/drm/i915/display/i9xx_wm.c | 40 ++--- > drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- > drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- > .../gpu/drm/i915/display/intel_atomic_plane.c | 4 +- > drivers/gpu/drm/i915/display/intel_audio.c | 2 +- > drivers/gpu/drm/i915/display/intel_bw.c | 10 +- > drivers/gpu/drm/i915/display/intel_cdclk.c | 6 +- > drivers/gpu/drm/i915/display/intel_color.c | 124 +++++++------- > drivers/gpu/drm/i915/display/intel_crtc.c | 20 +-- > .../drm/i915/display/intel_crtc_state_dump.c | 4 +- > drivers/gpu/drm/i915/display/intel_cursor.c | 2 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 28 ++-- > drivers/gpu/drm/i915/display/intel_display.c | 154 +++++++++--------- > .../gpu/drm/i915/display/intel_display_irq.c | 22 +-- > .../gpu/drm/i915/display/intel_display_rps.c | 2 +- > .../drm/i915/display/intel_display_trace.h | 12 +- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > drivers/gpu/drm/i915/display/intel_dpll.c | 38 ++--- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 44 ++--- > drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- > drivers/gpu/drm/i915/display/intel_drrs.c | 10 +- > drivers/gpu/drm/i915/display/intel_dsb.c | 8 +- > drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- > drivers/gpu/drm/i915/display/intel_fdi.c | 22 +-- > .../drm/i915/display/intel_fifo_underrun.c | 6 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- > .../drm/i915/display/intel_modeset_setup.c | 22 +-- > .../drm/i915/display/intel_modeset_verify.c | 2 +- > drivers/gpu/drm/i915/display/intel_panel.c | 4 +- > .../gpu/drm/i915/display/intel_pch_display.c | 32 ++-- > .../gpu/drm/i915/display/intel_pch_refclk.c | 2 +- > drivers/gpu/drm/i915/display/intel_pipe_crc.c | 10 +- > .../drm/i915/display/intel_plane_initial.c | 6 +- > drivers/gpu/drm/i915/display/intel_psr.c | 14 +- > drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- > drivers/gpu/drm/i915/display/intel_vblank.c | 24 +-- > drivers/gpu/drm/i915/display/intel_vdsc.c | 18 +- > drivers/gpu/drm/i915/display/intel_vrr.c | 18 +- > drivers/gpu/drm/i915/display/skl_scaler.c | 10 +- > .../drm/i915/display/skl_universal_plane.c | 6 +- > drivers/gpu/drm/i915/display/skl_watermark.c | 42 ++--- > drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- > drivers/gpu/drm/imx/dcss/dcss-crtc.c | 20 +-- > drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 15 +- > drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 16 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +- > drivers/gpu/drm/kmb/kmb_crtc.c | 16 +- > drivers/gpu/drm/logicvc/logicvc_crtc.c | 14 +- > drivers/gpu/drm/mcde/mcde_display.c | 18 +- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 22 +-- > drivers/gpu/drm/meson/meson_crtc.c | 12 +- > drivers/gpu/drm/mgag200/mgag200_g200.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200eh.c | 2 +- > drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 +- > drivers/gpu/drm/mgag200/mgag200_g200se.c | 6 +- > drivers/gpu/drm/mgag200/mgag200_g200wb.c | 2 +- > drivers/gpu/drm/mgag200/mgag200_mode.c | 10 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 6 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 70 ++++---- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 12 +- > drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 20 +-- > drivers/gpu/drm/msm/msm_drv.c | 4 +- > drivers/gpu/drm/mxsfb/lcdif_kms.c | 18 +- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 16 +- > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 58 +++---- > drivers/gpu/drm/nouveau/dispnv04/cursor.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/atom.h | 2 +- > drivers/gpu/drm/nouveau/dispnv50/crc.c | 30 ++-- > drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 2 +- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- > drivers/gpu/drm/nouveau/dispnv50/head.c | 4 +- > drivers/gpu/drm/nouveau/dispnv50/head507d.c | 26 +-- > drivers/gpu/drm/nouveau/dispnv50/head827d.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/head907d.c | 26 +-- > drivers/gpu/drm/nouveau/dispnv50/head917d.c | 6 +- > drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 18 +- > drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 10 +- > drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- > drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- > drivers/gpu/drm/omapdrm/omap_crtc.c | 56 +++---- > drivers/gpu/drm/omapdrm/omap_irq.c | 6 +- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +- > drivers/gpu/drm/pl111/pl111_display.c | 16 +- > drivers/gpu/drm/qxl/qxl_display.c | 2 +- > drivers/gpu/drm/radeon/atombios_crtc.c | 54 +++--- > drivers/gpu/drm/radeon/radeon_cursor.c | 14 +- > drivers/gpu/drm/radeon/radeon_display.c | 28 ++-- > drivers/gpu/drm/radeon/radeon_kms.c | 6 +- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +- > .../gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 14 +- > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 20 +-- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 15 +- > drivers/gpu/drm/solomon/ssd130x.c | 2 +- > drivers/gpu/drm/sprd/sprd_dpu.c | 6 +- > drivers/gpu/drm/sti/sti_crtc.c | 14 +- > drivers/gpu/drm/stm/ltdc.c | 12 +- > drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 +- > drivers/gpu/drm/tegra/dc.c | 12 +- > drivers/gpu/drm/tidss/tidss_crtc.c | 19 ++- > drivers/gpu/drm/tidss/tidss_irq.c | 4 +- > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 43 ++--- > drivers/gpu/drm/tiny/bochs.c | 6 +- > drivers/gpu/drm/tiny/cirrus.c | 2 +- > drivers/gpu/drm/tiny/gm12u320.c | 4 +- > drivers/gpu/drm/tiny/hx8357d.c | 4 +- > drivers/gpu/drm/tiny/ili9163.c | 4 +- > drivers/gpu/drm/tiny/ili9225.c | 8 +- > drivers/gpu/drm/tiny/ili9341.c | 4 +- > drivers/gpu/drm/tiny/ili9486.c | 4 +- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +- > drivers/gpu/drm/tiny/ofdrm.c | 8 +- > drivers/gpu/drm/tiny/panel-mipi-dbi.c | 6 +- > drivers/gpu/drm/tiny/repaper.c | 8 +- > drivers/gpu/drm/tiny/simpledrm.c | 2 +- > drivers/gpu/drm/tiny/st7586.c | 6 +- > drivers/gpu/drm/tiny/st7735r.c | 4 +- > drivers/gpu/drm/tve200/tve200_display.c | 14 +- > drivers/gpu/drm/udl/udl_modeset.c | 4 +- > drivers/gpu/drm/vboxvideo/vbox_mode.c | 6 +- > drivers/gpu/drm/vc4/vc4_crtc.c | 38 ++--- > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- > drivers/gpu/drm/vc4/vc4_hvs.c | 12 +- > drivers/gpu/drm/vc4/vc4_txp.c | 2 +- > drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- > drivers/gpu/drm/vkms/vkms_crtc.c | 12 +- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 8 +- > drivers/gpu/drm/xen/xen_drm_front_kms.c | 10 +- > drivers/gpu/drm/xlnx/zynqmp_kms.c | 8 +- > include/drm/drm_atomic_helper.h | 2 +- > include/drm/drm_crtc.h | 4 +- > 194 files changed, 1296 insertions(+), 1264 deletions(-) > > base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg) -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenPGP_signature Type: application/pgp-signature Size: 840 bytes Desc: OpenPGP digital signature URL: <http://lists.linuxfoundation.org/pipermail/virtualization/attachments/20230713/3dd7c317/attachment-0001.sig>