Commit a2caae58 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2025-09-25' of... 

Merge tag 'drm-misc-next-fixes-2025-09-25' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

Short summary of fixes pull:

bridge:
- waveshare-dsi: Fix error handling in probe function

pixpaper:
- select GEM SHMEM helpers

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250925064257.GA9107@linux.fritz.box
parents 342f141b 0c4932f6

drivers/gpu/drm/bridge/waveshare-dsi.c

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ static int ws_bridge_probe(struct i2c_client *i2c) 
	int ret;



	ws = devm_drm_bridge_alloc(dev, struct ws_bridge, bridge, &ws_bridge_bridge_funcs);

	if (!ws)

		return -ENOMEM;

	if (IS_ERR(ws))

		return PTR_ERR(ws);



	ws->dev = dev;

drivers/gpu/drm/tiny/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ config DRM_PIXPAPER 
        tristate "DRM support for PIXPAPER display panels"

        depends on DRM && SPI

        select DRM_CLIENT_SELECTION

        select DRM_GEM_DMA_HELPER

        select DRM_GEM_SHMEM_HELPER

        select DRM_KMS_HELPER

        help

	  DRM driver for the Mayqueen Pixpaper e-ink display panel.