drm/vblank: Enforce all-or-nothing vblank support
Subsystems (71)
Lyude Paul
maintainercover drm/vblank: Enforce all-or-nothing vblank support
One of the oddities with DRM that is leftover from the old days is how vblank support is implemented by drivers. This has caused some minor issues for the rust bindings for KMS which could be worked around. However, it seems like a much better idea to fix this on the C side. Those oddities are mainly:
* There's nothing in the vblank core that actually ensures that all CRTCs implement vblank support if one of them do. On Rust's side, we can't have this and have to ensure either the whole device has vblank support or not - otherwise it would be quite painful ensuring we don't expose vblank methods to drivers that can't use them.
This additionally means such a situation would lead to UB.
* There is a second variable for keeping track of the number of CRTCs and it's kind of broken and confusing. Even worse, we currently allow the vblank API to allow a driver to specify a different number of CRTCs then it actually has.
So, let's just go ahead and fix this across the whole tree, and enforce that a driver must either implement hardware vblank support for all CRTCs or no CRTCs.
Lyude Paul (5):
drm/vblank: Add drm_device.has_hw_vblank drm/vblank: Remove drm->num_crtcs
drm/vblank: Remove num_crtcs argument from drm_vblank_init() drm/vblank: Use drm_for_each_crtc() in drm_vblank_init() drm/vblank: Require all CRTCs implement vblank support in
drm_vblank_init()
drivers/gpu/drm/adp/adp_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 2 +- drivers/gpu/drm/armada/armada_drv.c | 2 +- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/drm_vblank.c | 60 ++++++++++++------- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/gma500/psb_irq.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 2 +- .../drm/i915/display/intel_display_driver.c | 3 +- drivers/gpu/drm/imx/dc/dc-kms.c | 2 +- drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +- drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 2 +- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- drivers/gpu/drm/kmb/kmb_drv.c | 2 +- drivers/gpu/drm/logicvc/logicvc_mode.c | 2 +- drivers/gpu/drm/loongson/lsdc_drv.c | 2 +- drivers/gpu/drm/mcde/mcde_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/msm/msm_kms.c | 2 +- drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 +- drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 2 +- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- drivers/gpu/drm/sprd/sprd_drm.c | 2 +- drivers/gpu/drm/sti/sti_compositor.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tidss/tidss_kms.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/tiny/bochs.c | 2 +- drivers/gpu/drm/tiny/cirrus-qemu.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 6 +- drivers/gpu/drm/verisilicon/vs_drm.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_kms.c | 2 +- include/drm/drm_device.h | 10 +++- include/drm/drm_vblank.h | 2 +- 64 files changed, 114 insertions(+), 92 deletions(-)
base-commit: 568d4cb5dcc5ec4e22975699b6ea67a30806884c
Signature · 1 line
2.55.0
Lyude Paul
maintainerPATCH 1/5 drm/vblank: Add drm_device.has_hw_vblank
Currently the way we check if a driver supports hardware vblanks or not is actually funny and cursed! Likely because it predates KMS.
As it turns out, we only check dev->num_crtcs to see if we have vblank support. Why? Because it doesn't actually represent the number of CRTCs on the device, unless drm_vblank_init() has been called - which sets dev->num_crtcs. And as it turns out, this is the second place we keep track of the number of CRTCs we have.
Let's clean this up by starting with adding a variable specifically for tracking whether drm_vblank_init() has been called or not.
--- drivers/gpu/drm/drm_vblank.c | 3 ++- include/drm/drm_device.h | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_vblank.c +2 -1
@@ -557,6 +557,7 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)if (!dev->vblank)return -ENOMEM ; + dev->has_hw_vblank = true; dev->num_crtcs = num_crtcs;for (i =0 ; i < num_crtcs; i++) {
@@ -600,7 +601,7 @@ EXPORT_SYMBOL(drm_vblank_init);*/ bool drm_dev_has_vblank (const struct drm_device *dev) { -return dev->num_crtcs !=0 ; +return dev->has_hw_vblank; }EXPORT_SYMBOL (drm_dev_has_vblank);
include/drm/drm_device.h +7 -0
@@ -287,6 +287,13 @@ struct drm_device {*/ struct drm_vblank_crtc *vblank; +/** +* @has_hw_vblank: +* +* Has the driver called drm_vblank_init() to setup hardware vblank support? +*/ +bool has_hw_vblank; +/** * @vblank_time_lock: *
Signature · 1 line
2.55.0
Lyude Paul
maintainerPATCH 2/5 drm/vblank: Remove drm->num_crtcs
In reply to Lyude PaulWhile working on the Rust bindings for KMS, I asked myself "why does drm_vblank_init() need the number of CRTCs with vblank support passed to it?".
After some digging, I noticed the reason and it's silly and likely a holdover from the pre-KMS days. We actually have ended up with two different variables that claim to track the number of CRTCs a KMS device has:
- dev->num_crtcs: Setup -from- drm_vblank_init(), meaning it's 0 if the driver has no vblank support.
- dev->mode_config.num_crtc: The correct one
There's no real need for this and it's probably confusing, and it's quite easy to just drop this variable and convert everything over to mode_config.num_crtc. So, let's do that with the following coccinelle patch:
virtual patch
@depends on patch@
struct drm_device *dev;
@@
- dev->num_crtcs
+ dev->mode_config.num_crtc
--- drivers/gpu/drm/drm_vblank.c | 23 ++++++++++----------- drivers/gpu/drm/gma500/psb_irq.c | 4 ++-- drivers/gpu/drm/radeon/atombios_crtc.c | 4 ++-- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 ++-- drivers/gpu/drm/vc4/vc4_kms.c | 4 ++-- include/drm/drm_device.h | 3 --- 6 files changed, 19 insertions(+), 23 deletions(-)
drivers/gpu/drm/drm_vblank.c +11 -12
@@ -398,7 +398,7 @@ u64 drm_vblank_count(struct drm_device *dev, unsigned int pipe)struct drm_vblank_crtc *vblank =drm_vblank_crtc (dev, pipe);u64 count; -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc))return 0 ; count =atomic64_read (&vblank->count);
@@ -558,7 +558,6 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)return -ENOMEM ; dev->has_hw_vblank = true; - dev->num_crtcs = num_crtcs;for (i =0 ; i < num_crtcs; i++) {struct drm_vblank_crtc *vblank =drm_vblank_crtc (dev, i);
@@ -645,7 +644,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,if (!drm_dev_has_vblank (dev))return ; -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc))return ;/* Valid dotclock? */
@@ -729,7 +728,7 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal(int vpos, hpos, i;int delta_ns, duration_ns; -if (pipe >= dev->num_crtcs) { +if (pipe >= dev->mode_config.num_crtc) {drm_err (dev,"Invalid crtc %u\n" , pipe);return false; }
@@ -970,7 +969,7 @@ static u64 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,u64 vblank_count;unsigned int seq; -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) { +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc)) { *vblanktime =0 ;return 0 ; }
@@ -1227,7 +1226,7 @@ int drm_vblank_get(struct drm_device *dev, unsigned int pipe)if (!drm_dev_has_vblank (dev))return -EINVAL ; -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc))return -EINVAL ;spin_lock_irqsave (&dev->vbl_lock, irqflags);
@@ -1266,7 +1265,7 @@ void drm_vblank_put(struct drm_device *dev, unsigned int pipe)struct drm_vblank_crtc *vblank =drm_vblank_crtc (dev, pipe);int vblank_offdelay = vblank->config.offdelay_ms; -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc))return ;if (drm_WARN_ON (dev,atomic_read (&vblank->refcount) ==0 ))
@@ -1355,7 +1354,7 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc)ktime_t now;u64 seq; -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc))return ;/*
@@ -1496,7 +1495,7 @@ void drm_crtc_vblank_on_config(struct drm_crtc *crtc,unsigned int pipe =drm_crtc_index (crtc);struct drm_vblank_crtc *vblank =drm_crtc_vblank_crtc (crtc); -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc))return ;spin_lock_irq (&dev->vbl_lock);
@@ -1555,7 +1554,7 @@ static void drm_vblank_restore(struct drm_device *dev, unsigned int pipe)u32 cur_vblank, diff =1 ;u32 max_vblank_count =drm_max_vblank_count (dev, pipe); -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc))return ;assert_spin_locked (&dev->vbl_lock);
@@ -1788,7 +1787,7 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data, pipe = pipe_index; } -if (pipe >= dev->num_crtcs) +if (pipe >= dev->mode_config.num_crtc)return -EINVAL ; vblank =drm_vblank_crtc (dev, pipe);
@@ -1931,7 +1930,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)if (drm_WARN_ON_ONCE (dev, !drm_dev_has_vblank (dev)))return false; -if (drm_WARN_ON (dev, pipe >= dev->num_crtcs)) +if (drm_WARN_ON (dev, pipe >= dev->mode_config.num_crtc))return false;spin_lock_irqsave (&dev->event_lock, irqflags);
drivers/gpu/drm/gma500/psb_irq.c +2 -2
@@ -292,7 +292,7 @@ void gma_irq_postinstall(struct drm_device *dev)PSB_WVDC32 (dev_priv->vdc_irq_mask,PSB_INT_ENABLE_R );PSB_WVDC32 (0xFFFFFFFF ,PSB_HWSTAM ); -for (i =0 ; i < dev->num_crtcs; ++i) { +for (i =0 ; i < dev->mode_config.num_crtc; ++i) {if (dev->vblank[i].enabled)gma_enable_pipestat (dev_priv, i,PIPE_VBLANK_INTERRUPT_ENABLE );else
@@ -350,7 +350,7 @@ void gma_irq_uninstall(struct drm_device *dev)PSB_WVDC32 (0xFFFFFFFF ,PSB_HWSTAM ); -for (i =0 ; i < dev->num_crtcs; ++i) { +for (i =0 ; i < dev->mode_config.num_crtc; ++i) {if (dev->vblank[i].enabled)gma_disable_pipestat (dev_priv, i,PIPE_VBLANK_INTERRUPT_ENABLE ); }
drivers/gpu/drm/radeon/atombios_crtc.c +2 -2
@@ -277,14 +277,14 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)if (ASIC_IS_DCE3 (rdev) && !ASIC_IS_DCE6 (rdev))atombios_enable_crtc_memreq (crtc,ATOM_ENABLE );atombios_blank_crtc (crtc,ATOM_DISABLE ); -if (dev->num_crtcs > radeon_crtc->crtc_id) +if (dev->mode_config.num_crtc > radeon_crtc->crtc_id)drm_crtc_vblank_on (crtc);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY :case DRM_MODE_DPMS_SUSPEND :case DRM_MODE_DPMS_OFF : -if (dev->num_crtcs > radeon_crtc->crtc_id) +if (dev->mode_config.num_crtc > radeon_crtc->crtc_id)drm_crtc_vblank_off (crtc);if (radeon_crtc->enabled)atombios_blank_crtc (crtc,ATOM_ENABLE );
drivers/gpu/drm/radeon/radeon_legacy_crtc.c +2 -2
@@ -334,14 +334,14 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode) RADEON_CRTC_DISP_REQ_EN_B));WREG32_P (RADEON_CRTC_EXT_CNTL , crtc_ext_cntl, ~(mask | crtc_ext_cntl)); } -if (dev->num_crtcs > radeon_crtc->crtc_id) +if (dev->mode_config.num_crtc > radeon_crtc->crtc_id)drm_crtc_vblank_on (crtc);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY :case DRM_MODE_DPMS_SUSPEND :case DRM_MODE_DPMS_OFF : -if (dev->num_crtcs > radeon_crtc->crtc_id) +if (dev->mode_config.num_crtc > radeon_crtc->crtc_id)drm_crtc_vblank_off (crtc);if (radeon_crtc->crtc_id)WREG32_P (RADEON_CRTC2_GEN_CNTL , mask, ~(RADEON_CRTC2_EN | mask));
drivers/gpu/drm/vc4/vc4_kms.c +2 -2
@@ -936,7 +936,7 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev,* If the layout changes and doesn't give us that in the future, * we will need to have something smarter, but it works so far. */ - sorted_crtcs =kmalloc_objs (*sorted_crtcs, dev->num_crtcs); + sorted_crtcs =kmalloc_objs (*sorted_crtcs, dev->mode_config.num_crtc);if (!sorted_crtcs)return -ENOMEM ;
@@ -946,7 +946,7 @@ static int vc4_pv_muxing_atomic_check(struct drm_device *dev,sort (sorted_crtcs, i,sizeof (*sorted_crtcs), cmp_vc4_crtc_hvs_output,NULL ); -for (i =0 ; i < dev->num_crtcs; i++) { +for (i =0 ; i < dev->mode_config.num_crtc; i++) {struct vc4_crtc_state *old_vc4_crtc_state, *new_vc4_crtc_state;struct drm_crtc_state *old_crtc_state, *new_crtc_state;struct vc4_crtc *vc4_crtc;
include/drm/drm_device.h +0 -3
@@ -340,9 +340,6 @@ struct drm_device {*/ spinlock_t event_lock; -/** @num_crtcs: Number of CRTCs on this device */ -unsigned int num_crtcs; -/** @mode_config: Current mode config */ struct drm_mode_config mode_config;
Signature · 1 line
2.55.0
Lyude Paul
maintainerPATCH 3/5 drm/vblank: Remove num_crtcs argument from drm_vblank_init()
In reply to Lyude PaulAs it turns out: the entire reason we ever asked for the number of CRTCs as a parameter for drm_vblank_init() is because that function was previously in charge of setting up the legacy drm_device.num_crtcs variable, which itself was also used to keep track of whether or not drm_vblank_init() was called. And, that number was kept in addition to a properly maintained drm_device->mode_config.num_crtc.
Now that we've removed that legacy variable entirely, let's stop requiring the num_crtc argument for drm_vblank_init() entirely. The main motivation for this is the fact that at the moment, we've had to workaround this oddity in the Rust kernel bindings for a few reasons:
* We can't know the number of CRTCs until they've all been created, which meant that we had to keep track of that.
* Additionally, we also had to keep track of which CRTCs did and did not have vblank support. This is especially silly, because I am not aware of any physical hardware that only supports vblank interrupts on certain heads - and I can't think of any reasonable explanation for any hardware manufacturer making a design choice like that.
* This also implies that drivers could, with the current C API, register that they have a different number of CRTCs then they have actually created. This appears to be an edge case that could easily lead to UB since it's not obvious and as such has likely never really been tested. And we can't have that in Rust!
While the last point could technically still be an issue if a driver doesn't fill out the vblank handling callbacks for all CRTCs, this is a good start at cleaning this strange behavior up.
So, just get rid of this parameter entirely and start using the DRM's internal count of CRTCs. We apply this change across the tree using this coccinelle patch:
virtual patch
@depends on patch@
expression dev;
@@
- drm_vblank_init(dev, ...)
+ drm_vblank_init(dev)
And then fixup some of the funky whitespace errors that introduces by hand.
--- drivers/gpu/drm/adp/adp_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 2 +- drivers/gpu/drm/armada/armada_drv.c | 2 +- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/drm_vblank.c | 6 +++--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 2 +- drivers/gpu/drm/i915/display/intel_display_driver.c | 3 +-- drivers/gpu/drm/imx/dc/dc-kms.c | 2 +- drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +- drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 2 +- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- drivers/gpu/drm/kmb/kmb_drv.c | 2 +- drivers/gpu/drm/logicvc/logicvc_mode.c | 2 +- drivers/gpu/drm/loongson/lsdc_drv.c | 2 +- drivers/gpu/drm/mcde/mcde_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/msm/msm_kms.c | 2 +- drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 +- drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 2 +- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- drivers/gpu/drm/sprd/sprd_drm.c | 2 +- drivers/gpu/drm/sti/sti_compositor.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tidss/tidss_kms.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/tiny/bochs.c | 2 +- drivers/gpu/drm/tiny/cirrus-qemu.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 2 +- drivers/gpu/drm/verisilicon/vs_drm.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.c | 3 +-- drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_kms.c | 2 +- include/drm/drm_vblank.h | 2 +- 60 files changed, 62 insertions(+), 64 deletions(-)
drivers/gpu/drm/adp/adp_drv.c +1 -1
@@ -444,7 +444,7 @@ static int adp_setup_mode_config(struct adp_drv_private *adp)if (IS_ERR (adp->connector))return PTR_ERR (adp->connector); - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {drm_err (drm,"failed to initialize vblank" );return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +1 -1
@@ -413,7 +413,7 @@ static int amdgpu_vkms_sw_init(struct amdgpu_ip_block *ip_block)return r; } - r =drm_vblank_init (adev_to_drm (adev), adev->mode_info.num_crtc); + r =drm_vblank_init (adev_to_drm (adev));if (r)return r;
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +1 -1
@@ -2809,7 +2809,7 @@ static int dce_v10_0_sw_init(struct amdgpu_ip_block *ip_block)/* XXX: can this be enabled for DC? */ adev_to_drm (adev)->vblank_disable_immediate = true; - r =drm_vblank_init (adev_to_drm (adev), adev->mode_info.num_crtc); + r =drm_vblank_init (adev_to_drm (adev));if (r)return r;
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1 -1
@@ -2759,7 +2759,7 @@ static int dce_v6_0_sw_init(struct amdgpu_ip_block *ip_block)/* XXX: can this be enabled for DC? */ adev_to_drm (adev)->vblank_disable_immediate = true; - r =drm_vblank_init (adev_to_drm (adev), adev->mode_info.num_crtc); + r =drm_vblank_init (adev_to_drm (adev));if (r)return r;
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +1 -1
@@ -2728,7 +2728,7 @@ static int dce_v8_0_sw_init(struct amdgpu_ip_block *ip_block)/* XXX: can this be enabled for DC? */ adev_to_drm (adev)->vblank_disable_immediate = true; - r =drm_vblank_init (adev_to_drm (adev), adev->mode_info.num_crtc); + r =drm_vblank_init (adev_to_drm (adev));if (r)return r;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -893,7 +893,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)adev_to_drm (adev)->mode_config.cursor_width = adev->dm.dc->caps.max_cursor_size;adev_to_drm (adev)->mode_config.cursor_height = adev->dm.dc->caps.max_cursor_size; -if (drm_vblank_init (adev_to_drm (adev), adev->dm.display_indexes_num)) { +if (drm_vblank_init (adev_to_drm (adev))) {drm_err (adev_to_drm (adev),"failed to initialize vblank for display support.\n" ); goto error;
drivers/gpu/drm/arm/display/komeda/komeda_kms.c +1 -1
@@ -297,7 +297,7 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev)if (err) goto cleanup_mode_config; - err =drm_vblank_init (drm, kms->n_crtcs); + err =drm_vblank_init (drm);if (err) goto cleanup_mode_config;
drivers/gpu/drm/arm/hdlcd_drv.c +1 -1
@@ -275,7 +275,7 @@ static int hdlcd_drm_bind(struct device *dev)pm_runtime_enable (dev); - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {DRM_ERROR ("failed to initialise vblank\n" ); goto err_vblank;
drivers/gpu/drm/arm/malidp_drv.c +1 -1
@@ -849,7 +849,7 @@ static int malidp_bind(struct device *dev)if (ret <0 ) goto irq_init_fail; - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {DRM_ERROR ("failed to initialise vblank\n" ); goto vblank_fail;
drivers/gpu/drm/armada/armada_drv.c +1 -1
@@ -122,7 +122,7 @@ static int armada_drm_bind(struct device *dev)if (ret) goto err_kms; - ret =drm_vblank_init (&priv->drm, priv->drm.mode_config.num_crtc); + ret =drm_vblank_init (&priv->drm);if (ret) goto err_comp;
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1 -1
@@ -205,7 +205,7 @@ static int aspeed_gfx_load(struct drm_device *drm)if (ret <0 )return ret; - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" );return ret;
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +1 -1
@@ -867,7 +867,7 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev)pm_runtime_enable (dev->dev); - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret <0 ) {drm_err (dev,"failed to initialize vblank\n" ); goto err_periph_clk_disable;
drivers/gpu/drm/drm_vblank.c +3 -3
@@ -536,18 +536,18 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr)/** * drm_vblank_init - initialize vblank support * @dev: DRM device -* @num_crtcs: number of CRTCs supported by @dev * -* This function initializes vblank support for @num_crtcs display pipelines. +* This function initializes vblank support for display pipelines. * Cleanup is handled automatically through a cleanup function added with * drmm_add_action_or_reset(). * * Returns: * Zero on success or a negative error code on failure. */ -int drm_vblank_init (struct drm_device *dev,unsigned int num_crtcs) +int drm_vblank_init (struct drm_device *dev) {int ret; +unsigned int num_crtcs = dev->mode_config.num_crtc;unsigned int i;spin_lock_init (&dev->vbl_lock);
drivers/gpu/drm/exynos/exynos_drm_drv.c +1 -1
@@ -273,7 +273,7 @@ static int exynos_drm_bind(struct device *dev)if (ret) goto err_mode_config_cleanup; - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret) goto err_unbind_all;
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +1 -1
@@ -122,7 +122,7 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)return dev_err_probe (dev->dev, ret,"failed to enable pixclk\n" ); } - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret <0 ) {dev_err (dev->dev,"failed to initialize vblank\n" ); goto done_vblank;
drivers/gpu/drm/gma500/psb_drv.c +1 -1
@@ -364,7 +364,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)acpi_video_register ();/* Setup vertical blanking handling */ - ret =drm_vblank_init (dev, dev_priv->num_pipe); + ret =drm_vblank_init (dev);if (ret) goto out_err;
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -1
@@ -398,7 +398,7 @@ static int hibmc_load(struct drm_device *dev)if (ret) goto err; - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret) {drm_err (dev,"failed to initialize vblank: %d\n" , ret); goto err;
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +1 -1
@@ -181,7 +181,7 @@ static int kirin_drm_kms_init(struct drm_device *dev, }/* vblank init */ - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret) {DRM_ERROR ("failed to initialize vblank.\n" ); goto err_unbind_all;
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c +1 -1
@@ -330,7 +330,7 @@ int hv_drm_mode_config_init(struct hv_drm_device *hv)return ret; } - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret)return ret;
drivers/gpu/drm/i915/display/intel_display_driver.c +1 -2
@@ -217,8 +217,7 @@ int intel_display_driver_probe_noirq(struct intel_display *display)intel_bw_init_hw (display);if (HAS_DISPLAY (display)) { - ret =drm_vblank_init (display->drm, -INTEL_NUM_PIPES (display)); + ret =drm_vblank_init (display->drm);if (ret) goto cleanup_opregion; }
drivers/gpu/drm/imx/dc/dc-kms.c +1 -1
@@ -118,7 +118,7 @@ int dc_kms_init(struct dc_drm_device *dc_drm)return ret; } - ret =drm_vblank_init (drm,DC_DISPLAYS ); + ret =drm_vblank_init (drm);if (ret) {dev_err (drm->dev,"failed to init vblank support: %d\n" , ret);return ret;
drivers/gpu/drm/imx/dcss/dcss-kms.c +1 -1
@@ -129,7 +129,7 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss)dcss_kms_mode_config_init (kms); - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret) goto cleanup_mode_config;
drivers/gpu/drm/imx/ipuv3/imx-drm-core.c +1 -1
@@ -233,7 +233,7 @@ static int imx_drm_bind(struct device *dev)if (ret) goto err_kms; - ret =drm_vblank_init (drm,MAX_CRTC ); + ret =drm_vblank_init (drm);if (ret) goto err_kms;
drivers/gpu/drm/imx/lcdc/imx-lcdc.c +1 -1
@@ -435,7 +435,7 @@ static int imx_lcdc_probe(struct platform_device *pdev)if (ret <0 )return dev_err_probe (drm->dev, ret,"Cannot setup simple display pipe\n" ); - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 )return dev_err_probe (drm->dev, ret,"Failed to initialize vblank\n" );
drivers/gpu/drm/ingenic/ingenic-drm-drv.c +1 -1
@@ -1348,7 +1348,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) goto err_drvdata; } - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret) {dev_err (dev,"Failed calling drm_vblank_init()\n" ); goto err_drvdata;
drivers/gpu/drm/kmb/kmb_drv.c +1 -1
@@ -191,7 +191,7 @@ static int kmb_setup_mode_config(struct drm_device *drm) ret =kmb_dsi_encoder_init (drm, kmb->kmb_dsi);/* Set the CRTC's port so that the encoder component can find it */ kmb->crtc.port =of_graph_get_port_by_id (drm->dev->of_node,0 ); - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {drm_err (drm,"failed to initialize vblank\n" );pm_runtime_disable (drm->dev);
drivers/gpu/drm/logicvc/logicvc_mode.c +1 -1
@@ -36,7 +36,7 @@ int logicvc_mode_init(struct logicvc_drm *logicvc)uint32_t preferred_depth;int ret; - ret =drm_vblank_init (drm_dev, mode_config->num_crtc); + ret =drm_vblank_init (drm_dev);if (ret) {drm_err (drm_dev,"Failed to initialize vblank\n" );return ret;
drivers/gpu/drm/loongson/lsdc_drv.c +1 -1
@@ -296,7 +296,7 @@ static int lsdc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)drmm_kms_helper_poll_init (ddev);if (loongson_vblank) { - ret =drm_vblank_init (ddev, descp->num_of_crtc); + ret =drm_vblank_init (ddev);if (ret)return ret;
drivers/gpu/drm/mcde/mcde_drv.c +1 -1
@@ -174,7 +174,7 @@ static int mcde_modeset_init(struct drm_device *drm) mode_config->min_height =1 ; mode_config->max_height =1080 ; - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret) {dev_err (drm->dev,"failed to init vblank\n" );return ret;
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -1
@@ -574,7 +574,7 @@ static int mtk_drm_kms_init(struct drm_device *drm)*/ dma_set_max_seg_size (dma_dev,UINT_MAX ); - ret =drm_vblank_init (drm,MAX_CRTC ); + ret =drm_vblank_init (drm);if (ret <0 ) goto err_component_unbind;
drivers/gpu/drm/meson/meson_drv.c +1 -1
@@ -262,7 +262,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) priv->vsync_irq =platform_get_irq (pdev,0 ); - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret) goto free_canvas_vd1_2;
drivers/gpu/drm/msm/msm_kms.c +1 -1
@@ -317,7 +317,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv)sched_set_fifo (ev_thread->worker->task); } - ret =drm_vblank_init (ddev, ddev->mode_config.num_crtc); + ret =drm_vblank_init (ddev);if (ret <0 ) {DRM_DEV_ERROR (dev,"failed to initialize vblank\n" ); goto err_msm_uninit;
drivers/gpu/drm/mxsfb/lcdif_drv.c +1 -1
@@ -175,7 +175,7 @@ static int lcdif_load(struct drm_device *drm)return ret; } - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" );return ret;
drivers/gpu/drm/mxsfb/mxsfb_drv.c +1 -1
@@ -257,7 +257,7 @@ static int mxsfb_load(struct drm_device *drm, goto err_vblank; } - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" ); goto err_vblank;
drivers/gpu/drm/nouveau/nouveau_display.c +1 -1
@@ -713,7 +713,7 @@ nouveau_display_create(struct drm_device *dev)drm_mode_config_reset (dev);if (dev->mode_config.num_crtc) { - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret) goto vblank_err;
drivers/gpu/drm/omapdrm/omap_drv.c +1 -1
@@ -731,7 +731,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) }/* Initialize vblank handling, start with all CRTCs disabled. */ - ret =drm_vblank_init (ddev, priv->num_pipes); + ret =drm_vblank_init (ddev);if (ret) {dev_err (priv->dev,"could not init vblank\n" ); goto err_cleanup_modeset;
drivers/gpu/drm/pl111/pl111_drv.c +1 -1
@@ -175,7 +175,7 @@ static int pl111_modeset_init(struct drm_device *dev)return ret;if (!priv->variant->broken_vblank) { - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret !=0 ) {drm_err (dev,"Failed to init vblank\n" ); goto out_bridge;
drivers/gpu/drm/qxl/qxl_display.c +1 -1
@@ -1304,7 +1304,7 @@ int qxl_modeset_init(struct qxl_device *qdev)qxl_display_read_client_monitors_config (qdev); - ret =drm_vblank_init (&qdev->ddev, qxl_num_crtc); + ret =drm_vblank_init (&qdev->ddev);if (ret)return ret;
drivers/gpu/drm/radeon/radeon_irq_kms.c +1 -1
@@ -314,7 +314,7 @@ int radeon_irq_kms_init(struct radeon_device *rdev)/* Disable vblank irqs aggressively for power-saving */ rdev_to_drm (rdev)->vblank_disable_immediate = true; - r =drm_vblank_init (rdev_to_drm (rdev), rdev->num_crtc); + r =drm_vblank_init (rdev_to_drm (rdev));if (r) {return r; }
drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +1 -1
@@ -888,7 +888,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)* Initialize vertical blanking interrupts handling. Start with vblank * disabled for all CRTCs. */ - ret =drm_vblank_init (dev, rcdu->num_crtcs); + ret =drm_vblank_init (dev);if (ret <0 )return ret;
drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c +1 -1
@@ -430,7 +430,7 @@ int rzg2l_du_modeset_init(struct rzg2l_du_device *rcdu)* Initialize vertical blanking interrupts handling. Start with vblank * disabled for all CRTCs. */ - ret =drm_vblank_init (dev, rcdu->num_crtcs); + ret =drm_vblank_init (dev);if (ret <0 )return ret;
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +1 -1
@@ -228,7 +228,7 @@ static int shmob_drm_probe(struct platform_device *pdev)if (ret)return ret; - ret =drm_vblank_init (ddev,1 ); + ret =drm_vblank_init (ddev);if (ret <0 ) {dev_err (&pdev->dev,"failed to initialize vblank\n" );return ret;
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +1 -1
@@ -186,7 +186,7 @@ static int rockchip_drm_bind(struct device *dev)if (ret) goto err_unbind_all; - ret =drm_vblank_init (drm_dev, drm_dev->mode_config.num_crtc); + ret =drm_vblank_init (drm_dev);if (ret) goto err_iommu_cleanup;
drivers/gpu/drm/sprd/sprd_drm.c +1 -1
@@ -89,7 +89,7 @@ static int sprd_drm_bind(struct device *dev) }/* vblank init */ - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret) {drm_err (drm,"failed to initialize vblank.\n" ); goto err_unbind_all;
drivers/gpu/drm/sti/sti_compositor.c +1 -1
@@ -145,7 +145,7 @@ static int sti_compositor_bind(struct device *dev, } } -drm_vblank_init (drm_dev, crtc_id); +drm_vblank_init (drm_dev);return 0 ; }
drivers/gpu/drm/stm/ltdc.c +1 -1
@@ -2076,7 +2076,7 @@ int ltdc_load(struct drm_device *ddev) goto err; } - ret =drm_vblank_init (ddev,NB_CRTC ); + ret =drm_vblank_init (ddev);if (ret) {drm_err (ddev,"Failed calling drm_vblank_init()\n" ); goto err;
drivers/gpu/drm/sun4i/sun4i_drv.c +1 -1
@@ -95,7 +95,7 @@ static int sun4i_drv_bind(struct device *dev) }/* drm_vblank_init calls kcalloc, which can fail */ - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret) goto unbind_all;
drivers/gpu/drm/tegra/drm.c +1 -1
@@ -1241,7 +1241,7 @@ static int host1x_drm_probe(struct host1x_device *dev)/* syncpoints are used for full 32-bit hardware VBLANK counters */ drm->max_vblank_count =0xffffffff ; - err =drm_vblank_init (drm, drm->mode_config.num_crtc); + err =drm_vblank_init (drm);if (err <0 ) goto hub;
drivers/gpu/drm/tidss/tidss_kms.c +1 -1
@@ -289,7 +289,7 @@ int tidss_modeset_init(struct tidss_device *tidss)if (ret)return ret; - ret =drm_vblank_init (ddev, tidss->num_crtcs); + ret =drm_vblank_init (ddev);if (ret)return ret;
drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 -1
@@ -405,7 +405,7 @@ static int tilcdc_pdev_probe(struct platform_device *pdev) goto unregister_cpufreq_notif; } - ret =drm_vblank_init (ddev,1 ); + ret =drm_vblank_init (ddev);if (ret <0 ) {drm_err (ddev,"failed to initialize vblank\n" ); goto unregister_cpufreq_notif;
drivers/gpu/drm/tiny/bochs.c +1 -1
@@ -677,7 +677,7 @@ static int bochs_kms_init(struct bochs_device *bochs)drm_connector_attach_edid_property (connector);drm_connector_attach_encoder (connector, encoder); - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret)return ret;
drivers/gpu/drm/tiny/cirrus-qemu.c +1 -1
@@ -501,7 +501,7 @@ static int cirrus_pipe_init(struct cirrus_device *cirrus)if (ret)return ret; - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret)return ret;
drivers/gpu/drm/tve200/tve200_drv.c +1 -1
@@ -120,7 +120,7 @@ static int tve200_modeset_init(struct drm_device *dev)dev_info (dev->dev,"attached to panel %s\n" ,dev_name (panel->dev)); - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret) {dev_err (dev->dev,"failed to init vblank\n" ); goto out_bridge;
drivers/gpu/drm/vc4/vc4_kms.c +1 -1
@@ -1151,7 +1151,7 @@ int vc4_kms_load(struct drm_device *dev)/* Set support for vblank irq fast disable, before drm_vblank_init() */ dev->vblank_disable_immediate = true; - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret <0 ) {dev_err (dev->dev,"failed to initialize vblank\n" );return ret;
drivers/gpu/drm/verisilicon/vs_drm.c +1 -1
@@ -121,7 +121,7 @@ int vs_drm_initialize(struct vs_dc *dc, struct platform_device *pdev) vdrm->crtcs[i] = crtc; } - ret =drm_vblank_init (drm, dc->identity.display_count); + ret =drm_vblank_init (drm);if (ret)return ret;
drivers/gpu/drm/virtio/virtgpu_display.c +1 -1
@@ -381,7 +381,7 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)for (i =0 ; i < vgdev->num_scanouts; ++i)vgdev_output_init (vgdev, i); - ret =drm_vblank_init (vgdev->ddev, vgdev->num_scanouts); + ret =drm_vblank_init (vgdev->ddev);if (ret)return ret;
drivers/gpu/drm/vkms/vkms_drv.c +1 -2
@@ -192,8 +192,7 @@ int vkms_create(struct vkms_config *config) goto out_devres; } - ret =drm_vblank_init (&vkms_device->drm, -vkms_config_get_num_crtcs (config)); + ret =drm_vblank_init (&vkms_device->drm);if (ret) {DRM_ERROR ("Failed to vblank\n" ); goto out_devres;
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +1 -1
@@ -212,7 +212,7 @@ vmw_vkms_init(struct vmw_private *vmw) ret =kstrtobool (buffer, &vmw->vkms_enabled);if (!ret && vmw->vkms_enabled) { - ret =drm_vblank_init (&vmw->drm,VMWGFX_NUM_DISPLAY_UNITS ); + ret =drm_vblank_init (&vmw->drm); vmw->vkms_enabled = (ret ==0 ); }
drivers/gpu/drm/xlnx/zynqmp_kms.c +1 -1
@@ -504,7 +504,7 @@ int zynqmp_dpsub_drm_init(struct zynqmp_dpsub *dpsub) drm->mode_config.max_width =ZYNQMP_DISP_MAX_WIDTH ; drm->mode_config.max_height =ZYNQMP_DISP_MAX_HEIGHT ; - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret)return ret;
include/drm/drm_vblank.h +1 -1
@@ -285,7 +285,7 @@ struct drm_vblank_crtc { };struct drm_vblank_crtc *drm_crtc_vblank_crtc (struct drm_crtc *crtc); -int drm_vblank_init (struct drm_device *dev,unsigned int num_crtcs); +int drm_vblank_init (struct drm_device *dev);bool drm_dev_has_vblank (const struct drm_device *dev);u64 drm_crtc_vblank_count (struct drm_crtc *crtc); u64 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH 3/5] drm/vblank: Remove num_crtcs argument from drm_vblank_init()
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Critical] drm_vblank_init() returns -ENODEV causing probe failures in multiple drivers --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Critical] drm_vblank_init() returns -ENODEV causing probe failures in multiple drivers --
--- Patch [3]: [PATCH 3/5] drm/vblank: Remove num_crtcs argument from drm_vblank_init() --- commit 049e1e142facf2bbdd92cd8a8847a53f6b18b3aa
Author: Lyude Paul <[email protected]>
drm/vblank: Remove num_crtcs argument from drm_vblank_init()
This commit removes the num_crtcs argument from drm_vblank_init() and updates callers across the tree to rely on the internal DRM count of CRTCs instead. The change was applied mechanically using a Coccinelle patch.
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c static int aspeed_gfx_load(struct drm_device *drm) · line 208
Quoted 10 lines
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1
-1@@ -205,7 +205,7 @@ static int aspeed_gfx_load(struct drm_device *drm)if (ret <0 )return ret; - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);
[Severity: Critical]
Will this cause a probe regression for this driver?
By removing the explicit CRTC count, drm_vblank_init() now relies on the DRM device's internal CRTC list being populated. However, aspeed_gfx_load() calls drm_vblank_init() before calling aspeed_gfx_create_pipe(), which is where the CRTC is actually created.
Because the CRTC list is empty at this point, drm_vblank_init() will return -ENODEV and fail the probe.
Quoted 11 lines
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +0
-0if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" );return ret;drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +0
-0
drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c int rcar_du_modeset_init(struct rcar_du_device *rcdu) · line 891
Quoted 5 lines
drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +1
-1@@ -888,7 +888,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)* Initialize vertical blanking interrupts handling. Start with vblank * disabled for all CRTCs. */ - ret =drm_vblank_init (dev, rcdu->num_crtcs); + ret =drm_vblank_init (dev);
[Severity: Critical]
Does this introduce a similar regression for rcar-du?
The driver calls drm_vblank_init() here, but the CRTCs are not created until the rcar_du_crtc_create() loop further down. This means drm_vblank_init() will see an empty CRTC list and fail with -ENODEV.
Quoted 10 lines
drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +0
-0if (ret <0 )return ret;drivers/gpu/drm/vkms/vkms_drv.c +0
-0
drivers/gpu/drm/vkms/vkms_drv.c int vkms_create(struct vkms_config *config) · line 195
Quoted 6 lines
drivers/gpu/drm/vkms/vkms_drv.c +1
-2@@ -192,8 +192,7 @@ int vkms_create(struct vkms_config *config) goto out_devres; } - ret =drm_vblank_init (&vkms_device->drm, -vkms_config_get_num_crtcs (config)); + ret =drm_vblank_init (&vkms_device->drm);
[Severity: Critical]
Can this lead to a complete initialization failure for vkms?
The call to drm_vblank_init() occurs before vkms_modeset_init(), meaning the pipeline components have not been created yet and the internal CRTC count is zero.
Quoted 3 lines
drivers/gpu/drm/vkms/vkms_drv.c +0
-0if (ret) {DRM_ERROR ("Failed to vblank\n" ); goto out_devres;
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Thomas Zimmermann
maintainerRe: [PATCH 3/5] drm/vblank: Remove num_crtcs argument from drm_vblank_init()
In reply to Lyude PaulHi
Am 14.08.26 um 22:35 schrieb Lyude Paul:
Quoted 25 lines
As it turns out: the entire reason we ever asked for the number of CRTCs as a parameter for
drm_vblank_init()is because that function was previously in charge of setting up the legacy drm_device.num_crtcs variable, which itself was also used to keep track of whether or notdrm_vblank_init()was called. And, that number was kept in addition to a properly maintaineddrm_device->mode_config.num_crtc.Now that we've removed that legacy variable entirely, let's stop requiring the
num_crtcargument fordrm_vblank_init()entirely. The main motivation for this is the fact that at the moment, we've had to workaround this oddity in the Rust kernel bindings for a few reasons:* We can't know the number of CRTCs until they've all been created, which meant that we had to keep track of that.
* Additionally, we also had to keep track of which CRTCs did and did not have vblank support. This is especially silly, because I am not aware of any physical hardware that only supports vblank interrupts on certain heads - and I can't think of any reasonable explanation for any hardware manufacturer making a design choice like that.
* This also implies that drivers could, with the current C API, register that they have a different number of CRTCs then they have actually created. This appears to be an edge case that could easily lead to UB since it's not obvious and as such has likely never really been tested. And we can't have that in Rust!
Quoted 7 lines
While the last point could technically still be an issue if a driver doesn't fill out the vblank handling callbacks for all CRTCs, this is a good start at cleaning this strange behavior up.
So, just get rid of this parameter entirely and start using the DRM's internal count of CRTCs. We apply this change across the tree using this coccinelle patch:
I had been working on better support for software-timer vblank events. And for user space, we wanted to distinguish between real HW support and the software-based implementation.
Therefore, could we keep the parameter, but re-designate it to be a flags argument? All drivers with software vblank timers would flag them as such.
Best regards
Thomas
Quoted 872 lines
virtual patch
@depends on patch@
expression dev;
@@-
drm_vblank_init(dev, ...)
+drm_vblank_init(dev)And then fixup some of the funky whitespace errors that introduces by hand.
Signed-off-by Lyude Paul <[email protected]>Assisted-by Coccinelle--- drivers/gpu/drm/adp/adp_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 2 +- drivers/gpu/drm/armada/armada_drv.c | 2 +- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/drm_vblank.c | 6 +++--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 2 +- drivers/gpu/drm/i915/display/intel_display_driver.c | 3 +-- drivers/gpu/drm/imx/dc/dc-kms.c | 2 +- drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +- drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 2 +- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- drivers/gpu/drm/kmb/kmb_drv.c | 2 +- drivers/gpu/drm/logicvc/logicvc_mode.c | 2 +- drivers/gpu/drm/loongson/lsdc_drv.c | 2 +- drivers/gpu/drm/mcde/mcde_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/msm/msm_kms.c | 2 +- drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 +- drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 2 +- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- drivers/gpu/drm/sprd/sprd_drm.c | 2 +- drivers/gpu/drm/sti/sti_compositor.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tidss/tidss_kms.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/tiny/bochs.c | 2 +- drivers/gpu/drm/tiny/cirrus-qemu.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 2 +- drivers/gpu/drm/verisilicon/vs_drm.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.c | 3 +-- drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_kms.c | 2 +- include/drm/drm_vblank.h | 2 +- 60 files changed, 62 insertions(+), 64 deletions(-)drivers/gpu/drm/adp/adp_drv.c +1
-1@@ -444,7 +444,7 @@ static int adp_setup_mode_config(struct adp_drv_private *adp)if (IS_ERR (adp->connector))return PTR_ERR (adp->connector); - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {drm_err (drm,"failed to initialize vblank" );return ret;drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +1
-1@@ -413,7 +413,7 @@ static int amdgpu_vkms_sw_init(struct amdgpu_ip_block *ip_block)return r; } - r =drm_vblank_init (adev_to_drm (adev), adev->mode_info.num_crtc); + r =drm_vblank_init (adev_to_drm (adev));if (r)return r;drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +1
-1@@ -2809,7 +2809,7 @@ static int dce_v10_0_sw_init(struct amdgpu_ip_block *ip_block)/* XXX: can this be enabled for DC? */ adev_to_drm (adev)->vblank_disable_immediate = true; - r =drm_vblank_init (adev_to_drm (adev), adev->mode_info.num_crtc); + r =drm_vblank_init (adev_to_drm (adev));if (r)return r;drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-1@@ -2759,7 +2759,7 @@ static int dce_v6_0_sw_init(struct amdgpu_ip_block *ip_block)/* XXX: can this be enabled for DC? */ adev_to_drm (adev)->vblank_disable_immediate = true; - r =drm_vblank_init (adev_to_drm (adev), adev->mode_info.num_crtc); + r =drm_vblank_init (adev_to_drm (adev));if (r)return r;drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +1
-1@@ -2728,7 +2728,7 @@ static int dce_v8_0_sw_init(struct amdgpu_ip_block *ip_block)/* XXX: can this be enabled for DC? */ adev_to_drm (adev)->vblank_disable_immediate = true; - r =drm_vblank_init (adev_to_drm (adev), adev->mode_info.num_crtc); + r =drm_vblank_init (adev_to_drm (adev));if (r)return r;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -893,7 +893,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)adev_to_drm (adev)->mode_config.cursor_width = adev->dm.dc->caps.max_cursor_size;adev_to_drm (adev)->mode_config.cursor_height = adev->dm.dc->caps.max_cursor_size; -if (drm_vblank_init (adev_to_drm (adev), adev->dm.display_indexes_num)) { +if (drm_vblank_init (adev_to_drm (adev))) {drm_err (adev_to_drm (adev),"failed to initialize vblank for display support.\n" ); goto error;drivers/gpu/drm/arm/display/komeda/komeda_kms.c +1
-1@@ -297,7 +297,7 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev)if (err) goto cleanup_mode_config; - err =drm_vblank_init (drm, kms->n_crtcs); + err =drm_vblank_init (drm);if (err) goto cleanup_mode_config;drivers/gpu/drm/arm/hdlcd_drv.c +1
-1@@ -275,7 +275,7 @@ static int hdlcd_drm_bind(struct device *dev)pm_runtime_enable (dev); - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {DRM_ERROR ("failed to initialise vblank\n" ); goto err_vblank;drivers/gpu/drm/arm/malidp_drv.c +1
-1@@ -849,7 +849,7 @@ static int malidp_bind(struct device *dev)if (ret <0 ) goto irq_init_fail; - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {DRM_ERROR ("failed to initialise vblank\n" ); goto vblank_fail;drivers/gpu/drm/armada/armada_drv.c +1
-1@@ -122,7 +122,7 @@ static int armada_drm_bind(struct device *dev)if (ret) goto err_kms; - ret =drm_vblank_init (&priv->drm, priv->drm.mode_config.num_crtc); + ret =drm_vblank_init (&priv->drm);if (ret) goto err_comp;drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1
-1@@ -205,7 +205,7 @@ static int aspeed_gfx_load(struct drm_device *drm)if (ret <0 )return ret; - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" );return ret;drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +1
-1@@ -867,7 +867,7 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev)pm_runtime_enable (dev->dev); - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret <0 ) {drm_err (dev,"failed to initialize vblank\n" ); goto err_periph_clk_disable;drivers/gpu/drm/drm_vblank.c +3
-3@@ -536,18 +536,18 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr)/** * drm_vblank_init - initialize vblank support * @dev: DRM device -* @num_crtcs: number of CRTCs supported by @dev * -* This function initializes vblank support for @num_crtcs display pipelines. +* This function initializes vblank support for display pipelines. * Cleanup is handled automatically through a cleanup function added with * drmm_add_action_or_reset(). * * Returns: * Zero on success or a negative error code on failure. */ -int drm_vblank_init (struct drm_device *dev,unsigned int num_crtcs) +int drm_vblank_init (struct drm_device *dev) {int ret; +unsigned int num_crtcs = dev->mode_config.num_crtc;unsigned int i;spin_lock_init (&dev->vbl_lock);drivers/gpu/drm/exynos/exynos_drm_drv.c +1
-1@@ -273,7 +273,7 @@ static int exynos_drm_bind(struct device *dev)if (ret) goto err_mode_config_cleanup; - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret) goto err_unbind_all;drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +1
-1@@ -122,7 +122,7 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)return dev_err_probe (dev->dev, ret,"failed to enable pixclk\n" ); } - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret <0 ) {dev_err (dev->dev,"failed to initialize vblank\n" ); goto done_vblank;drivers/gpu/drm/gma500/psb_drv.c +1
-1@@ -364,7 +364,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)acpi_video_register ();/* Setup vertical blanking handling */ - ret =drm_vblank_init (dev, dev_priv->num_pipe); + ret =drm_vblank_init (dev);if (ret) goto out_err;drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1
-1@@ -398,7 +398,7 @@ static int hibmc_load(struct drm_device *dev)if (ret) goto err; - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret) {drm_err (dev,"failed to initialize vblank: %d\n" , ret); goto err;drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +1
-1@@ -181,7 +181,7 @@ static int kirin_drm_kms_init(struct drm_device *dev, }/* vblank init */ - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret) {DRM_ERROR ("failed to initialize vblank.\n" ); goto err_unbind_all;drivers/gpu/drm/hyperv/hyperv_drm_modeset.c +1
-1@@ -330,7 +330,7 @@ int hv_drm_mode_config_init(struct hv_drm_device *hv)return ret; } - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret)return ret;drivers/gpu/drm/i915/display/intel_display_driver.c +1
-2@@ -217,8 +217,7 @@ int intel_display_driver_probe_noirq(struct intel_display *display)intel_bw_init_hw (display);if (HAS_DISPLAY (display)) { - ret =drm_vblank_init (display->drm, -INTEL_NUM_PIPES (display)); + ret =drm_vblank_init (display->drm);if (ret) goto cleanup_opregion; }drivers/gpu/drm/imx/dc/dc-kms.c +1
-1@@ -118,7 +118,7 @@ int dc_kms_init(struct dc_drm_device *dc_drm)return ret; } - ret =drm_vblank_init (drm,DC_DISPLAYS ); + ret =drm_vblank_init (drm);if (ret) {dev_err (drm->dev,"failed to init vblank support: %d\n" , ret);return ret;drivers/gpu/drm/imx/dcss/dcss-kms.c +1
-1@@ -129,7 +129,7 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss)dcss_kms_mode_config_init (kms); - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret) goto cleanup_mode_config;drivers/gpu/drm/imx/ipuv3/imx-drm-core.c +1
-1@@ -233,7 +233,7 @@ static int imx_drm_bind(struct device *dev)if (ret) goto err_kms; - ret =drm_vblank_init (drm,MAX_CRTC ); + ret =drm_vblank_init (drm);if (ret) goto err_kms;drivers/gpu/drm/imx/lcdc/imx-lcdc.c +1
-1@@ -435,7 +435,7 @@ static int imx_lcdc_probe(struct platform_device *pdev)if (ret <0 )return dev_err_probe (drm->dev, ret,"Cannot setup simple display pipe\n" ); - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 )return dev_err_probe (drm->dev, ret,"Failed to initialize vblank\n" );drivers/gpu/drm/ingenic/ingenic-drm-drv.c +1
-1@@ -1348,7 +1348,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) goto err_drvdata; } - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret) {dev_err (dev,"Failed calling drm_vblank_init()\n" ); goto err_drvdata;drivers/gpu/drm/kmb/kmb_drv.c +1
-1@@ -191,7 +191,7 @@ static int kmb_setup_mode_config(struct drm_device *drm) ret =kmb_dsi_encoder_init (drm, kmb->kmb_dsi);/* Set the CRTC's port so that the encoder component can find it */ kmb->crtc.port =of_graph_get_port_by_id (drm->dev->of_node,0 ); - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {drm_err (drm,"failed to initialize vblank\n" );pm_runtime_disable (drm->dev);drivers/gpu/drm/logicvc/logicvc_mode.c +1
-1@@ -36,7 +36,7 @@ int logicvc_mode_init(struct logicvc_drm *logicvc)uint32_t preferred_depth;int ret; - ret =drm_vblank_init (drm_dev, mode_config->num_crtc); + ret =drm_vblank_init (drm_dev);if (ret) {drm_err (drm_dev,"Failed to initialize vblank\n" );return ret;drivers/gpu/drm/loongson/lsdc_drv.c +1
-1@@ -296,7 +296,7 @@ static int lsdc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)drmm_kms_helper_poll_init (ddev);if (loongson_vblank) { - ret =drm_vblank_init (ddev, descp->num_of_crtc); + ret =drm_vblank_init (ddev);if (ret)return ret;drivers/gpu/drm/mcde/mcde_drv.c +1
-1@@ -174,7 +174,7 @@ static int mcde_modeset_init(struct drm_device *drm) mode_config->min_height =1 ; mode_config->max_height =1080 ; - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret) {dev_err (drm->dev,"failed to init vblank\n" );return ret;drivers/gpu/drm/mediatek/mtk_drm_drv.c +1
-1@@ -574,7 +574,7 @@ static int mtk_drm_kms_init(struct drm_device *drm)*/ dma_set_max_seg_size (dma_dev,UINT_MAX ); - ret =drm_vblank_init (drm,MAX_CRTC ); + ret =drm_vblank_init (drm);if (ret <0 ) goto err_component_unbind;drivers/gpu/drm/meson/meson_drv.c +1
-1@@ -262,7 +262,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) priv->vsync_irq =platform_get_irq (pdev,0 ); - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret) goto free_canvas_vd1_2;drivers/gpu/drm/msm/msm_kms.c +1
-1@@ -317,7 +317,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv)sched_set_fifo (ev_thread->worker->task); } - ret =drm_vblank_init (ddev, ddev->mode_config.num_crtc); + ret =drm_vblank_init (ddev);if (ret <0 ) {DRM_DEV_ERROR (dev,"failed to initialize vblank\n" ); goto err_msm_uninit;drivers/gpu/drm/mxsfb/lcdif_drv.c +1
-1@@ -175,7 +175,7 @@ static int lcdif_load(struct drm_device *drm)return ret; } - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" );return ret;drivers/gpu/drm/mxsfb/mxsfb_drv.c +1
-1@@ -257,7 +257,7 @@ static int mxsfb_load(struct drm_device *drm, goto err_vblank; } - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret <0 ) {dev_err (drm->dev,"Failed to initialise vblank\n" ); goto err_vblank;drivers/gpu/drm/nouveau/nouveau_display.c +1
-1@@ -713,7 +713,7 @@ nouveau_display_create(struct drm_device *dev)drm_mode_config_reset (dev);if (dev->mode_config.num_crtc) { - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret) goto vblank_err;drivers/gpu/drm/omapdrm/omap_drv.c +1
-1@@ -731,7 +731,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) }/* Initialize vblank handling, start with all CRTCs disabled. */ - ret =drm_vblank_init (ddev, priv->num_pipes); + ret =drm_vblank_init (ddev);if (ret) {dev_err (priv->dev,"could not init vblank\n" ); goto err_cleanup_modeset;drivers/gpu/drm/pl111/pl111_drv.c +1
-1@@ -175,7 +175,7 @@ static int pl111_modeset_init(struct drm_device *dev)return ret;if (!priv->variant->broken_vblank) { - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret !=0 ) {drm_err (dev,"Failed to init vblank\n" ); goto out_bridge;drivers/gpu/drm/qxl/qxl_display.c +1
-1@@ -1304,7 +1304,7 @@ int qxl_modeset_init(struct qxl_device *qdev)qxl_display_read_client_monitors_config (qdev); - ret =drm_vblank_init (&qdev->ddev, qxl_num_crtc); + ret =drm_vblank_init (&qdev->ddev);if (ret)return ret;drivers/gpu/drm/radeon/radeon_irq_kms.c +1
-1@@ -314,7 +314,7 @@ int radeon_irq_kms_init(struct radeon_device *rdev)/* Disable vblank irqs aggressively for power-saving */ rdev_to_drm (rdev)->vblank_disable_immediate = true; - r =drm_vblank_init (rdev_to_drm (rdev), rdev->num_crtc); + r =drm_vblank_init (rdev_to_drm (rdev));if (r) {return r; }drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +1
-1@@ -888,7 +888,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)* Initialize vertical blanking interrupts handling. Start with vblank * disabled for all CRTCs. */ - ret =drm_vblank_init (dev, rcdu->num_crtcs); + ret =drm_vblank_init (dev);if (ret <0 )return ret;drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c +1
-1@@ -430,7 +430,7 @@ int rzg2l_du_modeset_init(struct rzg2l_du_device *rcdu)* Initialize vertical blanking interrupts handling. Start with vblank * disabled for all CRTCs. */ - ret =drm_vblank_init (dev, rcdu->num_crtcs); + ret =drm_vblank_init (dev);if (ret <0 )return ret;drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +1
-1@@ -228,7 +228,7 @@ static int shmob_drm_probe(struct platform_device *pdev)if (ret)return ret; - ret =drm_vblank_init (ddev,1 ); + ret =drm_vblank_init (ddev);if (ret <0 ) {dev_err (&pdev->dev,"failed to initialize vblank\n" );return ret;drivers/gpu/drm/rockchip/rockchip_drm_drv.c +1
-1@@ -186,7 +186,7 @@ static int rockchip_drm_bind(struct device *dev)if (ret) goto err_unbind_all; - ret =drm_vblank_init (drm_dev, drm_dev->mode_config.num_crtc); + ret =drm_vblank_init (drm_dev);if (ret) goto err_iommu_cleanup;drivers/gpu/drm/sprd/sprd_drm.c +1
-1@@ -89,7 +89,7 @@ static int sprd_drm_bind(struct device *dev) }/* vblank init */ - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret) {drm_err (drm,"failed to initialize vblank.\n" ); goto err_unbind_all;drivers/gpu/drm/sti/sti_compositor.c +1
-1@@ -145,7 +145,7 @@ static int sti_compositor_bind(struct device *dev, } } -drm_vblank_init (drm_dev, crtc_id); +drm_vblank_init (drm_dev);return 0 ; }drivers/gpu/drm/stm/ltdc.c +1
-1@@ -2076,7 +2076,7 @@ int ltdc_load(struct drm_device *ddev) goto err; } - ret =drm_vblank_init (ddev,NB_CRTC ); + ret =drm_vblank_init (ddev);if (ret) {drm_err (ddev,"Failed calling drm_vblank_init()\n" ); goto err;drivers/gpu/drm/sun4i/sun4i_drv.c +1
-1@@ -95,7 +95,7 @@ static int sun4i_drv_bind(struct device *dev) }/* drm_vblank_init calls kcalloc, which can fail */ - ret =drm_vblank_init (drm, drm->mode_config.num_crtc); + ret =drm_vblank_init (drm);if (ret) goto unbind_all;drivers/gpu/drm/tegra/drm.c +1
-1@@ -1241,7 +1241,7 @@ static int host1x_drm_probe(struct host1x_device *dev)/* syncpoints are used for full 32-bit hardware VBLANK counters */ drm->max_vblank_count =0xffffffff ; - err =drm_vblank_init (drm, drm->mode_config.num_crtc); + err =drm_vblank_init (drm);if (err <0 ) goto hub;drivers/gpu/drm/tidss/tidss_kms.c +1
-1@@ -289,7 +289,7 @@ int tidss_modeset_init(struct tidss_device *tidss)if (ret)return ret; - ret =drm_vblank_init (ddev, tidss->num_crtcs); + ret =drm_vblank_init (ddev);if (ret)return ret;drivers/gpu/drm/tilcdc/tilcdc_drv.c +1
-1@@ -405,7 +405,7 @@ static int tilcdc_pdev_probe(struct platform_device *pdev) goto unregister_cpufreq_notif; } - ret =drm_vblank_init (ddev,1 ); + ret =drm_vblank_init (ddev);if (ret <0 ) {drm_err (ddev,"failed to initialize vblank\n" ); goto unregister_cpufreq_notif;drivers/gpu/drm/tiny/bochs.c +1
-1@@ -677,7 +677,7 @@ static int bochs_kms_init(struct bochs_device *bochs)drm_connector_attach_edid_property (connector);drm_connector_attach_encoder (connector, encoder); - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret)return ret;drivers/gpu/drm/tiny/cirrus-qemu.c +1
-1@@ -501,7 +501,7 @@ static int cirrus_pipe_init(struct cirrus_device *cirrus)if (ret)return ret; - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret)return ret;drivers/gpu/drm/tve200/tve200_drv.c +1
-1@@ -120,7 +120,7 @@ static int tve200_modeset_init(struct drm_device *dev)dev_info (dev->dev,"attached to panel %s\n" ,dev_name (panel->dev)); - ret =drm_vblank_init (dev,1 ); + ret =drm_vblank_init (dev);if (ret) {dev_err (dev->dev,"failed to init vblank\n" ); goto out_bridge;drivers/gpu/drm/vc4/vc4_kms.c +1
-1@@ -1151,7 +1151,7 @@ int vc4_kms_load(struct drm_device *dev)/* Set support for vblank irq fast disable, before drm_vblank_init() */ dev->vblank_disable_immediate = true; - ret =drm_vblank_init (dev, dev->mode_config.num_crtc); + ret =drm_vblank_init (dev);if (ret <0 ) {dev_err (dev->dev,"failed to initialize vblank\n" );return ret;drivers/gpu/drm/verisilicon/vs_drm.c +1
-1@@ -121,7 +121,7 @@ int vs_drm_initialize(struct vs_dc *dc, struct platform_device *pdev) vdrm->crtcs[i] = crtc; } - ret =drm_vblank_init (drm, dc->identity.display_count); + ret =drm_vblank_init (drm);if (ret)return ret;drivers/gpu/drm/virtio/virtgpu_display.c +1
-1@@ -381,7 +381,7 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)for (i =0 ; i < vgdev->num_scanouts; ++i)vgdev_output_init (vgdev, i); - ret =drm_vblank_init (vgdev->ddev, vgdev->num_scanouts); + ret =drm_vblank_init (vgdev->ddev);if (ret)return ret;drivers/gpu/drm/vkms/vkms_drv.c +1
-2@@ -192,8 +192,7 @@ int vkms_create(struct vkms_config *config) goto out_devres; } - ret =drm_vblank_init (&vkms_device->drm, -vkms_config_get_num_crtcs (config)); + ret =drm_vblank_init (&vkms_device->drm);if (ret) {DRM_ERROR ("Failed to vblank\n" ); goto out_devres;drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +1
-1@@ -212,7 +212,7 @@ vmw_vkms_init(struct vmw_private *vmw) ret =kstrtobool (buffer, &vmw->vkms_enabled);if (!ret && vmw->vkms_enabled) { - ret =drm_vblank_init (&vmw->drm,VMWGFX_NUM_DISPLAY_UNITS ); + ret =drm_vblank_init (&vmw->drm); vmw->vkms_enabled = (ret ==0 ); }drivers/gpu/drm/xlnx/zynqmp_kms.c +1
-1@@ -504,7 +504,7 @@ int zynqmp_dpsub_drm_init(struct zynqmp_dpsub *dpsub) drm->mode_config.max_width =ZYNQMP_DISP_MAX_WIDTH ; drm->mode_config.max_height =ZYNQMP_DISP_MAX_HEIGHT ; - ret =drm_vblank_init (drm,1 ); + ret =drm_vblank_init (drm);if (ret)return ret;include/drm/drm_vblank.h +1
-1@@ -285,7 +285,7 @@ struct drm_vblank_crtc { };struct drm_vblank_crtc *drm_crtc_vblank_crtc (struct drm_crtc *crtc); -int drm_vblank_init (struct drm_device *dev,unsigned int num_crtcs); +int drm_vblank_init (struct drm_device *dev);bool drm_dev_has_vblank (const struct drm_device *dev);u64 drm_crtc_vblank_count (struct drm_crtc *crtc); u64 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
Signature · 6 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)
Lyude Paul
maintainerPATCH 4/5 drm/vblank: Use drm_for_each_crtc() in drm_vblank_init()
In reply to Lyude PaulNo functional changes yet, we just should be using this iterator here instead of manually counting the number of CRTCs anyhow.
--- drivers/gpu/drm/drm_vblank.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_vblank.c +5 -4
@@ -547,19 +547,20 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr)int drm_vblank_init (struct drm_device *dev) {int ret; -unsigned int num_crtcs = dev->mode_config.num_crtc; -unsigned int i; +struct drm_crtc *crtc;spin_lock_init (&dev->vbl_lock);spin_lock_init (&dev->vblank_time_lock); - dev->vblank =drmm_kcalloc (dev, num_crtcs,sizeof (*dev->vblank),GFP_KERNEL ); + dev->vblank =drmm_kcalloc (dev, dev->mode_config.num_crtc, +sizeof (*dev->vblank),GFP_KERNEL );if (!dev->vblank)return -ENOMEM ; dev->has_hw_vblank = true; -for (i =0 ; i < num_crtcs; i++) { +drm_for_each_crtc (crtc, dev) { +unsigned int i = crtc->index;struct drm_vblank_crtc *vblank =drm_vblank_crtc (dev, i); vblank->dev = dev;
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH 4/5] drm/vblank: Use drm_for_each_crtc() in drm_vblank_init()
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Critical] Calling `drm_vblank_init` before creating CRTCs results in a zero-size allocation, leading to…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Critical] Calling drm_vblank_init before creating CRTCs results in a zero-size allocation, leading to a kernel crash when vblank features are later used. --
--- Patch [4]: [PATCH 4/5] drm/vblank: Use drm_for_each_crtc() in drm_vblank_init() --- commit 4aec980231f556c8a36b5294d67b3d582d49d623
Author: Lyude Paul <[email protected]>
drm/vblank: Use drm_for_each_crtc() in drm_vblank_init()
This patch updates drm_vblank_init() to use the drm_for_each_crtc() iterator instead of manually counting the number of CRTCs.
Quoted 15 lines
drivers/gpu/drm/drm_vblank.c +1
-2@@ -547,19 +547,20 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr)int drm_vblank_init (struct drm_device *dev) {int ret; -unsigned int num_crtcs = dev->mode_config.num_crtc; -unsigned int i; +struct drm_crtc *crtc;spin_lock_init (&dev->vbl_lock);spin_lock_init (&dev->vblank_time_lock);
drivers/gpu/drm/drm_vblank.c static void drm_vblank_init_release(struct drm_device *dev, void *ptr) · line 562
Quoted 10 lines
drivers/gpu/drm/drm_vblank.c +3
-2- dev->vblank =drmm_kcalloc (dev, num_crtcs,sizeof (*dev->vblank),GFP_KERNEL ); + dev->vblank =drmm_kcalloc (dev, dev->mode_config.num_crtc, +sizeof (*dev->vblank),GFP_KERNEL );if (!dev->vblank)return -ENOMEM ; dev->has_hw_vblank = true; -for (i =0 ; i < num_crtcs; i++) { +drm_for_each_crtc (crtc, dev) {
[Severity: Critical]
Could this change lead to an uninitialized vblank array and subsequent page fault for drivers that initialize vblank before creating CRTCs?
For example, in vkms_drv.c:vkms_create(), drm_vblank_init() is called before vkms_modeset_init() creates the CRTCs:
ret = drm_vblank_init(&vkms_device->drm);
if (ret) {
DRM_ERROR("Failed to vblank\n");
goto out_devres;
}
ret = vkms_modeset_init(vkms_device);Because the CRTCs are not yet created at this point, dev->mode_config.num_crtc is 0. The allocation for the vblank array becomes a 0-byte allocation, returning ZERO_SIZE_PTR (0x10). The drm_for_each_crtc() loop then executes 0 times, and drm_vblank_init() successfully returns 0.
When userspace later calls DRM_IOCTL_WAIT_VBLANK, the kernel looks up the CRTC using drm_vblank_crtc(dev, pipe). This returns a pointer into the array, which evaluates to ZERO_SIZE_PTR + pipe * sizeof(...).
Will dereferencing this pointer cause an immediate kernel OOPS?
Quoted 4 lines
drivers/gpu/drm/drm_vblank.c +1
-0+unsigned int i = crtc->index;struct drm_vblank_crtc *vblank =drm_vblank_crtc (dev, i); vblank->dev = dev;
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Lyude Paul
maintainerPATCH 5/5 drm/vblank: Require all CRTCs implement vblank support in drm_vblank_init()
In reply to Lyude PaulDue to us previously allowing users to specify the number of CRTCs for drm_vblank_init() manually, a untested and almost certainly UB edge case was technically possible for drivers: implementing vblank support for some of their CRTCs, and not implementing it for others.
I don't think there's any actual situation in the real world where hardware like this exists, nor do I think supporting such a possibility was ever actually the original intent here. But in Rust, we need to be able to prevent such a situation from occurring since we cannot guarantee no UB is possible otherwise. I think it makes sense here for us to just handle this safety check in the DRM core though, since it's quite likely such an edge case would break C drivers in addition to Rust drivers.
So, let's start enforcing this in drm_vblank_init by checking that every CRTC has an enable_vblank function registered. Throw a warning if we find that some CRTCs have it and others don't.
In the event that we don't actually find any CRTCs with vblank support, simply skip init and return -ENODEV. We intentionally don't WARN_ON() this scenario, as it isn't a fatal error and drivers which do support KMS but don't end up registering any CRTCs can simply ignore the error. This is also useful for Rust, since it saves us from having to track whether or not any CRTCs registered vblank support ourselves.
--- drivers/gpu/drm/drm_vblank.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_vblank.c +20 -1
@@ -542,12 +542,31 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr)* drmm_add_action_or_reset(). * * Returns: -* Zero on success or a negative error code on failure. +* Zero on success or a negative error code on failure. If no CRTCs with vblank +* support implemented were found, -ENODEV will be returned. */ int drm_vblank_init (struct drm_device *dev) {int ret;struct drm_crtc *crtc; +bool found_vbl_crtc = false, found_non_vbl_crtc = false; + +/* Vblank hooks are per-CRTC, not per-device - which is contrary to how +* the vblank core was written. Since hardware that only has vblank +* support on some CRTCs but not all is non-existent and would likely +* lead to UB, ensure that vblank support is all or nothing. +*/ +drm_for_each_crtc (crtc, dev) { +if (crtc->funcs->enable_vblank) + found_vbl_crtc = true; +else + found_non_vbl_crtc = true; + +if (drm_WARN_ON (dev, found_vbl_crtc && found_non_vbl_crtc)) +return -EINVAL ; + } +if (!found_vbl_crtc) +return -ENODEV ;spin_lock_init (&dev->vbl_lock);spin_lock_init (&dev->vblank_time_lock);
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH 5/5] drm/vblank: Require all CRTCs implement vblank support in drm_vblank_init()
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] drm_vblank_init() causes a NULL pointer dereference or driver probe failure due to accessing…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] drm_vblank_init() causes a NULL pointer dereference or driver probe failure due to accessing uninitialized or empty crtc_list --
--- Patch [5]: [PATCH 5/5] drm/vblank: Require all CRTCs implement vblank support in drm_vblank_init() --- commit 178bbb448a16663eaad60425c62b446801e0f387
Author: Lyude Paul <[email protected]>
drm/vblank: Require all CRTCs implement vblank support in drm_vblank_init()
This commit modifies drm_vblank_init() to verify that all CRTCs implement vblank support, ensuring an all-or-nothing configuration. It returns -EINVAL if support is mixed, and -ENODEV if no CRTCs support vblank.
Quoted 14 lines
drivers/gpu/drm/drm_vblank.c +2
-1@@ -542,12 +542,31 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr)* drmm_add_action_or_reset(). * * Returns: -* Zero on success or a negative error code on failure. +* Zero on success or a negative error code on failure. If no CRTCs with vblank +* support implemented were found, -ENODEV will be returned. */ int drm_vblank_init (struct drm_device *dev) {
drivers/gpu/drm/drm_vblank.c static void drm_vblank_init_release(struct drm_device *dev, void *ptr) · line 559
Quoted 10 lines
drivers/gpu/drm/drm_vblank.c +8
-0int ret;struct drm_crtc *crtc; +bool found_vbl_crtc = false, found_non_vbl_crtc = false; + +/* Vblank hooks are per-CRTC, not per-device - which is contrary to how +* the vblank core was written. Since hardware that only has vblank +* support on some CRTCs but not all is non-existent and would likely +* lead to UB, ensure that vblank support is all or nothing. +*/ +drm_for_each_crtc (crtc, dev) {
[Severity: High]
Can iterating over dev->mode_config.crtc_list here cause a NULL pointer dereference or a false -ENODEV return during driver probe?
Several DRM drivers call drm_vblank_init() before initializing mode_config or creating CRTCs. For example:
In i915, intel_display_driver_probe_noirq() calls drm_vblank_init() before intel_mode_config_init() sets up the crtc_list, meaning the list head is uninitialized.
In vkms, vkms_create() calls drm_vblank_init() before vkms_modeset_init() initializes the crtc_list.
In zynqmp_kms, zynqmp_dpsub_drm_init() initializes the list but calls drm_vblank_init() before any CRTCs are created, meaning the list is empty and this function will unconditionally return -ENODEV.
Does drm_vblank_init() need to support being called before CRTCs are registered?
Quoted 10 lines
drivers/gpu/drm/drm_vblank.c +10
-0+if (crtc->funcs->enable_vblank) + found_vbl_crtc = true; +else + found_non_vbl_crtc = true; + +if (drm_WARN_ON (dev, found_vbl_crtc && found_non_vbl_crtc)) +return -EINVAL ; + } +if (!found_vbl_crtc) +return -ENODEV ;
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Patchwork
CI✗ Fi.CI.BUILD: failure for drm/vblank: Enforce all-or-nothing vblank support
In reply to Lyude Paul== Series Details ==
== Series Details ==
Series: drm/vblank: Enforce all-or-nothing vblank support
URL : https://patchwork.freedesktop.org/series/172249/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/172249/revisions/1/mbox/ not applied
Applying: drm/vblank: Add drm_device.has_hw_vblank
Applying: drm/vblank: Remove drm->num_crtcs
Applying: drm/vblank: Remove num_crtcs argument from drm_vblank_init()
Using index info to reconstruct a base tree...
M drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
M drivers/gpu/drm/i915/display/intel_display_driver.c
M drivers/gpu/drm/virtio/virtgpu_display.c
M drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c Auto-merging drivers/gpu/drm/virtio/virtgpu_display.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_driver.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/vblank: Remove num_crtcs argument from drm_vblank_init() When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced
Jani Nikula
maintainerQuoted 17 lines · Lyude Paul
One of the oddities with DRM that is leftover from the old days is how vblank support is implemented by drivers. This has caused some minor issues for the rust bindings for KMS which could be worked around. However, it seems like a much better idea to fix this on the C side. Those oddities are mainly:
* There's nothing in the vblank core that actually ensures that all CRTCs implement vblank support if one of them do. On Rust's side, we can't have this and have to ensure either the whole device has vblank support or not - otherwise it would be quite painful ensuring we don't expose vblank methods to drivers that can't use them.
This additionally means such a situation would lead to UB.
* There is a second variable for keeping track of the number of CRTCs and it's kind of broken and confusing. Even worse, we currently allow the vblank API to allow a driver to specify a different number of CRTCs then it actually has.
Quoted 3 lines
So, let's just go ahead and fix this across the whole tree, and enforce that a driver must either implement hardware vblank support for all CRTCs or no CRTCs.
For i915, the relevant init order is currently:
- drm_vblank_init()
- drm_mode_config_init()
- drm_crtc_init_with_planes() for each CRTC
For the patch series to work, drm_vblank_init() would have to happen after mode config and CRTC init. Off-hand, I couldn't say if there are dependencies that make this change difficult.
I'd be surprised if i915 were the only driver like this.
BR,
Jani.
Quoted 77 lines
Lyude Paul (5):
drm/vblank: Add drm_device.has_hw_vblank drm/vblank: Removedrm->num_crtcs
drm/vblank: Removenum_crtcsargument fromdrm_vblank_init()drm/vblank: Usedrm_for_each_crtc()indrm_vblank_init()drm/vblank: Require all CRTCs implement vblank support in
drm_vblank_init()drivers/gpu/drm/adp/adp_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 2 +- drivers/gpu/drm/armada/armada_drv.c | 2 +- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/drm_vblank.c | 60 ++++++++++++------- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/gma500/psb_irq.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 2 +- .../drm/i915/display/intel_display_driver.c | 3 +- drivers/gpu/drm/imx/dc/dc-kms.c | 2 +- drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +- drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 2 +- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- drivers/gpu/drm/kmb/kmb_drv.c | 2 +- drivers/gpu/drm/logicvc/logicvc_mode.c | 2 +- drivers/gpu/drm/loongson/lsdc_drv.c | 2 +- drivers/gpu/drm/mcde/mcde_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/msm/msm_kms.c | 2 +- drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 +- drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 2 +- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- drivers/gpu/drm/sprd/sprd_drm.c | 2 +- drivers/gpu/drm/sti/sti_compositor.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tidss/tidss_kms.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/tiny/bochs.c | 2 +- drivers/gpu/drm/tiny/cirrus-qemu.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 6 +- drivers/gpu/drm/verisilicon/vs_drm.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_kms.c | 2 +- include/drm/drm_device.h | 10 +++- include/drm/drm_vblank.h | 2 +- 64 files changed, 114 insertions(+), 92 deletions(-)base-commit:
568d4cb5dcc5ec4e22975699b6ea67a30806884c
Signature · 1 line
Jani Nikula, Intel