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

Commit 8471a26b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'korg/drm-radeon-testing' into drm-linus 

* korg/drm-radeon-testing:
  drm/radeon/kms: Use radeon_agp_disable when disabling AGP
  drm/radeon/kms: Disable AGP is aperture size < 32M
  drm/radeon/kms: Fix r600 blit cleanup path
  drm/radeon/kms: Do not unpin buffer in fb destruction
  drm/radeon/kms: fix displayport->dvi connector DDC.
parents 79b7dcb2 700a0cc0

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

+12 −9
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;
@@ -1961,11 +1957,13 @@ int r600_suspend(struct radeon_device *rdev) 
	r600_wb_disable(rdev);

	r600_pcie_gart_disable(rdev);

	/* unpin shaders bo */

	if (rdev->r600_blit.shader_obj) {

		r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);

	if (unlikely(r != 0))

		return r;

		if (!r) {

			radeon_bo_unpin(rdev->r600_blit.shader_obj);

			radeon_bo_unreserve(rdev->r600_blit.shader_obj);

		}

	}

	return 0;

}
@@ -2026,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/r600_blit_kms.c

+8 −6
Original line number Diff line number Diff line
@@ -512,14 +512,16 @@ void r600_blit_fini(struct radeon_device *rdev) 
{

	int r;



	if (rdev->r600_blit.shader_obj == NULL)

		return;

	/* If we can't reserve the bo, unref should be enough to destroy

	 * it when it becomes idle.

	 */

	r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);

	if (unlikely(r != 0)) {

		dev_err(rdev->dev, "(%d) can't finish r600 blit\n", r);

		goto out_unref;

	}

	if (!r) {

		radeon_bo_unpin(rdev->r600_blit.shader_obj);

		radeon_bo_unreserve(rdev->r600_blit.shader_obj);

out_unref:

	}

	radeon_bo_unref(&rdev->r600_blit.shader_obj);

}

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