summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/imx/ipuv3
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2024-04-02 09:51:30 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2024-04-02 09:51:30 +0200
commit0d21364c6e8dc1f62c34bbc49d49935c8b01844c (patch)
tree962e75234ea6afce7978cd67d8b23a69fe0c25c5 /drivers/gpu/drm/imx/ipuv3
parentd76653c32dd16d78e56208b4819134e766257c06 (diff)
parent39cd87c4eb2b893354f3b850f916353f2658ae6f (diff)
Merge drm/drm-next into drm-misc-next
Backmerging to get v6.9-rc2 changes into drm-misc-next. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/imx/ipuv3')
-rw-r--r--drivers/gpu/drm/imx/ipuv3/parallel-display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
index 70349739dd89..55dedd73f528 100644
--- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c
+++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
@@ -72,14 +72,14 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
int ret;
if (!mode)
- return -EINVAL;
+ return 0;
ret = of_get_drm_display_mode(np, &imxpd->mode,
&imxpd->bus_flags,
OF_USE_NATIVE_MODE);
if (ret) {
drm_mode_destroy(connector->dev, mode);
- return ret;
+ return 0;
}
drm_mode_copy(mode, &imxpd->mode);