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

Commit 700a0cc0 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: Use radeon_agp_disable when disabling AGP 



Use same common function to disable agp so we replace the GART
callback by the proper one when we do so. This fix oops if
radeon_agp_init report failure.

This patch also move radeon_agp_init out of *_mc_init for r600
& rv770 so that we can have a similar behavior than for previous
hw, ie if agp_init fails it will fallback to GPU GART and disable
AGP.

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0a3f3163

drivers/gpu/drm/radeon/r100.c

+1 −3
Original line number Diff line number Diff line
@@ -3399,9 +3399,7 @@ int r100_mc_init(struct radeon_device *rdev) 
	if (rdev->flags & RADEON_IS_AGP) {

		r = radeon_agp_init(rdev);

		if (r) {

			printk(KERN_WARNING "[drm] Disabling AGP\n");

			rdev->flags &= ~RADEON_IS_AGP;

			rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;

			radeon_agp_disable(rdev);

		} else {

			rdev->mc.gtt_location = rdev->mc.agp_base;

		}

drivers/gpu/drm/radeon/r420.c

+1 −3
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ int r420_mc_init(struct radeon_device *rdev) 
	if (rdev->flags & RADEON_IS_AGP) {

		r = radeon_agp_init(rdev);

		if (r) {

			printk(KERN_WARNING "[drm] Disabling AGP\n");

			rdev->flags &= ~RADEON_IS_AGP;

			rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;

			radeon_agp_disable(rdev);

		} else {

			rdev->mc.gtt_location = rdev->mc.agp_base;

		}

drivers/gpu/drm/radeon/r600.c

+5 −4
Original line number Diff line number Diff line
@@ -624,7 +624,6 @@ int r600_mc_init(struct radeon_device *rdev) 
	fixed20_12 a;

	u32 tmp;

	int chansize, numchan;

	int r;



	/* Get VRAM informations */

	rdev->mc.vram_is_ddr = true;
@@ -667,9 +666,6 @@ int r600_mc_init(struct radeon_device *rdev) 
		rdev->mc.real_vram_size = rdev->mc.aper_size;



	if (rdev->flags & RADEON_IS_AGP) {

		r = radeon_agp_init(rdev);

		if (r)

			return r;

		/* gtt_size is setup by radeon_agp_init */

		rdev->mc.gtt_location = rdev->mc.agp_base;

		tmp = 0xFFFFFFFFUL - rdev->mc.agp_base - rdev->mc.gtt_size;
@@ -2028,6 +2024,11 @@ int r600_init(struct radeon_device *rdev) 
	r = radeon_fence_driver_init(rdev);

	if (r)

		return r;

	if (rdev->flags & RADEON_IS_AGP) {

		r = radeon_agp_init(rdev);

		if (r)

			radeon_agp_disable(rdev);

	}

	r = r600_mc_init(rdev);

	if (r)

		return r;

drivers/gpu/drm/radeon/radeon.h

+2 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,8 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v) 
#define radeon_hpd_set_polarity(rdev, hpd) (rdev)->asic->hpd_set_polarity((rdev), (hpd))



/* Common functions */

/* AGP */

extern void radeon_agp_disable(struct radeon_device *rdev);

extern int radeon_gart_table_vram_pin(struct radeon_device *rdev);

extern int radeon_modeset_init(struct radeon_device *rdev);

extern void radeon_modeset_fini(struct radeon_device *rdev);

drivers/gpu/drm/radeon/radeon_device.c

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ void radeon_agp_disable(struct radeon_device *rdev) 
		rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush;

		rdev->asic->gart_set_page = &r100_pci_gart_set_page;

	}

	rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024;

}



void radeon_check_arguments(struct radeon_device *rdev)