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

Commit a3f69026 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-next 

Minor bug fixes.

* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dce2: use 10khz units for audio dto calculation
  drm/radeon: Fix VRAM size calculation for VRAM >= 4GB
  drm/radeon: Remove superfluous variable
parents b7cb1c50 731da21b

drivers/gpu/drm/radeon/atombios_crtc.c

+0 −6
Original line number Diff line number Diff line
@@ -1811,12 +1811,9 @@ static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc, 


static void atombios_crtc_prepare(struct drm_crtc *crtc)

{

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);

	struct drm_device *dev = crtc->dev;

	struct radeon_device *rdev = dev->dev_private;



	radeon_crtc->in_mode_set = true;



	/* disable crtc pair power gating before programming */

	if (ASIC_IS_DCE6(rdev))

		atombios_powergate_crtc(crtc, ATOM_DISABLE);
@@ -1827,11 +1824,8 @@ static void atombios_crtc_prepare(struct drm_crtc *crtc) 


static void atombios_crtc_commit(struct drm_crtc *crtc)

{

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);



	atombios_crtc_dpms(crtc, DRM_MODE_DPMS_ON);

	atombios_lock_crtc(crtc, ATOM_DISABLE);

	radeon_crtc->in_mode_set = false;

}



static void atombios_crtc_disable(struct drm_crtc *crtc)

drivers/gpu/drm/radeon/evergreen.c

+2 −2
Original line number Diff line number Diff line
@@ -3405,8 +3405,8 @@ int evergreen_mc_init(struct radeon_device *rdev) 
		rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);

	} else {

		/* size in MB on evergreen/cayman/tn */

		rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;

		rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;

		rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL;

		rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024ULL * 1024ULL;

	}

	rdev->mc.visible_vram_size = rdev->mc.aper_size;

	r700_vram_gtt_location(rdev, &rdev->mc);

drivers/gpu/drm/radeon/evergreen_hdmi.c

+3 −4
Original line number Diff line number Diff line
@@ -154,19 +154,18 @@ static void evergreen_audio_set_dto(struct drm_encoder *encoder, u32 clock) 
	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

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

	u32 base_rate = 48000;

	u32 base_rate = 24000;



	if (!dig || !dig->afmt)

		return;



	/* XXX: properly calculate this */

	/* XXX two dtos; generally use dto0 for hdmi */

	/* Express [24MHz / target pixel clock] as an exact rational

	 * number (coefficient of two integer numbers.  DCCG_AUDIO_DTOx_PHASE

	 * is the numerator, DCCG_AUDIO_DTOx_MODULE is the denominator

	 */

	WREG32(DCCG_AUDIO_DTO0_PHASE, (base_rate*50) & 0xffffff);

	WREG32(DCCG_AUDIO_DTO0_MODULE, (clock*100) & 0xffffff);

	WREG32(DCCG_AUDIO_DTO0_PHASE, base_rate * 100);

	WREG32(DCCG_AUDIO_DTO0_MODULE, clock * 100);

	WREG32(DCCG_AUDIO_DTO_SOURCE, DCCG_AUDIO_DTO0_SOURCE_SEL(radeon_crtc->crtc_id));

}

drivers/gpu/drm/radeon/r600_hdmi.c

+4 −5
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock) 
	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

	u32 base_rate = 48000;

	u32 base_rate = 24000;



	if (!dig || !dig->afmt)

		return;
@@ -240,7 +240,6 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock) 
	/* there are two DTOs selected by DCCG_AUDIO_DTO_SELECT.

	 * doesn't matter which one you use.  Just use the first one.

	 */

	/* XXX: properly calculate this */

	/* XXX two dtos; generally use dto0 for hdmi */

	/* Express [24MHz / target pixel clock] as an exact rational

	 * number (coefficient of two integer numbers.  DCCG_AUDIO_DTOx_PHASE
@@ -250,13 +249,13 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock) 
		/* according to the reg specs, this should DCE3.2 only, but in

		 * practice it seems to cover DCE3.0 as well.

		 */

		WREG32(DCCG_AUDIO_DTO0_PHASE, base_rate * 50);

		WREG32(DCCG_AUDIO_DTO0_PHASE, base_rate * 100);

		WREG32(DCCG_AUDIO_DTO0_MODULE, clock * 100);

		WREG32(DCCG_AUDIO_DTO_SELECT, 0); /* select DTO0 */

	} else {

		/* according to the reg specs, this should be DCE2.0 and DCE3.0 */

		WREG32(AUDIO_DTO, AUDIO_DTO_PHASE(base_rate * 50) |

		       AUDIO_DTO_MODULE(clock * 100));

		WREG32(AUDIO_DTO, AUDIO_DTO_PHASE(base_rate / 10) |

		       AUDIO_DTO_MODULE(clock / 10));

	}

}

drivers/gpu/drm/radeon/radeon_legacy_crtc.c

+0 −4
Original line number Diff line number Diff line
@@ -1031,11 +1031,9 @@ static int radeon_crtc_mode_set(struct drm_crtc *crtc, 


static void radeon_crtc_prepare(struct drm_crtc *crtc)

{

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);

	struct drm_device *dev = crtc->dev;

	struct drm_crtc *crtci;



	radeon_crtc->in_mode_set = true;

	/*

	* The hardware wedges sometimes if you reconfigure one CRTC

	* whilst another is running (see fdo bug #24611).
@@ -1046,7 +1044,6 @@ static void radeon_crtc_prepare(struct drm_crtc *crtc) 


static void radeon_crtc_commit(struct drm_crtc *crtc)

{

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);

	struct drm_device *dev = crtc->dev;

	struct drm_crtc *crtci;
@@ -1057,7 +1054,6 @@ static void radeon_crtc_commit(struct drm_crtc *crtc) 
		if (crtci->enabled)

			radeon_crtc_dpms(crtci, DRM_MODE_DPMS_ON);

	}

	radeon_crtc->in_mode_set = false;

}



static const struct drm_crtc_helper_funcs legacy_helper_funcs = {