diff options
| author | Keith Packard <keithp@keithp.com> | 2011-11-09 12:57:50 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-11-10 12:07:02 -0500 |
| commit | 4415e63b13c68c2f56d16d400a1ae345f68cf655 (patch) | |
| tree | ee621158ec8f9cf8777f7eb4ec6a28139892defd | |
| parent | 9ca1d10d748e56964de95e3ed80211b192f56cf4 (diff) | |
drm/i915: Module parameters using '-1' as default must be signed type
Testing i915_panel_use_ssc for the default value was broken, so the
driver would never autodetect the correct value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Alexandre Salim <salimma@fedoraproject.org>
Tested-by: Michel Alexandre Salim <salimma@fedoraproject.org>
Cc: stable@kernel.org
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 548e04bade3c..13488be4ae4b 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -67,7 +67,7 @@ module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600); | |||
| 67 | MODULE_PARM_DESC(i915_enable_rc6, | 67 | MODULE_PARM_DESC(i915_enable_rc6, |
| 68 | "Enable power-saving render C-state 6 (default: true)"); | 68 | "Enable power-saving render C-state 6 (default: true)"); |
| 69 | 69 | ||
| 70 | unsigned int i915_enable_fbc __read_mostly = -1; | 70 | int i915_enable_fbc __read_mostly = -1; |
| 71 | module_param_named(i915_enable_fbc, i915_enable_fbc, int, 0600); | 71 | module_param_named(i915_enable_fbc, i915_enable_fbc, int, 0600); |
| 72 | MODULE_PARM_DESC(i915_enable_fbc, | 72 | MODULE_PARM_DESC(i915_enable_fbc, |
| 73 | "Enable frame buffer compression for power savings " | 73 | "Enable frame buffer compression for power savings " |
| @@ -79,7 +79,7 @@ MODULE_PARM_DESC(lvds_downclock, | |||
| 79 | "Use panel (LVDS/eDP) downclocking for power savings " | 79 | "Use panel (LVDS/eDP) downclocking for power savings " |
| 80 | "(default: false)"); | 80 | "(default: false)"); |
| 81 | 81 | ||
| 82 | unsigned int i915_panel_use_ssc __read_mostly = -1; | 82 | int i915_panel_use_ssc __read_mostly = -1; |
| 83 | module_param_named(lvds_use_ssc, i915_panel_use_ssc, int, 0600); | 83 | module_param_named(lvds_use_ssc, i915_panel_use_ssc, int, 0600); |
| 84 | MODULE_PARM_DESC(lvds_use_ssc, | 84 | MODULE_PARM_DESC(lvds_use_ssc, |
| 85 | "Use Spread Spectrum Clock with panels [LVDS/eDP] " | 85 | "Use Spread Spectrum Clock with panels [LVDS/eDP] " |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d2da91f90252..4a9c1b979804 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -1000,10 +1000,10 @@ extern int i915_panel_ignore_lid __read_mostly; | |||
| 1000 | extern unsigned int i915_powersave __read_mostly; | 1000 | extern unsigned int i915_powersave __read_mostly; |
| 1001 | extern unsigned int i915_semaphores __read_mostly; | 1001 | extern unsigned int i915_semaphores __read_mostly; |
| 1002 | extern unsigned int i915_lvds_downclock __read_mostly; | 1002 | extern unsigned int i915_lvds_downclock __read_mostly; |
| 1003 | extern unsigned int i915_panel_use_ssc __read_mostly; | 1003 | extern int i915_panel_use_ssc __read_mostly; |
| 1004 | extern int i915_vbt_sdvo_panel_type __read_mostly; | 1004 | extern int i915_vbt_sdvo_panel_type __read_mostly; |
| 1005 | extern unsigned int i915_enable_rc6 __read_mostly; | 1005 | extern unsigned int i915_enable_rc6 __read_mostly; |
| 1006 | extern unsigned int i915_enable_fbc __read_mostly; | 1006 | extern int i915_enable_fbc __read_mostly; |
| 1007 | extern bool i915_enable_hangcheck __read_mostly; | 1007 | extern bool i915_enable_hangcheck __read_mostly; |
| 1008 | 1008 | ||
| 1009 | extern int i915_suspend(struct drm_device *dev, pm_message_t state); | 1009 | extern int i915_suspend(struct drm_device *dev, pm_message_t state); |
