Short summary of fixes pull:
* fixes for bind and probing error handling * panel-orientation fixes for Lenovo Book X90F -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmQcDHoACgkQaA3BHVML eiNz6Af+KuvSV55epFCKD0ToHVbhq11S7JFBVu/zEMXRd8sCRkR64YG8LkF7nsR8 5V+dMKsGTOS2qb2Htk/P9gRYDU6KH6Q2UWaiYUzc3z3vbQi8LxludzSOhh7Y8ErN 6c/ge/35AVFJb0ipXAQBOhhMsfD0IYc1H8VYv5YaV9n4E1m99SS8GuQJ/Ua/JQvl KRIDW/rizMhHKTuxlHR0l2+EjHTSn2ZBQ3DktsrvjmWOvcvKGivwTohhIRqKESeu HokH8hmRDXef/800Nud+tVZcEROubbsTmXV1hTUAowac58UduPC86b2MCyT3G4P4 XYOJBGS3LaNOOqyihnYeoEu8cSaV0A== =qFS5 -----END PGP SIGNATURE----- Merge tag 'drm-misc-fixes-2023-03-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Short summary of fixes pull: * fixes for bind and probing error handling for meson, lt8912b bridge * panel-orientation fixes for Lenovo Book X90F Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20230323082401.GA8371@linux-uq9g
This commit is contained in:
commit
9b5dbf6b15
@ -676,8 +676,8 @@ static int lt8912_parse_dt(struct lt8912 *lt)
|
||||
|
||||
lt->hdmi_port = of_drm_find_bridge(port_node);
|
||||
if (!lt->hdmi_port) {
|
||||
dev_err(lt->dev, "%s: Failed to get hdmi port\n", __func__);
|
||||
ret = -ENODEV;
|
||||
ret = -EPROBE_DEFER;
|
||||
dev_err_probe(lt->dev, ret, "%s: Failed to get hdmi port\n", __func__);
|
||||
goto err_free_host_node;
|
||||
}
|
||||
|
||||
|
@ -328,10 +328,17 @@ static const struct dmi_system_id orientation_data[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "IdeaPad Duet 3 10IGL5"),
|
||||
},
|
||||
.driver_data = (void *)&lcd1200x1920_rightside_up,
|
||||
}, { /* Lenovo Yoga Book X90F / X91F / X91L */
|
||||
}, { /* Lenovo Yoga Book X90F / X90L */
|
||||
.matches = {
|
||||
/* Non exact match to match all versions */
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X9"),
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"),
|
||||
},
|
||||
.driver_data = (void *)&lcd1200x1920_rightside_up,
|
||||
}, { /* Lenovo Yoga Book X91F / X91L */
|
||||
.matches = {
|
||||
/* Non exact match to match F + L versions */
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"),
|
||||
},
|
||||
.driver_data = (void *)&lcd1200x1920_rightside_up,
|
||||
}, { /* Lenovo Yoga Tablet 2 830F / 830L */
|
||||
|
@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
|
||||
|
||||
ret = meson_encoder_hdmi_init(priv);
|
||||
if (ret)
|
||||
goto exit_afbcd;
|
||||
goto unbind_all;
|
||||
|
||||
ret = meson_plane_create(priv);
|
||||
if (ret)
|
||||
goto exit_afbcd;
|
||||
goto unbind_all;
|
||||
|
||||
ret = meson_overlay_create(priv);
|
||||
if (ret)
|
||||
goto exit_afbcd;
|
||||
goto unbind_all;
|
||||
|
||||
ret = meson_crtc_create(priv);
|
||||
if (ret)
|
||||
goto exit_afbcd;
|
||||
goto unbind_all;
|
||||
|
||||
ret = request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->name, drm);
|
||||
if (ret)
|
||||
goto exit_afbcd;
|
||||
goto unbind_all;
|
||||
|
||||
drm_mode_config_reset(drm);
|
||||
|
||||
@ -359,6 +359,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
|
||||
|
||||
uninstall_irq:
|
||||
free_irq(priv->vsync_irq, drm);
|
||||
unbind_all:
|
||||
if (has_components)
|
||||
component_unbind_all(drm->dev, drm);
|
||||
exit_afbcd:
|
||||
if (priv->afbcd.ops)
|
||||
priv->afbcd.ops->exit(priv);
|
||||
|
Loading…
x
Reference in New Issue
Block a user