Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f82f5f3a authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: Report vga connector is connected according to ddc_probe 



On broken EDID we were reporting vga connector to be disconnected
even if ddc probe did found a monitor. This patch report that the
connector is connected on such case. This allow drm to add a fail
safe mode (800x600 at the time of this patch) thus user can boot
and later add a mode which match its monitor capabilities.

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a698cf34

drivers/gpu/drm/radeon/radeon_connectors.c

+5 −4
Original line number Diff line number Diff line
@@ -566,8 +566,9 @@ static enum drm_connector_status radeon_vga_detect(struct drm_connector *connect 
		radeon_i2c_do_lock(radeon_connector, 0);



		if (!radeon_connector->edid) {

			DRM_ERROR("DDC responded but not EDID found for %s\n",

			DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",

					drm_get_connector_name(connector));

			ret = connector_status_connected;

		} else {

			radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL);
@@ -720,7 +721,7 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connect 
		radeon_i2c_do_lock(radeon_connector, 0);



		if (!radeon_connector->edid) {

			DRM_ERROR("DDC responded but not EDID found for %s\n",

			DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",

					drm_get_connector_name(connector));

		} else {

			radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL);