Commit 5153550a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: don't touch DCE or VGA regs on Hainan (v3) 



Hainan has no display hardware:
- no DCE (crtc, uniphy, dac, etc.)
- no VGA

v2: fix bios fetch
v3: fix interrupts

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent 8b02859d

drivers/gpu/drm/radeon/evergreen.c

+17 −10
Original line number Diff line number Diff line
@@ -2343,11 +2343,13 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *sav 
	u32 crtc_enabled, tmp, frame_count, blackout;

	int i, j;



	if (!ASIC_IS_NODCE(rdev)) {

		save->vga_render_control = RREG32(VGA_RENDER_CONTROL);

		save->vga_hdp_control = RREG32(VGA_HDP_CONTROL);



		/* disable VGA render */

		WREG32(VGA_RENDER_CONTROL, 0);

	}

	/* blank the display controllers */

	for (i = 0; i < rdev->num_crtc; i++) {

		crtc_enabled = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]) & EVERGREEN_CRTC_MASTER_EN;
@@ -2438,8 +2440,11 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s 
		WREG32(EVERGREEN_GRPH_SECONDARY_SURFACE_ADDRESS + crtc_offsets[i],

		       (u32)rdev->mc.vram_start);

	}



	if (!ASIC_IS_NODCE(rdev)) {

		WREG32(EVERGREEN_VGA_MEMORY_BASE_ADDRESS_HIGH, upper_32_bits(rdev->mc.vram_start));

		WREG32(EVERGREEN_VGA_MEMORY_BASE_ADDRESS, (u32)rdev->mc.vram_start);

	}



	/* unlock regs and wait for update */

	for (i = 0; i < rdev->num_crtc; i++) {
@@ -2499,11 +2504,13 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s 
			}

		}

	}

	if (!ASIC_IS_NODCE(rdev)) {

		/* Unlock vga access */

		WREG32(VGA_HDP_CONTROL, save->vga_hdp_control);

		mdelay(1);

		WREG32(VGA_RENDER_CONTROL, save->vga_render_control);

	}

}



void evergreen_mc_program(struct radeon_device *rdev)

{

drivers/gpu/drm/radeon/radeon_bios.c

+16 −12
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static bool ni_read_disabled_bios(struct radeon_device *rdev) 


	/* enable the rom */

	WREG32(R600_BUS_CNTL, (bus_cntl & ~R600_BIOS_ROM_DIS));

	if (!ASIC_IS_NODCE(rdev)) {

		/* Disable VGA mode */

		WREG32(AVIVO_D1VGA_CONTROL,

		       (d1vga_control & ~(AVIVO_DVGA_CONTROL_MODE_ENABLE |
@@ -230,15 +231,18 @@ static bool ni_read_disabled_bios(struct radeon_device *rdev) 
					  AVIVO_DVGA_CONTROL_TIMING_SELECT)));

		WREG32(AVIVO_VGA_RENDER_CONTROL,

		       (vga_render_control & ~AVIVO_VGA_VSTATUS_CNTL_MASK));

	}

	WREG32(R600_ROM_CNTL, rom_cntl | R600_SCK_OVERWRITE);



	r = radeon_read_bios(rdev);



	/* restore regs */

	WREG32(R600_BUS_CNTL, bus_cntl);

	if (!ASIC_IS_NODCE(rdev)) {

		WREG32(AVIVO_D1VGA_CONTROL, d1vga_control);

		WREG32(AVIVO_D2VGA_CONTROL, d2vga_control);

		WREG32(AVIVO_VGA_RENDER_CONTROL, vga_render_control);

	}

	WREG32(R600_ROM_CNTL, rom_cntl);

	return r;

}

drivers/gpu/drm/radeon/si.c

+59 −40
Original line number Diff line number Diff line
@@ -3322,6 +3322,7 @@ static void si_mc_program(struct radeon_device *rdev) 
	if (radeon_mc_wait_for_idle(rdev)) {

		dev_warn(rdev->dev, "Wait for MC idle timedout !\n");

	}

	if (!ASIC_IS_NODCE(rdev))

		/* Lockout access through VGA aperture*/

		WREG32(VGA_HDP_CONTROL, VGA_MEMORY_DISABLE);

	/* Update configuration */
@@ -3345,10 +3346,12 @@ static void si_mc_program(struct radeon_device *rdev) 
		dev_warn(rdev->dev, "Wait for MC idle timedout !\n");

	}

	evergreen_mc_resume(rdev, &save);

	if (!ASIC_IS_NODCE(rdev)) {

		/* we need to own VRAM, so turn off the VGA renderer here

		 * to stop it overwriting our objects */

		rv515_vga_render_disable(rdev);

	}

}



static void si_vram_gtt_location(struct radeon_device *rdev,

				 struct radeon_mc *mc)
@@ -4269,8 +4272,10 @@ static void si_disable_interrupt_state(struct radeon_device *rdev) 
	tmp = RREG32(DMA_CNTL + DMA1_REGISTER_OFFSET) & ~TRAP_ENABLE;

	WREG32(DMA_CNTL + DMA1_REGISTER_OFFSET, tmp);

	WREG32(GRBM_INT_CNTL, 0);

	if (rdev->num_crtc >= 2) {

		WREG32(INT_MASK + EVERGREEN_CRTC0_REGISTER_OFFSET, 0);

		WREG32(INT_MASK + EVERGREEN_CRTC1_REGISTER_OFFSET, 0);

	}

	if (rdev->num_crtc >= 4) {

		WREG32(INT_MASK + EVERGREEN_CRTC2_REGISTER_OFFSET, 0);

		WREG32(INT_MASK + EVERGREEN_CRTC3_REGISTER_OFFSET, 0);
@@ -4280,8 +4285,10 @@ static void si_disable_interrupt_state(struct radeon_device *rdev) 
		WREG32(INT_MASK + EVERGREEN_CRTC5_REGISTER_OFFSET, 0);

	}



	if (rdev->num_crtc >= 2) {

		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, 0);

		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, 0);

	}

	if (rdev->num_crtc >= 4) {

		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, 0);

		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, 0);
@@ -4291,6 +4298,7 @@ static void si_disable_interrupt_state(struct radeon_device *rdev) 
		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, 0);

	}



	if (!ASIC_IS_NODCE(rdev)) {

		WREG32(DACA_AUTODETECT_INT_CONTROL, 0);



		tmp = RREG32(DC_HPD1_INT_CONTROL) & DC_HPDx_INT_POLARITY;
@@ -4305,7 +4313,7 @@ static void si_disable_interrupt_state(struct radeon_device *rdev) 
		WREG32(DC_HPD5_INT_CONTROL, tmp);

		tmp = RREG32(DC_HPD6_INT_CONTROL) & DC_HPDx_INT_POLARITY;

		WREG32(DC_HPD6_INT_CONTROL, tmp);



	}

}



static int si_irq_init(struct radeon_device *rdev)
@@ -4384,7 +4392,7 @@ int si_irq_set(struct radeon_device *rdev) 
	u32 cp_int_cntl = CNTX_BUSY_INT_ENABLE | CNTX_EMPTY_INT_ENABLE;

	u32 cp_int_cntl1 = 0, cp_int_cntl2 = 0;

	u32 crtc1 = 0, crtc2 = 0, crtc3 = 0, crtc4 = 0, crtc5 = 0, crtc6 = 0;

	u32 hpd1, hpd2, hpd3, hpd4, hpd5, hpd6;

	u32 hpd1 = 0, hpd2 = 0, hpd3 = 0, hpd4 = 0, hpd5 = 0, hpd6 = 0;

	u32 grbm_int_cntl = 0;

	u32 grph1 = 0, grph2 = 0, grph3 = 0, grph4 = 0, grph5 = 0, grph6 = 0;

	u32 dma_cntl, dma_cntl1;
@@ -4401,12 +4409,14 @@ int si_irq_set(struct radeon_device *rdev) 
		return 0;

	}



	if (!ASIC_IS_NODCE(rdev)) {

		hpd1 = RREG32(DC_HPD1_INT_CONTROL) & ~DC_HPDx_INT_EN;

		hpd2 = RREG32(DC_HPD2_INT_CONTROL) & ~DC_HPDx_INT_EN;

		hpd3 = RREG32(DC_HPD3_INT_CONTROL) & ~DC_HPDx_INT_EN;

		hpd4 = RREG32(DC_HPD4_INT_CONTROL) & ~DC_HPDx_INT_EN;

		hpd5 = RREG32(DC_HPD5_INT_CONTROL) & ~DC_HPDx_INT_EN;

		hpd6 = RREG32(DC_HPD6_INT_CONTROL) & ~DC_HPDx_INT_EN;

	}



	dma_cntl = RREG32(DMA_CNTL + DMA0_REGISTER_OFFSET) & ~TRAP_ENABLE;

	dma_cntl1 = RREG32(DMA_CNTL + DMA1_REGISTER_OFFSET) & ~TRAP_ENABLE;
@@ -4497,8 +4507,10 @@ int si_irq_set(struct radeon_device *rdev) 


	WREG32(GRBM_INT_CNTL, grbm_int_cntl);



	if (rdev->num_crtc >= 2) {

		WREG32(INT_MASK + EVERGREEN_CRTC0_REGISTER_OFFSET, crtc1);

		WREG32(INT_MASK + EVERGREEN_CRTC1_REGISTER_OFFSET, crtc2);

	}

	if (rdev->num_crtc >= 4) {

		WREG32(INT_MASK + EVERGREEN_CRTC2_REGISTER_OFFSET, crtc3);

		WREG32(INT_MASK + EVERGREEN_CRTC3_REGISTER_OFFSET, crtc4);
@@ -4508,8 +4520,10 @@ int si_irq_set(struct radeon_device *rdev) 
		WREG32(INT_MASK + EVERGREEN_CRTC5_REGISTER_OFFSET, crtc6);

	}



	if (rdev->num_crtc >= 2) {

		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET, grph1);

		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET, grph2);

	}

	if (rdev->num_crtc >= 4) {

		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET, grph3);

		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET, grph4);
@@ -4519,12 +4533,14 @@ int si_irq_set(struct radeon_device *rdev) 
		WREG32(GRPH_INT_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET, grph6);

	}



	if (!ASIC_IS_NODCE(rdev)) {

		WREG32(DC_HPD1_INT_CONTROL, hpd1);

		WREG32(DC_HPD2_INT_CONTROL, hpd2);

		WREG32(DC_HPD3_INT_CONTROL, hpd3);

		WREG32(DC_HPD4_INT_CONTROL, hpd4);

		WREG32(DC_HPD5_INT_CONTROL, hpd5);

		WREG32(DC_HPD6_INT_CONTROL, hpd6);

	}



	return 0;

}
@@ -4533,6 +4549,9 @@ static inline void si_irq_ack(struct radeon_device *rdev) 
{

	u32 tmp;



	if (ASIC_IS_NODCE(rdev))

		return;



	rdev->irq.stat_regs.evergreen.disp_int = RREG32(DISP_INTERRUPT_STATUS);

	rdev->irq.stat_regs.evergreen.disp_int_cont = RREG32(DISP_INTERRUPT_STATUS_CONTINUE);

	rdev->irq.stat_regs.evergreen.disp_int_cont2 = RREG32(DISP_INTERRUPT_STATUS_CONTINUE2);