Discussion:
[PATCH 1/2] drm/nouveau/connector: Fix indenting in nouveau_connector_detect()
(too old to reply)
Lyude Paul
2020-03-18 00:04:22 UTC
Permalink
No functional changes

Signed-off-by: Lyude Paul <***@redhat.com>
---
drivers/gpu/drm/nouveau/nouveau_connector.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 9a9a7f5003d3..0d42a7e5deff 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -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;
--
2.24.1
Lyude Paul
2020-03-18 00:04:23 UTC
Permalink
Signed-off-by: Lyude Paul <***@redhat.com>
---
drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 0d42a7e5deff..9fb00c4b9764 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -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);
--
2.24.1
Continue reading on narkive:
Loading...