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

Commit cf4c12f9 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix tv module parameter 

The tv parameter was added to disable the tv-out connector,
however, it caused a crash if it was set to 0 due to
drm_connector_init not getting called.  If tv=0, don't
attempt to add the connector.

Might fix:
https://bugzilla.kernel.org/show_bug.cgi?id=17241



Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0d9958b1

drivers/gpu/drm/radeon/radeon_connectors.c

+43 −35
Original line number Diff line number Diff line
@@ -1051,10 +1051,16 @@ radeon_add_atom_connector(struct drm_device *dev, 
	uint32_t subpixel_order = SubPixelNone;

	bool shared_ddc = false;



	/* fixme - tv/cv/din */

	if (connector_type == DRM_MODE_CONNECTOR_Unknown)

		return;



	/* if the user selected tv=0 don't try and add the connector */

	if (((connector_type == DRM_MODE_CONNECTOR_SVIDEO) ||

	     (connector_type == DRM_MODE_CONNECTOR_Composite) ||

	     (connector_type == DRM_MODE_CONNECTOR_9PinDIN)) &&

	    (radeon_tv == 0))

		return;



	/* see if we already added it */

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		radeon_connector = to_radeon_connector(connector);
@@ -1209,7 +1215,6 @@ radeon_add_atom_connector(struct drm_device *dev, 
	case DRM_MODE_CONNECTOR_SVIDEO:

	case DRM_MODE_CONNECTOR_Composite:

	case DRM_MODE_CONNECTOR_9PinDIN:

		if (radeon_tv == 1) {

		drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);

		drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);

		radeon_connector->dac_load_detect = true;
@@ -1221,7 +1226,6 @@ radeon_add_atom_connector(struct drm_device *dev, 
					      radeon_atombios_get_tv_info(rdev));

		/* no HPD on analog connectors */

		radeon_connector->hpd.hpd = RADEON_HPD_NONE;

		}

		break;

	case DRM_MODE_CONNECTOR_LVDS:

		radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL);
@@ -1272,10 +1276,16 @@ radeon_add_legacy_connector(struct drm_device *dev, 
	struct radeon_connector *radeon_connector;

	uint32_t subpixel_order = SubPixelNone;



	/* fixme - tv/cv/din */

	if (connector_type == DRM_MODE_CONNECTOR_Unknown)

		return;



	/* if the user selected tv=0 don't try and add the connector */

	if (((connector_type == DRM_MODE_CONNECTOR_SVIDEO) ||

	     (connector_type == DRM_MODE_CONNECTOR_Composite) ||

	     (connector_type == DRM_MODE_CONNECTOR_9PinDIN)) &&

	    (radeon_tv == 0))

		return;



	/* see if we already added it */

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		radeon_connector = to_radeon_connector(connector);
@@ -1347,7 +1357,6 @@ radeon_add_legacy_connector(struct drm_device *dev, 
	case DRM_MODE_CONNECTOR_SVIDEO:

	case DRM_MODE_CONNECTOR_Composite:

	case DRM_MODE_CONNECTOR_9PinDIN:

		if (radeon_tv == 1) {

		drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);

		drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);

		radeon_connector->dac_load_detect = true;
@@ -1366,7 +1375,6 @@ radeon_add_legacy_connector(struct drm_device *dev, 
					      radeon_combios_get_tv_info(rdev));

		/* no HPD on analog connectors */

		radeon_connector->hpd.hpd = RADEON_HPD_NONE;

		}

		break;

	case DRM_MODE_CONNECTOR_LVDS:

		drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);