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

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

drm/radeon/kms/evergreen: reset the grbm blocks at resume and init 



This fixes module reloading and resume as the gfx block seems to
be left in a bad state in some cases.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9f0c4f9c

drivers/gpu/drm/radeon/evergreen.c

+10 −0
Original line number Diff line number Diff line
@@ -2583,6 +2583,11 @@ int evergreen_resume(struct radeon_device *rdev) 
{

	int r;



	/* reset the asic, the gfx blocks are often in a bad state

	 * after the driver is unloaded or after a resume

	 */

	if (radeon_asic_reset(rdev))

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

	/* Do not reset GPU before posting, on rv770 hw unlike on r500 hw,

	 * posting will perform necessary task to bring back GPU into good

	 * shape.
@@ -2699,6 +2704,11 @@ int evergreen_init(struct radeon_device *rdev) 
	r = radeon_atombios_init(rdev);

	if (r)

		return r;

	/* reset the asic, the gfx blocks are often in a bad state

	 * after the driver is unloaded or after a resume

	 */

	if (radeon_asic_reset(rdev))

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

	/* Post card if necessary */

	if (!evergreen_card_posted(rdev)) {

		if (!rdev->bios) {