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

Commit 0ebf1717 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon/kms: resume AGP by calling init. 



AGP resume was broken since we moved to the new init path,
because we never re-enabled AGP on these systems at resume time.

This patch just calls the AGP resume call which just does the reinit
at resume time like the old path did.

Since AGP is pretty much gpu independant I did it outside
the gpu specific code.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a8a8a669

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ typedef int (*radeon_packet3_check_t)(struct radeon_cs_parser *p, 
 * AGP

 */

int radeon_agp_init(struct radeon_device *rdev);

void radeon_agp_resume(struct radeon_device *rdev);

void radeon_agp_fini(struct radeon_device *rdev);

drivers/gpu/drm/radeon/radeon_agp.c

+12 −0
Original line number Diff line number Diff line
@@ -237,6 +237,18 @@ int radeon_agp_init(struct radeon_device *rdev) 
#endif

}



void radeon_agp_resume(struct radeon_device *rdev)

{

#if __OS_HAS_AGP

	int r;

	if (rdev->flags & RADEON_IS_AGP) {

		r = radeon_agp_init(rdev);

		if (r)

			dev_warn(rdev->dev, "radeon AGP reinit failed\n");

	}

#endif

}



void radeon_agp_fini(struct radeon_device *rdev)

{

#if __OS_HAS_AGP

drivers/gpu/drm/radeon/radeon_device.c

+2 −0
Original line number Diff line number Diff line
@@ -688,6 +688,8 @@ int radeon_resume_kms(struct drm_device *dev) 
		return -1;

	}

	pci_set_master(dev->pdev);

	/* resume AGP if in use */

	radeon_agp_resume(rdev);

	radeon_resume(rdev);

	radeon_restore_bios_scratch_regs(rdev);

	fb_set_suspend(rdev->fbdev_info, 0);