Commit 779720a3 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms/r600/r700: fallback gracefully on ucode failure 



Sent the wrong patch earlier.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7cb7d1d7

drivers/gpu/drm/radeon/r600.c

+12 −12
Original line number Diff line number Diff line
@@ -1845,6 +1845,14 @@ int r600_startup(struct radeon_device *rdev) 
{

	int r;



	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {

		r = r600_init_microcode(rdev);

		if (r) {

			DRM_ERROR("Failed to load firmware!\n");

			return r;

		}

	}



	r600_mc_program(rdev);

	if (rdev->flags & RADEON_IS_AGP) {

		r600_agp_enable(rdev);
@@ -2026,25 +2034,17 @@ int r600_init(struct radeon_device *rdev) 
	rdev->ih.ring_obj = NULL;

	r600_ih_ring_init(rdev, 64 * 1024);



	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {

		r = r600_init_microcode(rdev);

		if (r) {

			DRM_ERROR("Failed to load firmware!\n");

			return r;

		}

	}



	r = r600_pcie_gart_init(rdev);

	if (r)

		return r;



	rdev->accel_working = true;

	r = r600_blit_init(rdev);

	if (r) {

		DRM_ERROR("radeon: failled blitter (%d).\n", r);

		DRM_ERROR("radeon: failed blitter (%d).\n", r);

		return r;

	}



	rdev->accel_working = true;

	r = r600_startup(rdev);

	if (r) {

		r600_suspend(rdev);
@@ -2056,12 +2056,12 @@ int r600_init(struct radeon_device *rdev) 
	if (rdev->accel_working) {

		r = radeon_ib_pool_init(rdev);

		if (r) {

			DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);

			DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);

			rdev->accel_working = false;

		}

		r = r600_ib_test(rdev);

		if (r) {

			DRM_ERROR("radeon: failled testing IB (%d).\n", r);

			DRM_ERROR("radeon: failed testing IB (%d).\n", r);

			rdev->accel_working = false;

		}

	}

drivers/gpu/drm/radeon/rv770.c

+13 −13
Original line number Diff line number Diff line
@@ -874,6 +874,14 @@ static int rv770_startup(struct radeon_device *rdev) 
{

	int r;



	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {

		r = r600_init_microcode(rdev);

		if (r) {

			DRM_ERROR("Failed to load firmware!\n");

			return r;

		}

	}



	rv770_mc_program(rdev);

	if (rdev->flags & RADEON_IS_AGP) {

		rv770_agp_enable(rdev);
@@ -1039,25 +1047,17 @@ int rv770_init(struct radeon_device *rdev) 
	rdev->ih.ring_obj = NULL;

	r600_ih_ring_init(rdev, 64 * 1024);



	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {

		r = r600_init_microcode(rdev);

		if (r) {

			DRM_ERROR("Failed to load firmware!\n");

			return r;

		}

	}



	r = r600_pcie_gart_init(rdev);

	if (r)

		return r;



	rdev->accel_working = true;

	r = r600_blit_init(rdev);

	if (r) {

		DRM_ERROR("radeon: failled blitter (%d).\n", r);

		rdev->accel_working = false;

		DRM_ERROR("radeon: failed blitter (%d).\n", r);

		return r;

	}



	rdev->accel_working = true;

	r = rv770_startup(rdev);

	if (r) {

		rv770_suspend(rdev);
@@ -1069,12 +1069,12 @@ int rv770_init(struct radeon_device *rdev) 
	if (rdev->accel_working) {

		r = radeon_ib_pool_init(rdev);

		if (r) {

			DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);

			DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);

			rdev->accel_working = false;

		}

		r = r600_ib_test(rdev);

		if (r) {

			DRM_ERROR("radeon: failled testing IB (%d).\n", r);

			DRM_ERROR("radeon: failed testing IB (%d).\n", r);

			rdev->accel_working = false;

		}

	}