Commit f80c43ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm radeon fixes from Dave Airlie:
 "This is just radeon fixes and a bunch of new PCI ids.  The fixes are
  for a deadlock, an audio regression, and a couple of audio fixes."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: add new SI PCI ids
  drm/radeon/kms: add new BTC PCI ids
  drm/radeon/kms: add new Palm, Sumo PCI ids
  drm/radeon/kms: add new Trinity PCI ids
  drm/radeon: fix vm deadlocks on cayman
  drm/radeon: fix gpu_init on si
  drm/radeon/hdmi: don't set SEND_MAX_PACKETS bit
  drm/radeon/audio: don't hardcode CRTC id
  drm/radeon: make audio_init consistent across asics
parents fffaee36 7aaa61b3

drivers/gpu/drm/radeon/ni.c

+17 −4
Original line number Original line Diff line number Diff line
@@ -460,15 +460,28 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
		rdev->config.cayman.max_pipes_per_simd = 4;

		rdev->config.cayman.max_pipes_per_simd = 4;

		rdev->config.cayman.max_tile_pipes = 2;

		rdev->config.cayman.max_tile_pipes = 2;

		if ((rdev->pdev->device == 0x9900) ||

		if ((rdev->pdev->device == 0x9900) ||

		    (rdev->pdev->device == 0x9901)) {

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

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

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

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

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

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

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

		    (rdev->pdev->device == 0x9917)) {

			rdev->config.cayman.max_simds_per_se = 6;

			rdev->config.cayman.max_simds_per_se = 6;

			rdev->config.cayman.max_backends_per_se = 2;

			rdev->config.cayman.max_backends_per_se = 2;

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

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

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

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

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

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

			   (rdev->pdev->device == 0x9918)) {

			rdev->config.cayman.max_simds_per_se = 4;

			rdev->config.cayman.max_simds_per_se = 4;

			rdev->config.cayman.max_backends_per_se = 2;

			rdev->config.cayman.max_backends_per_se = 2;

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

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

			   (rdev->pdev->device == 0x9991)) {

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

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

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

			   (rdev->pdev->device == 0x99A0)) {

			rdev->config.cayman.max_simds_per_se = 3;

			rdev->config.cayman.max_simds_per_se = 3;

			rdev->config.cayman.max_backends_per_se = 1;

			rdev->config.cayman.max_backends_per_se = 1;

		} else {

		} else {

drivers/gpu/drm/radeon/r600.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -2426,6 +2426,12 @@ int r600_startup(struct radeon_device *rdev) 
	if (r)

	if (r)

		return r;

		return r;





	r = r600_audio_init(rdev);

	if (r) {

		DRM_ERROR("radeon: audio init failed\n");

		return r;

	}



	return 0;

	return 0;

}

}
@@ -2462,12 +2468,6 @@ int r600_resume(struct radeon_device *rdev) 
		return r;

		return r;

	}

	}





	r = r600_audio_init(rdev);

	if (r) {

		DRM_ERROR("radeon: audio resume failed\n");

		return r;

	}



	return r;

	return r;

}

}
@@ -2577,9 +2577,6 @@ int r600_init(struct radeon_device *rdev) 
		rdev->accel_working = false;

		rdev->accel_working = false;

	}

	}





	r = r600_audio_init(rdev);

	if (r)

		return r; /* TODO error handling */

	return 0;

	return 0;

}

}

drivers/gpu/drm/radeon/r600_audio.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -192,6 +192,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) 
	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);

	int base_rate = 48000;

	int base_rate = 48000;





	switch (radeon_encoder->encoder_id) {

	switch (radeon_encoder->encoder_id) {
@@ -217,8 +218,8 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) 
		WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10);

		WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10);

		WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071);

		WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071);





		/* Some magic trigger or src sel? */

		/* Select DTO source */

		WREG32_P(0x5ac, 0x01, ~0x77);

		WREG32(0x5ac, radeon_crtc->crtc_id);

	} else {

	} else {

		switch (dig->dig_encoder) {

		switch (dig->dig_encoder) {

		case 0:

		case 0:

drivers/gpu/drm/radeon/r600_hdmi.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -348,7 +348,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod 
		WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset,

		WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset,

		       HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */

		       HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */

		       HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */

		       HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */

		       HDMI0_AUDIO_SEND_MAX_PACKETS | /* send NULL packets if no audio is available */

		       HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */

		       HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */

		       HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */

		       HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */

	}

	}

drivers/gpu/drm/radeon/radeon.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -1374,9 +1374,9 @@ struct cayman_asic { 




struct si_asic {

struct si_asic {

	unsigned max_shader_engines;

	unsigned max_shader_engines;

	unsigned max_pipes_per_simd;

	unsigned max_tile_pipes;

	unsigned max_tile_pipes;

	unsigned max_simds_per_se;

	unsigned max_cu_per_sh;

	unsigned max_sh_per_se;

	unsigned max_backends_per_se;

	unsigned max_backends_per_se;

	unsigned max_texture_channel_caches;

	unsigned max_texture_channel_caches;

	unsigned max_gprs;

	unsigned max_gprs;
@@ -1387,7 +1387,6 @@ struct si_asic { 
	unsigned sc_hiz_tile_fifo_size;

	unsigned sc_hiz_tile_fifo_size;

	unsigned sc_earlyz_tile_fifo_size;

	unsigned sc_earlyz_tile_fifo_size;





	unsigned num_shader_engines;

	unsigned num_tile_pipes;

	unsigned num_tile_pipes;

	unsigned num_backends_per_se;

	unsigned num_backends_per_se;

	unsigned backend_disable_mask_per_asic;

	unsigned backend_disable_mask_per_asic;

CRA Git | Maintained and supported by SUSTech CRA and CCSE