* [PATCH 1/2] drm/nouveau/connector: Fix indenting in nouveau_connector_detect()
@ 2020-03-18 0:04 Lyude Paul
2020-03-18 0:04 ` [PATCH 2/2] drm/nouveau/connector: Fix DDC error when probing force-disabled connectors Lyude Paul
0 siblings, 1 reply; 2+ messages in thread
From: Lyude Paul @ 2020-03-18 0:04 UTC (permalink / raw)
To: nouveau; +Cc: David Airlie, dri-devel, Ben Skeggs, linux-kernel
No functional changes
Signed-off-by: Lyude Paul <lyude@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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] drm/nouveau/connector: Fix DDC error when probing force-disabled connectors
2020-03-18 0:04 [PATCH 1/2] drm/nouveau/connector: Fix indenting in nouveau_connector_detect() Lyude Paul
@ 2020-03-18 0:04 ` Lyude Paul
0 siblings, 0 replies; 2+ messages in thread
From: Lyude Paul @ 2020-03-18 0:04 UTC (permalink / raw)
To: nouveau; +Cc: David Airlie, dri-devel, Ben Skeggs, linux-kernel
Signed-off-by: Lyude Paul <lyude@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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-18 0:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-18 0:04 [PATCH 1/2] drm/nouveau/connector: Fix indenting in nouveau_connector_detect() Lyude Paul
2020-03-18 0:04 ` [PATCH 2/2] drm/nouveau/connector: Fix DDC error when probing force-disabled connectors Lyude Paul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).