drm/nouveau/connector: Fix indenting in nouveau_connector_detect()
Subsystems (3)
Lyude Paul
maintainerPATCH 1/2 drm/nouveau/connector: Fix indenting in nouveau_connector_detect()
No functional changes
Signed-off-by Lyude Paul <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +2 -2
@@ -582,7 +582,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) nv_connector->edid =drm_get_edid (connector, i2c);drm_connector_update_edid_property (connector, - nv_connector->edid); + nv_connector->edid);if (!nv_connector->edid) {NV_ERROR (drm,"DDC responded, but no EDID for %s\n" , connector->name);
@@ -635,7 +635,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) encoder->helper_private;if (helper->detect (encoder, connector) == - connector_status_connected) { + connector_status_connected) {nouveau_connector_set_encoder (connector, nv_encoder); conn_status = connector_status_connected; goto out;
Signature · 1 line
2.24.1
Lyude Paul
maintainerPATCH 2/2 drm/nouveau/connector: Fix DDC error when probing force-disabled connectors
Signed-off-by Lyude Paul <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/nouveau/nouveau_connector.c +3 -0
@@ -550,6 +550,9 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)int ret;enum drm_connector_status conn_status = connector_status_disconnected; +if (connector->force ==DRM_FORCE_OFF ) +return conn_status; +/* Cleanup the previous EDID block. */ if (nv_connector->edid) {drm_connector_update_edid_property (connector,NULL );
Signature · 1 line
2.24.1