Commit 01ac8794 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: re-order firmware loading in preparation for dpm rework 



We need to reorder the driver init sequence to better accomodate
dpm which needs to be loaded earlier in the init sequence.  Move
fw init up so that it's available for dpm init.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f2185ece

drivers/gpu/drm/radeon/cik.c

+22 −20
Original line number Diff line number Diff line
@@ -7501,26 +7501,7 @@ static int cik_startup(struct radeon_device *rdev) 


	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) {

			r = cik_init_microcode(rdev);

			if (r) {

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

				return r;

			}

		}

	} else {

		if (!rdev->me_fw || !rdev->pfp_fw || !rdev->ce_fw ||

		    !rdev->mec_fw || !rdev->sdma_fw || !rdev->rlc_fw ||

		    !rdev->mc_fw) {

			r = cik_init_microcode(rdev);

			if (r) {

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

				return r;

			}

		}



	if (!(rdev->flags & RADEON_IS_IGP)) {

		r = ci_mc_load_microcode(rdev);

		if (r) {

			DRM_ERROR("Failed to load MC firmware!\n");
@@ -7833,6 +7814,27 @@ int cik_init(struct radeon_device *rdev) 
	if (r)

		return r;



	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) {

			r = cik_init_microcode(rdev);

			if (r) {

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

				return r;

			}

		}

	} else {

		if (!rdev->me_fw || !rdev->pfp_fw || !rdev->ce_fw ||

		    !rdev->mec_fw || !rdev->sdma_fw || !rdev->rlc_fw ||

		    !rdev->mc_fw) {

			r = cik_init_microcode(rdev);

			if (r) {

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

				return r;

			}

		}

	}



	ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

	ring->ring_obj = NULL;

	r600_ring_init(rdev, ring, 1024 * 1024);

drivers/gpu/drm/radeon/evergreen.c

+18 −15
Original line number Diff line number Diff line
@@ -5110,26 +5110,11 @@ static int evergreen_startup(struct radeon_device *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);

			if (r) {

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

				return r;

			}

		}

		r = ni_mc_load_microcode(rdev);

		if (r) {

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

			return r;

		}

	} else {

		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;

			}

		}

	}



	if (rdev->flags & RADEON_IS_AGP) {
@@ -5357,6 +5342,24 @@ int evergreen_init(struct radeon_device *rdev) 
	if (r)

		return r;



	if (ASIC_IS_DCE5(rdev)) {

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

			r = ni_init_microcode(rdev);

			if (r) {

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

				return r;

			}

		}

	} else {

		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;

			}

		}

	}



	rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;

	r600_ring_init(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1024);

drivers/gpu/drm/radeon/ni.c

+19 −17
Original line number Diff line number Diff line
@@ -1866,23 +1866,7 @@ static int cayman_startup(struct radeon_device *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);

			if (r) {

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

				return r;

			}

		}

	} else {

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

			r = ni_init_microcode(rdev);

			if (r) {

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

				return r;

			}

		}



	if (!(rdev->flags & RADEON_IS_IGP)) {

		r = ni_mc_load_microcode(rdev);

		if (r) {

			DRM_ERROR("Failed to load MC firmware!\n");
@@ -2133,6 +2117,24 @@ int cayman_init(struct radeon_device *rdev) 
	if (r)

		return r;



	if (rdev->flags & RADEON_IS_IGP) {

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

			r = ni_init_microcode(rdev);

			if (r) {

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

				return r;

			}

		}

	} else {

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

			r = ni_init_microcode(rdev);

			if (r) {

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

				return r;

			}

		}

	}



	ring->ring_obj = NULL;

	r600_ring_init(rdev, ring, 1024 * 1024);

drivers/gpu/drm/radeon/r600.c

+8 −8
Original line number Diff line number Diff line
@@ -2775,14 +2775,6 @@ static int r600_startup(struct radeon_device *rdev) 


	r600_mc_program(rdev);



	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;

		}

	}



	if (rdev->flags & RADEON_IS_AGP) {

		r600_agp_enable(rdev);

	} else {
@@ -2970,6 +2962,14 @@ int r600_init(struct radeon_device *rdev) 
	if (r)

		return 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;

		}

	}



	rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;

	r600_ring_init(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1024);

drivers/gpu/drm/radeon/rv770.c

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


	rv770_mc_program(rdev);



	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;

		}

	}



	if (rdev->flags & RADEON_IS_AGP) {

		rv770_agp_enable(rdev);

	} else {
@@ -1876,6 +1868,14 @@ int rv770_init(struct radeon_device *rdev) 
	if (r)

		return 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;

		}

	}



	rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ring_obj = NULL;

	r600_ring_init(rdev, &rdev->ring[RADEON_RING_TYPE_GFX_INDEX], 1024 * 1024);