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

Commit f1a0a67a authored by Jérome Glisse's avatar Jérome Glisse Committed by Alex Deucher
Browse files

drm/radeon: add driver option to disable uvd block. 



Quite few suspend/hibernation bugs are related to this block. Add
an option to disable those as a work around.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarJérôme Glisse <jglisse@redhat.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cb25f7e0

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -113,6 +113,7 @@ extern int radeon_bapm; 
extern int radeon_backlight;

extern int radeon_backlight;

extern int radeon_auxch;

extern int radeon_auxch;

extern int radeon_mst;

extern int radeon_mst;

extern int radeon_uvd;





/*

/*

 * Copy from radeon_drv.h so we don't have to include both and have conflicting

 * Copy from radeon_drv.h so we don't have to include both and have conflicting

drivers/gpu/drm/radeon/radeon_asic.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -2696,6 +2696,9 @@ int radeon_asic_init(struct radeon_device *rdev) 
		rdev->asic->pm.set_memory_clock = NULL;

		rdev->asic->pm.set_memory_clock = NULL;

	}

	}





	if (!radeon_uvd)

		rdev->has_uvd = false;



	return 0;

	return 0;

}

}

drivers/gpu/drm/radeon/radeon_drv.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -196,6 +196,7 @@ int radeon_bapm = -1; 
int radeon_backlight = -1;

int radeon_backlight = -1;

int radeon_auxch = -1;

int radeon_auxch = -1;

int radeon_mst = 0;

int radeon_mst = 0;

int radeon_uvd = 1;





MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");

MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");

module_param_named(no_wb, radeon_no_wb, int, 0444);

module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -287,6 +288,9 @@ module_param_named(auxch, radeon_auxch, int, 0444); 
MODULE_PARM_DESC(mst, "DisplayPort MST experimental support (1 = enable, 0 = disable)");

MODULE_PARM_DESC(mst, "DisplayPort MST experimental support (1 = enable, 0 = disable)");

module_param_named(mst, radeon_mst, int, 0444);

module_param_named(mst, radeon_mst, int, 0444);





MODULE_PARM_DESC(uvd, "uvd enable/disable uvd support (1 = enable, 0 = disable)");

module_param_named(uvd, radeon_uvd, int, 0444);



static struct pci_device_id pciidlist[] = {

static struct pci_device_id pciidlist[] = {

	radeon_PCI_IDS

	radeon_PCI_IDS

};

};