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

Commit ec7fdeee authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Alex writes:
Just a few fixes for radeon.  The big one is a fix for hangs on older
asics due to the ordering of interrupt initialization.

* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: don't allow audio on DCE6
  drm/radeon: Use direct mapping for fast fb access on RS780/RS880 (v2)
  radeon: Fix system hang issue when using KMS with older cards
parents 91f8f105 1cbcca30

drivers/gpu/drm/radeon/atombios_encoders.c

+8 −3
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ atombios_digital_setup(struct drm_encoder *encoder, int action) 
int

atombios_get_encoder_mode(struct drm_encoder *encoder)

{

	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct drm_connector *connector;

	struct radeon_connector *radeon_connector;
@@ -693,7 +695,8 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	case DRM_MODE_CONNECTOR_DVII:

	case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */

		if (drm_detect_hdmi_monitor(radeon_connector->edid) &&

		    radeon_audio)

		    radeon_audio &&

		    !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */

			return ATOM_ENCODER_MODE_HDMI;

		else if (radeon_connector->use_digital)

			return ATOM_ENCODER_MODE_DVI;
@@ -704,7 +707,8 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	case DRM_MODE_CONNECTOR_HDMIA:

	default:

		if (drm_detect_hdmi_monitor(radeon_connector->edid) &&

		    radeon_audio)

		    radeon_audio &&

		    !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */

			return ATOM_ENCODER_MODE_HDMI;

		else

			return ATOM_ENCODER_MODE_DVI;
@@ -718,7 +722,8 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))

			return ATOM_ENCODER_MODE_DP;

		else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&

			 radeon_audio)

			 radeon_audio &&

			 !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */

			return ATOM_ENCODER_MODE_HDMI;

		else

			return ATOM_ENCODER_MODE_DVI;

drivers/gpu/drm/radeon/evergreen.c

+6 −4
Original line number Diff line number Diff line
@@ -4754,6 +4754,12 @@ static int evergreen_startup(struct radeon_device *rdev) 
		rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_size = 0;



	/* Enable IRQ */

	if (!rdev->irq.installed) {

		r = radeon_irq_kms_init(rdev);

		if (r)

			return r;

	}



	r = r600_irq_init(rdev);

	if (r) {

		DRM_ERROR("radeon: IH init failed (%d).\n", r);
@@ -4923,10 +4929,6 @@ int evergreen_init(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_irq_kms_init(rdev);

	if (r)

		return r;



	rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;

	r600_ring_init(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1024);

drivers/gpu/drm/radeon/ni.c

+6 −4
Original line number Diff line number Diff line
@@ -2025,6 +2025,12 @@ static int cayman_startup(struct radeon_device *rdev) 
	}



	/* Enable IRQ */

	if (!rdev->irq.installed) {

		r = radeon_irq_kms_init(rdev);

		if (r)

			return r;

	}



	r = r600_irq_init(rdev);

	if (r) {

		DRM_ERROR("radeon: IH init failed (%d).\n", r);
@@ -2190,10 +2196,6 @@ int cayman_init(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_irq_kms_init(rdev);

	if (r)

		return r;



	ring->ring_obj = NULL;

	r600_ring_init(rdev, ring, 1024 * 1024);

drivers/gpu/drm/radeon/r100.c

+6 −3
Original line number Diff line number Diff line
@@ -3869,6 +3869,12 @@ static int r100_startup(struct radeon_device *rdev) 
	}



	/* Enable IRQ */

	if (!rdev->irq.installed) {

		r = radeon_irq_kms_init(rdev);

		if (r)

			return r;

	}



	r100_irq_set(rdev);

	rdev->config.r100.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);

	/* 1M ring buffer */
@@ -4022,9 +4028,6 @@ int r100_init(struct radeon_device *rdev) 
	r100_mc_init(rdev);

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	if (r)

		return r;

	r = radeon_irq_kms_init(rdev);

	if (r)

		return r;

	/* Memory manager */

drivers/gpu/drm/radeon/r300.c

+6 −3
Original line number Diff line number Diff line
@@ -1382,6 +1382,12 @@ static int r300_startup(struct radeon_device *rdev) 
	}



	/* Enable IRQ */

	if (!rdev->irq.installed) {

		r = radeon_irq_kms_init(rdev);

		if (r)

			return r;

	}



	r100_irq_set(rdev);

	rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);

	/* 1M ring buffer */
@@ -1514,9 +1520,6 @@ int r300_init(struct radeon_device *rdev) 
	r300_mc_init(rdev);

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	if (r)

		return r;

	r = radeon_irq_kms_init(rdev);

	if (r)

		return r;

	/* Memory manager */