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

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

drm/radeon/kms: connector fixes 



- Don't add dac load detection property to DVI-D
- Make sure i2c info is valid before adding DP aux chan bus
- Don't create scaling_mode_property twice
- fix typo that prevented coherent and load detection from working
- add coherent prop to DP (for dp->dvi adapters)

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

drivers/gpu/drm/radeon/radeon_connectors.c

+13 −7
Original line number Diff line number Diff line
@@ -1103,10 +1103,12 @@ radeon_add_atom_connector(struct drm_device *dev, 
		drm_connector_attach_property(&radeon_connector->base,

					      rdev->mode_info.coherent_mode_property,

					      1);

		if (connector_type == DRM_MODE_CONNECTOR_DVII) {

			radeon_connector->dac_load_detect = true;

			drm_connector_attach_property(&radeon_connector->base,

						      rdev->mode_info.load_detect_property,

						      1);

		}

		break;

	case DRM_MODE_CONNECTOR_HDMIA:

	case DRM_MODE_CONNECTOR_HDMIB:
@@ -1141,14 +1143,19 @@ radeon_add_atom_connector(struct drm_device *dev, 
		ret = drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);

		if (ret)

			goto failed;

		if (i2c_bus->valid) {

			/* add DP i2c bus */

			radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "DP-auxch");

		if (i2c_bus->valid) {

			if (!radeon_dig_connector->dp_i2c_bus)

				goto failed;

			radeon_connector->ddc_bus = radeon_i2c_create(dev, i2c_bus, "DP");

			if (!radeon_connector->ddc_bus)

				goto failed;

		}

		subpixel_order = SubPixelHorizontalRGB;

		drm_connector_attach_property(&radeon_connector->base,

					      rdev->mode_info.coherent_mode_property,

					      1);

		break;

	case DRM_MODE_CONNECTOR_SVIDEO:

	case DRM_MODE_CONNECTOR_Composite:
@@ -1183,7 +1190,6 @@ radeon_add_atom_connector(struct drm_device *dev, 
			if (!radeon_connector->ddc_bus)

				goto failed;

		}

		drm_mode_create_scaling_mode_property(dev);

		drm_connector_attach_property(&radeon_connector->base,

					      dev->mode_config.scaling_mode_property,

					      DRM_MODE_SCALE_FULLSCREEN);

drivers/gpu/drm/radeon/radeon_display.c

+2 −2
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ int radeon_modeset_create_props(struct radeon_device *rdev) 
			return -ENOMEM;



		rdev->mode_info.coherent_mode_property->values[0] = 0;

		rdev->mode_info.coherent_mode_property->values[0] = 1;

		rdev->mode_info.coherent_mode_property->values[1] = 1;

	}



	if (!ASIC_IS_AVIVO(rdev)) {
@@ -684,7 +684,7 @@ int radeon_modeset_create_props(struct radeon_device *rdev) 
	if (!rdev->mode_info.load_detect_property)

		return -ENOMEM;

	rdev->mode_info.load_detect_property->values[0] = 0;

	rdev->mode_info.load_detect_property->values[0] = 1;

	rdev->mode_info.load_detect_property->values[1] = 1;



	drm_mode_create_scaling_mode_property(rdev->ddev);