Commit 56d0a0b3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2026-04-23' of... 

Merge tag 'drm-misc-fixes-2026-04-23' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

This week in drm-misc-fixes, we have:
- A patch to raise the vblank timeout to avoid it on virtual drivers
- a state check fix for stm_lvds
- a use-after-free fix for dma-buf
- a mapping fix for panthor
- a device_node reference leak fix for arcgpu
- a bridge reference leak fix for dw-mipi-dsi
- a sparse warning fix for dma-fence
- a kconfig fix for hv
- a memory leak fix for nouveau
- a fix to duplicate colorop when duplicating states
- a panel initialisation order fix for visionox-rm69299
- a fix to prevent an infinite loop for v3d
- an overflow fix for nouveau

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://patch.msgid.link/20260423-realistic-eager-reindeer-4dacf7@houat
parents 028ef9c9 2fc87d37

MAINTAINERS

+10 −3
Original line number Diff line number Diff line
@@ -8607,10 +8607,17 @@ S: Maintained 
T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git

F:	drivers/gpu/drm/gma500/









DRM DRIVERS FOR HISILICON









M:	Xinliang Liu <xinliang.liu@linaro.org>









DRM DRIVERS FOR HISILICON HIBMC









M:	Yongbang Shi <shiyongbang@huawei.com>









M:	Tian Tao  <tiantao6@hisilicon.com>









R:	Xinwei Kong <kong.kongxinwei@hisilicon.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git









F:	drivers/gpu/drm/hisilicon/hibmc

















DRM DRIVERS FOR HISILICON KIRIN









M:	Xinliang Liu <xinliang.liu@linaro.org>









R:	Sumit Semwal <sumit.semwal@linaro.org>









R:	Yongqin Liu <yongqin.liu@linaro.org>









R:	John Stultz <jstultz@google.com>








@@ -8618,7 +8625,7 @@ L:	dri-devel@lists.freedesktop.org







S:	Maintained









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git









F:	Documentation/devicetree/bindings/display/hisilicon/









F:	drivers/gpu/drm/hisilicon/









F:	drivers/gpu/drm/hisilicon/kirin

















DRM DRIVERS FOR LIMA









M:	Qiang Yu <yuq825@gmail.com>
































drivers/dma-buf/dma-buf.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -845,9 +845,8 @@ void dma_buf_put(struct dma_buf *dmabuf)







	if (WARN_ON(!dmabuf || !dmabuf->file))









		return;



















	fput(dmabuf->file);



















	DMA_BUF_TRACE(trace_dma_buf_put, dmabuf);









	fput(dmabuf->file);









}









EXPORT_SYMBOL_NS_GPL(dma_buf_put, "DMA_BUF");










































drivers/dma-buf/dma-fence.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -1021,8 +1021,8 @@ EXPORT_SYMBOL(dma_fence_set_deadline);







 */









void dma_fence_describe(struct dma_fence *fence, struct seq_file *seq)









{









	const char __rcu *timeline = "";









	const char __rcu *driver = "";









	const char __rcu *timeline = (const char __rcu *)"";









	const char __rcu *driver = (const char __rcu *)"";









	const char *signaled = "";



















	rcu_read_lock();
































drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c



+5
−1






























Original line number
Diff line number
Diff line







@@ -345,10 +345,14 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host,







	if (pdata->host_ops && pdata->host_ops->attach) {









		ret = pdata->host_ops->attach(pdata->priv_data, device);









		if (ret < 0)









			return ret;









			goto err_remove_bridge;









	}



















	return 0;



















err_remove_bridge:









	drm_bridge_remove(&dsi->bridge);









	return ret;









}



















static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host,
































drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c



+5
−1






























Original line number
Diff line number
Diff line







@@ -540,10 +540,14 @@ static int dw_mipi_dsi2_host_attach(struct mipi_dsi_host *host,







	if (pdata->host_ops && pdata->host_ops->attach) {









		ret = pdata->host_ops->attach(pdata->priv_data, device);









		if (ret < 0)









			return ret;









			goto err_remove_bridge;









	}



















	return 0;



















err_remove_bridge:









	drm_bridge_remove(&dsi2->bridge);









	return ret;









}



















static int dw_mipi_dsi2_host_detach(struct mipi_dsi_host *host,