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

Commit 6fab3feb authored Aug 04, 2013 by Alex Deucher

drm/radeon: always program the MC on startup



For r6xx+ asics.  This mirrors the behavior of pre-r6xx
asics.  We need to program the MC even if something
else in startup() fails.  Failure to do so results in
an unusable GPU.

Based on a fix from: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

parent 1518dd8e

drivers/gpu/drm/radeon/cik.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -5954,6 +5954,8 @@ static int cik_startup(struct radeon_device *rdev)
		struct radeon_ring *ring;
		int r;

		cik_mc_program(rdev);

		if (rdev->flags & RADEON_IS_IGP) {
		if (!rdev->me_fw \|\| !rdev->pfp_fw \|\| !rdev->ce_fw \|\|
		!rdev->mec_fw \|\| !rdev->sdma_fw \|\| !rdev->rlc_fw) {
		@@ -5985,7 +5987,6 @@ static int cik_startup(struct radeon_device *rdev)
		if (r)
		return r;

		cik_mc_program(rdev);
		r = cik_pcie_gart_enable(rdev);
		if (r)
		return r;

drivers/gpu/drm/radeon/evergreen.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -5106,6 +5106,8 @@ static int evergreen_startup(struct radeon_device *rdev)
		/* enable aspm */
		evergreen_program_aspm(rdev);

		evergreen_mc_program(rdev);

		if (ASIC_IS_DCE5(rdev)) {
		if (!rdev->me_fw \|\| !rdev->pfp_fw \|\| !rdev->rlc_fw \|\| !rdev->mc_fw) {
		r = ni_init_microcode(rdev);
		@@ -5133,7 +5135,6 @@ static int evergreen_startup(struct radeon_device *rdev)
		if (r)
		return r;

		evergreen_mc_program(rdev);
		if (rdev->flags & RADEON_IS_AGP) {
		evergreen_agp_enable(rdev);
		} else {

drivers/gpu/drm/radeon/ni.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2079,6 +2079,8 @@ static int cayman_startup(struct radeon_device *rdev)
		/* enable aspm */
		evergreen_program_aspm(rdev);

		evergreen_mc_program(rdev);

		if (rdev->flags & RADEON_IS_IGP) {
		if (!rdev->me_fw \|\| !rdev->pfp_fw \|\| !rdev->rlc_fw) {
		r = ni_init_microcode(rdev);
		@@ -2107,7 +2109,6 @@ static int cayman_startup(struct radeon_device *rdev)
		if (r)
		return r;

		evergreen_mc_program(rdev);
		r = cayman_pcie_gart_enable(rdev);
		if (r)
		return r;

drivers/gpu/drm/radeon/r600.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3330,6 +3330,8 @@ static int r600_startup(struct radeon_device *rdev)
		/* enable pcie gen2 link */
		r600_pcie_gen2_enable(rdev);

		r600_mc_program(rdev);

		if (!rdev->me_fw \|\| !rdev->pfp_fw \|\| !rdev->rlc_fw) {
		r = r600_init_microcode(rdev);
		if (r) {
		@@ -3342,7 +3344,6 @@ static int r600_startup(struct radeon_device *rdev)
		if (r)
		return r;

		r600_mc_program(rdev);
		if (rdev->flags & RADEON_IS_AGP) {
		r600_agp_enable(rdev);
		} else {

drivers/gpu/drm/radeon/rv770.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1829,6 +1829,8 @@ static int rv770_startup(struct radeon_device *rdev)
		/* enable pcie gen2 link */
		rv770_pcie_gen2_enable(rdev);

		rv770_mc_program(rdev);

		if (!rdev->me_fw \|\| !rdev->pfp_fw \|\| !rdev->rlc_fw) {
		r = r600_init_microcode(rdev);
		if (r) {
		@@ -1841,7 +1843,6 @@ static int rv770_startup(struct radeon_device *rdev)
		if (r)
		return r;

		rv770_mc_program(rdev);
		if (rdev->flags & RADEON_IS_AGP) {
		rv770_agp_enable(rdev);
		} else {