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

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

drm/radeon/kms: remove duplicate card_posted() functions 



Use the common one for all asics.

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

drivers/gpu/drm/radeon/evergreen.c

+1 −26
Original line number Diff line number Diff line
@@ -3002,31 +3002,6 @@ int evergreen_copy_blit(struct radeon_device *rdev, 
	return 0;

}



static bool evergreen_card_posted(struct radeon_device *rdev)

{

	u32 reg;



	/* first check CRTCs */

	if (rdev->flags & RADEON_IS_IGP)

		reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) |

			RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET);

	else

		reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) |

			RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET) |

			RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET) |

			RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET) |

			RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET) |

			RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET);

	if (reg & EVERGREEN_CRTC_MASTER_EN)

		return true;



	/* then check MEM_SIZE, in case the crtcs are off */

	if (RREG32(CONFIG_MEMSIZE))

		return true;



	return false;

}



/* Plan is to move initialization in that function and use

 * helper function so that radeon_device_init pretty much

 * do nothing more than calling asic specific function. This
@@ -3063,7 +3038,7 @@ int evergreen_init(struct radeon_device *rdev) 
	if (radeon_asic_reset(rdev))

		dev_warn(rdev->dev, "GPU reset failed !\n");

	/* Post card if necessary */

	if (!evergreen_card_posted(rdev)) {

	if (!radeon_card_posted(rdev)) {

		if (!rdev->bios) {

			dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");

			return -EINVAL;

drivers/gpu/drm/radeon/r600.c

+1 −19
Original line number Diff line number Diff line
@@ -2358,24 +2358,6 @@ void r600_clear_surface_reg(struct radeon_device *rdev, int reg) 
	/* FIXME: implement */

}





bool r600_card_posted(struct radeon_device *rdev)

{

	uint32_t reg;



	/* first check CRTCs */

	reg = RREG32(D1CRTC_CONTROL) |

		RREG32(D2CRTC_CONTROL);

	if (reg & CRTC_EN)

		return true;



	/* then check MEM_SIZE, in case the crtcs are off */

	if (RREG32(CONFIG_MEMSIZE))

		return true;



	return false;

}



int r600_startup(struct radeon_device *rdev)

{

	int r;
@@ -2536,7 +2518,7 @@ int r600_init(struct radeon_device *rdev) 
	if (r)

		return r;

	/* Post card if necessary */

	if (!r600_card_posted(rdev)) {

	if (!radeon_card_posted(rdev)) {

		if (!rdev->bios) {

			dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");

			return -EINVAL;

drivers/gpu/drm/radeon/rv770.c

+1 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ int rv770_init(struct radeon_device *rdev) 
	if (r)

		return r;

	/* Post card if necessary */

	if (!r600_card_posted(rdev)) {

	if (!radeon_card_posted(rdev)) {

		if (!rdev->bios) {

			dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");

			return -EINVAL;