drm: Fix DRM_FORCE_ON_DIGITAL use
Subsystems (2)
PATCH 1/1 drm: Fix DRM_FORCE_ON_DIGITAL use
A connector may be forced on from the command line via video= command line setting. The digital output of dual-mode connectors can also be specifically selected and forced on; eg., 'video=DVI-I-2:D'. However, in this case, the connector->status will be mistakenly set to connector_status_disconnected, and the connector will not be mode set.
Fix the connector->status when connector->force is DRM_FORCE_ON_DIGITAL.
--- drivers/gpu/drm/drm_probe_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_probe_helper.c +2 -1
@@ -118,7 +118,8 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect mode->status =MODE_UNVERIFIED ;if (connector->force) { -if (connector->force ==DRM_FORCE_ON ) +if (connector->force ==DRM_FORCE_ON || + connector->force ==DRM_FORCE_ON_DIGITAL ) connector->status = connector_status_connected;else connector->status = connector_status_disconnected;
Signature · 6 lines
2.1.1 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Peter Hurley
A connector may be forced on from the command line via video= command line setting. The digital output of dual-mode connectors can also be specifically selected and forced on; eg., 'video=DVI-I-2:D'. However, in this case, the
connector->statuswill be mistakenly set toconnector_status_disconnected, and the connector will not be mode set.Fix the
connector->statuswhenconnector->forceisDRM_FORCE_ON_DIGITAL.Signed-off-by Peter Hurley <[email protected]>
Hm, this seems to have been broken since forever - I've added a note to your patch about that and merged it into topic/core-stuff. -Daniel
Quoted 25 lines
--- drivers/gpu/drm/drm_probe_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_probe_helper.c +2
-1@@ -118,7 +118,8 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect mode->status =MODE_UNVERIFIED ;if (connector->force) { -if (connector->force ==DRM_FORCE_ON ) +if (connector->force ==DRM_FORCE_ON || + connector->force ==DRM_FORCE_ON_DIGITAL ) connector->status = connector_status_connected;else connector->status = connector_status_disconnected;Signature · 6 lines
2.1.1 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel