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

Commit 2dea2e29 authored by John Kacur's avatar John Kacur Committed by Dave Airlie
Browse files

drm/kms/radeon/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info 



First call drm_agp_acquire to check if agp has been acquired.
Second call drm_agp_info to fill in the info data struct, including aper_size.
Finally do the check to see if the aper_size makes sense.

Signed-off-by: default avatarJohn Kacur <jkacur@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent cdb6e375

drivers/gpu/drm/radeon/radeon_agp.c

+8 −7
Original line number Diff line number Diff line
@@ -133,13 +133,6 @@ int radeon_agp_init(struct radeon_device *rdev) 
	bool is_v3;

	int ret;



	if (rdev->ddev->agp->agp_info.aper_size < 32) {

		dev_warn(rdev->dev, "AGP aperture too small (%zuM) "

			"need at least 32M, disabling AGP\n",

			rdev->ddev->agp->agp_info.aper_size);

		return -EINVAL;

	}



	/* Acquire AGP. */

	if (!rdev->ddev->agp->acquired) {

		ret = drm_agp_acquire(rdev->ddev);
@@ -154,6 +147,14 @@ int radeon_agp_init(struct radeon_device *rdev) 
		DRM_ERROR("Unable to get AGP info: %d\n", ret);

		return ret;

	}



	if (rdev->ddev->agp->agp_info.aper_size < 32) {

		dev_warn(rdev->dev, "AGP aperture too small (%zuM) "

			"need at least 32M, disabling AGP\n",

			rdev->ddev->agp->agp_info.aper_size);

		return -EINVAL;

	}



	mode.mode = info.mode;

	agp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode;

	is_v3 = !!(agp_status & RADEON_AGPv3_MODE);