xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: bridge: Return NULL on error from drm_bridge_get_edid()

Browse Source 
The drm_bridge_get_edid() function is documented to return an error
pointer on error. The underlying .get_edid() operation, however, returns
NULL on error, and so do the drm_get_edid() and drm_do_get_edid()
functions upon which .get_edid() is usually implemented. Make
drm_bridge_get_edid() return NULL on error to be consistent.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200526011505.31884-6-laurent.pinchart+renesas@ideasonboard.com
This commit is contained in:
Laurent Pinchart
2020-05-26 04:14:43 +03:00
committed by Sam Ravnborg
parent 0bae6020b8
commit 11d3cf8045
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/bridge/ti-tfp410.c
View File

@@ -51,11 +51,15 @@ static int tfp410_get_modes(struct drm_connector *connector)
struct edid *edid; struct edid *edid;
int ret; int ret;
if (dvi->next_bridge->ops & DRM_BRIDGE_OP_EDID) {
edid = drm_bridge_get_edid(dvi->next_bridge, connector); edid = drm_bridge_get_edid(dvi->next_bridge, connector);
if (IS_ERR_OR_NULL(edid)) { if (!edid)
if (edid != ERR_PTR(-ENOTSUPP))
DRM_INFO("EDID read failed. Fallback to standard modes\n"); DRM_INFO("EDID read failed. Fallback to standard modes\n");
} else {
edid = NULL;
}
if (!edid) {
/* /*
* No EDID, fallback on the XGA standard modes and prefer a mode * No EDID, fallback on the XGA standard modes and prefer a mode
* pretty much anything can handle. * pretty much anything can handle.

6
drivers/gpu/drm/drm_bridge.c
View File

@@ -1086,16 +1086,16 @@ EXPORT_SYMBOL_GPL(drm_bridge_get_modes);
* *
* If the bridge supports output EDID retrieval, as reported by the * If the bridge supports output EDID retrieval, as reported by the
* DRM_BRIDGE_OP_EDID bridge ops flag, call &drm_bridge_funcs.get_edid to * DRM_BRIDGE_OP_EDID bridge ops flag, call &drm_bridge_funcs.get_edid to
* get the EDID and return it. Otherwise return ERR_PTR(-ENOTSUPP). * get the EDID and return it. Otherwise return NULL.
* *
* RETURNS: * RETURNS:
* The retrieved EDID on success, or an error pointer otherwise. * The retrieved EDID on success, or NULL otherwise.
*/ */
struct edid *drm_bridge_get_edid(struct drm_bridge *bridge, struct edid *drm_bridge_get_edid(struct drm_bridge *bridge,
struct drm_connector *connector) struct drm_connector *connector)
{ {
if (!(bridge->ops & DRM_BRIDGE_OP_EDID)) if (!(bridge->ops & DRM_BRIDGE_OP_EDID))
return ERR_PTR(-ENOTSUPP); return NULL;
return bridge->funcs->get_edid(bridge, connector); return bridge->funcs->get_edid(bridge, connector);
} }