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

Commit 73e33c11 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

- fix for a long standing corruption bug on some Trinity/Richland parts.
- Stability fix for cayman dpm
- audio fixes for dce6+

* 'drm-fixes-3.13' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix asic gfx values for scrapper asics
  drm/radeon: check for 0 count in speaker allocation and SAD code
  drm/radeon/dpm: disable ss on Cayman
  drm/radeon/dce6: set correct number of audio pins
parents 2e6d8b46 e2f6c88f

drivers/gpu/drm/radeon/dce6_afmt.c

+5 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	}



	sad_count = drm_edid_to_speaker_allocation(radeon_connector->edid, &sadb);

	if (sad_count < 0) {

	if (sad_count <= 0) {

		DRM_ERROR("Couldn't read Speaker Allocation Data Block: %d\n", sad_count);

		return;

	}
@@ -235,7 +235,7 @@ void dce6_afmt_write_sad_regs(struct drm_encoder *encoder) 
	}



	sad_count = drm_edid_to_sad(radeon_connector->edid, &sads);

	if (sad_count < 0) {

	if (sad_count <= 0) {

		DRM_ERROR("Couldn't read SADs: %d\n", sad_count);

		return;

	}
@@ -308,7 +308,9 @@ int dce6_audio_init(struct radeon_device *rdev) 
	rdev->audio.enabled = true;



	if (ASIC_IS_DCE8(rdev))

		rdev->audio.num_pins = 7;

		rdev->audio.num_pins = 6;

	else if (ASIC_IS_DCE61(rdev))

		rdev->audio.num_pins = 4;

	else

		rdev->audio.num_pins = 6;

drivers/gpu/drm/radeon/evergreen_hdmi.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder) 
	}



	sad_count = drm_edid_to_speaker_allocation(radeon_connector->edid, &sadb);

	if (sad_count < 0) {

	if (sad_count <= 0) {

		DRM_ERROR("Couldn't read Speaker Allocation Data Block: %d\n", sad_count);

		return;

	}
@@ -173,7 +173,7 @@ static void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder) 
	}



	sad_count = drm_edid_to_sad(radeon_connector->edid, &sads);

	if (sad_count < 0) {

	if (sad_count <= 0) {

		DRM_ERROR("Couldn't read SADs: %d\n", sad_count);

		return;

	}

drivers/gpu/drm/radeon/ni.c

+16 −4
Original line number Diff line number Diff line
@@ -895,6 +895,10 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
		    (rdev->pdev->device == 0x999C)) {

			rdev->config.cayman.max_simds_per_se = 6;

			rdev->config.cayman.max_backends_per_se = 2;

			rdev->config.cayman.max_hw_contexts = 8;

			rdev->config.cayman.sx_max_export_size = 256;

			rdev->config.cayman.sx_max_export_pos_size = 64;

			rdev->config.cayman.sx_max_export_smx_size = 192;

		} else if ((rdev->pdev->device == 0x9903) ||

			   (rdev->pdev->device == 0x9904) ||

			   (rdev->pdev->device == 0x990A) ||
@@ -905,6 +909,10 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
			   (rdev->pdev->device == 0x999D)) {

			rdev->config.cayman.max_simds_per_se = 4;

			rdev->config.cayman.max_backends_per_se = 2;

			rdev->config.cayman.max_hw_contexts = 8;

			rdev->config.cayman.sx_max_export_size = 256;

			rdev->config.cayman.sx_max_export_pos_size = 64;

			rdev->config.cayman.sx_max_export_smx_size = 192;

		} else if ((rdev->pdev->device == 0x9919) ||

			   (rdev->pdev->device == 0x9990) ||

			   (rdev->pdev->device == 0x9991) ||
@@ -915,9 +923,17 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
			   (rdev->pdev->device == 0x99A0)) {

			rdev->config.cayman.max_simds_per_se = 3;

			rdev->config.cayman.max_backends_per_se = 1;

			rdev->config.cayman.max_hw_contexts = 4;

			rdev->config.cayman.sx_max_export_size = 128;

			rdev->config.cayman.sx_max_export_pos_size = 32;

			rdev->config.cayman.sx_max_export_smx_size = 96;

		} else {

			rdev->config.cayman.max_simds_per_se = 2;

			rdev->config.cayman.max_backends_per_se = 1;

			rdev->config.cayman.max_hw_contexts = 4;

			rdev->config.cayman.sx_max_export_size = 128;

			rdev->config.cayman.sx_max_export_pos_size = 32;

			rdev->config.cayman.sx_max_export_smx_size = 96;

		}

		rdev->config.cayman.max_texture_channel_caches = 2;

		rdev->config.cayman.max_gprs = 256;
@@ -925,10 +941,6 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
		rdev->config.cayman.max_gs_threads = 32;

		rdev->config.cayman.max_stack_entries = 512;

		rdev->config.cayman.sx_num_of_sets = 8;

		rdev->config.cayman.sx_max_export_size = 256;

		rdev->config.cayman.sx_max_export_pos_size = 64;

		rdev->config.cayman.sx_max_export_smx_size = 192;

		rdev->config.cayman.max_hw_contexts = 8;

		rdev->config.cayman.sq_num_cf_insts = 2;



		rdev->config.cayman.sc_prim_fifo_size = 0x40;

drivers/gpu/drm/radeon/rv770_dpm.c

+6 −0
Original line number Diff line number Diff line
@@ -2328,6 +2328,12 @@ void rv770_get_engine_memory_ss(struct radeon_device *rdev) 
	pi->mclk_ss = radeon_atombios_get_asic_ss_info(rdev, &ss,

						       ASIC_INTERNAL_MEMORY_SS, 0);



	/* disable ss, causes hangs on some cayman boards */

	if (rdev->family == CHIP_CAYMAN) {

		pi->sclk_ss = false;

		pi->mclk_ss = false;

	}



	if (pi->sclk_ss || pi->mclk_ss)

		pi->dynamic_ss = true;

	else