diff options
author | Dave Airlie <airlied@redhat.com> | 2023-10-16 10:40:31 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-10-16 10:40:33 +1000 |
commit | d32ce5ab7b52e372c40bf792b53853934000a33f (patch) | |
tree | e28bc6396f0ef5ab219dcb0bc3d5bff86c8f11c9 /drivers/gpu/drm/panel/panel-arm-versatile.c | |
parent | 389af786f92ecdff35883551d54bf4e507ffcccb (diff) | |
parent | c395c83aafbb9cdbe4230f044d5b8eaf9080c0c5 (diff) | |
download | lwn-d32ce5ab7b52e372c40bf792b53853934000a33f.tar.gz lwn-d32ce5ab7b52e372c40bf792b53853934000a33f.zip |
Merge tag 'drm-misc-next-2023-10-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.7-rc1:
Contains the previous pull request drm-misc-next-2023-10-06 + following:
Cross-subsystem Changes:
- Rename fb_pgprot to pgprot_framebuffer and remove file argument/
- Update iosys-map documentation typos.
Core Changes:
- Assorted fixes to drm/panel.
- Add HPD state to drm_connector_oob_hotplug_event(), and implement
oob hotplug events in bridge connector.
- Replace drm_framebuffer_plane_width/height with calls to
drm_format_info_plane_width/height.
Driver Changes:
- Clock and debug fixes for bridge/samsung-dsim.
- More btree -> maple tree conversions.
- Assorted bugfixes in rockchip, panel-tpo-tpg110,
- Add LTK050H3148W-CTA6 panel support.
- Assorted small fixes in host1x, tegra, simpledrm.
- Suspend fixes for host1x.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/3812345e-b086-4d72-8504-f58d84e8feab@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/panel/panel-arm-versatile.c')
-rw-r--r-- | drivers/gpu/drm/panel/panel-arm-versatile.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/panel/panel-arm-versatile.c b/drivers/gpu/drm/panel/panel-arm-versatile.c index abb0788843c6..503ecea72c5e 100644 --- a/drivers/gpu/drm/panel/panel-arm-versatile.c +++ b/drivers/gpu/drm/panel/panel-arm-versatile.c @@ -267,6 +267,8 @@ static int versatile_panel_get_modes(struct drm_panel *panel, connector->display_info.bus_flags = vpanel->panel_type->bus_flags; mode = drm_mode_duplicate(connector->dev, &vpanel->panel_type->mode); + if (!mode) + return -ENOMEM; drm_mode_set_name(mode); mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; |