diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-09-26 13:06:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-09-26 13:06:39 +1000 |
| commit | a2caae58f8e8f24f085515d270b5983b83d2c6e3 (patch) | |
| tree | 235e758aaab6805a0bbbd7dbb740d71131a6bd86 | |
| parent | 342f141ba9f4c9e39de342d047a5245e8f4cda19 (diff) | |
| parent | 0c4932f6ddf815618fa34f7403df682aed7862b5 (diff) | |
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: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250925064257.GA9107@linux.fritz.box
| -rw-r--r-- | drivers/gpu/drm/bridge/waveshare-dsi.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/tiny/Kconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/bridge/waveshare-dsi.c b/drivers/gpu/drm/bridge/waveshare-dsi.c index 01c70e7d3d3b..43f4e7412d72 100644 --- a/drivers/gpu/drm/bridge/waveshare-dsi.c +++ b/drivers/gpu/drm/bridge/waveshare-dsi.c @@ -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; diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index 94a5bf61a115..7d9e85e932d7 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -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. |