aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_drv.c
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-05-02 09:11:21 -0400
committerDave Airlie <airlied@redhat.com>2012-05-03 04:16:35 -0400
commit3368ff0cf483005bd327372049f2bf43dc63730a (patch)
tree7ae68a4041144aa665cfbb17c21a71f74e825ec4 /drivers/gpu/drm/radeon/radeon_drv.c
parent069211e55561fdaf86d66eedacca57eaad910757 (diff)
drm/radeon: make lockup timeout a module param
Don't hard code the 10 seconds timeout. Compute jobs can run much longer. Signed-off-by: Christian König <deathsimple@vodafone.de> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index ef7bb3f6ecae..e62e56a57ee4 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -128,6 +128,7 @@ int radeon_disp_priority = 0;
128int radeon_hw_i2c = 0; 128int radeon_hw_i2c = 0;
129int radeon_pcie_gen2 = 0; 129int radeon_pcie_gen2 = 0;
130int radeon_msi = -1; 130int radeon_msi = -1;
131int radeon_lockup_timeout = 10000;
131 132
132MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); 133MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
133module_param_named(no_wb, radeon_no_wb, int, 0444); 134module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -177,6 +178,9 @@ module_param_named(pcie_gen2, radeon_pcie_gen2, int, 0444);
177MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)"); 178MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)");
178module_param_named(msi, radeon_msi, int, 0444); 179module_param_named(msi, radeon_msi, int, 0444);
179 180
181MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (defaul 10000 = 10 seconds, 0 = disable)");
182module_param_named(lockup_timeout, radeon_lockup_timeout, int, 0444);
183
180static int radeon_suspend(struct drm_device *dev, pm_message_t state) 184static int radeon_suspend(struct drm_device *dev, pm_message_t state)
181{ 185{
182 drm_radeon_private_t *dev_priv = dev->dev_private; 186 drm_radeon_private_t *dev_priv = dev->dev_private;