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

Commit e5903d39 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix init ordering for r600+ 



The vram scratch buffer needs to be initialized
before the mc is programmed otherwise we program
0 as the GPU address of the default GPU fault
page.  In most cases we put vram at zero anyway and
reserve a page for the legacy vga buffer so in practice
this shouldn't cause any problems, but better to make
it correct.

Was changed in:
6fab3feb

Reported-by: default avatarFrankR Huang <FrankR.Huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent f30df435

drivers/gpu/drm/radeon/cik.c

+5 −4
Original line number Diff line number Diff line
@@ -6951,6 +6951,11 @@ static int cik_startup(struct radeon_device *rdev) 
	/* enable aspm */

	cik_program_aspm(rdev);



	/* scratch needs to be initialized before MC */

	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	cik_mc_program(rdev);



	if (rdev->flags & RADEON_IS_IGP) {
@@ -6980,10 +6985,6 @@ static int cik_startup(struct radeon_device *rdev) 
		}

	}



	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	r = cik_pcie_gart_enable(rdev);

	if (r)

		return r;

drivers/gpu/drm/radeon/evergreen.c

+5 −4
Original line number Diff line number Diff line
@@ -5053,6 +5053,11 @@ static int evergreen_startup(struct radeon_device *rdev) 
	/* enable aspm */

	evergreen_program_aspm(rdev);



	/* scratch needs to be initialized before MC */

	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	evergreen_mc_program(rdev);



	if (ASIC_IS_DCE5(rdev)) {
@@ -5078,10 +5083,6 @@ static int evergreen_startup(struct radeon_device *rdev) 
		}

	}



	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	if (rdev->flags & RADEON_IS_AGP) {

		evergreen_agp_enable(rdev);

	} else {

drivers/gpu/drm/radeon/ni.c

+5 −4
Original line number Diff line number Diff line
@@ -1863,6 +1863,11 @@ static int cayman_startup(struct radeon_device *rdev) 
	/* enable aspm */

	evergreen_program_aspm(rdev);



	/* scratch needs to be initialized before MC */

	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	evergreen_mc_program(rdev);



	if (rdev->flags & RADEON_IS_IGP) {
@@ -1889,10 +1894,6 @@ static int cayman_startup(struct radeon_device *rdev) 
		}

	}



	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	r = cayman_pcie_gart_enable(rdev);

	if (r)

		return r;

drivers/gpu/drm/radeon/r600.c

+5 −4
Original line number Diff line number Diff line
@@ -2698,6 +2698,11 @@ static int r600_startup(struct radeon_device *rdev) 
	/* enable pcie gen2 link */

	r600_pcie_gen2_enable(rdev);



	/* scratch needs to be initialized before MC */

	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	r600_mc_program(rdev);



	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
@@ -2708,10 +2713,6 @@ static int r600_startup(struct radeon_device *rdev) 
		}

	}



	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	if (rdev->flags & RADEON_IS_AGP) {

		r600_agp_enable(rdev);

	} else {

drivers/gpu/drm/radeon/rv770.c

+5 −4
Original line number Diff line number Diff line
@@ -1658,6 +1658,11 @@ static int rv770_startup(struct radeon_device *rdev) 
	/* enable pcie gen2 link */

	rv770_pcie_gen2_enable(rdev);



	/* scratch needs to be initialized before MC */

	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	rv770_mc_program(rdev);



	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
@@ -1668,10 +1673,6 @@ static int rv770_startup(struct radeon_device *rdev) 
		}

	}



	r = r600_vram_scratch_init(rdev);

	if (r)

		return r;



	if (rdev->flags & RADEON_IS_AGP) {

		rv770_agp_enable(rdev);

	} else {