aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2014-01-31 08:49:08 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-02-04 15:10:45 -0500
commitbdde5c6a258a702bdfa7d1f4ae804a7bc405e788 (patch)
tree92c603e704b9e0c1e04b4b47583158b31bb38dae
parent48b8f6315a6a230f859fcae8ef4a0ccf4f48e802 (diff)
drm/i915: demote opregion excessive timeout WARN_ONCE to DRM_INFO_ONCE
The WARN_ONCE is a bit too verbose, make it a DRM_INFO_ONCE. While at it, add a #define for MAX_DSLP and make the message a bit more informative. v2: use DRM_INFO_ONCE, add MAX_DSLP, pimp the message. Suggested-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_opregion.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 37e9a96777ef..68459605bd12 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -227,6 +227,8 @@ struct opregion_asle {
227#define ACPI_DIGITAL_OUTPUT (3<<8) 227#define ACPI_DIGITAL_OUTPUT (3<<8)
228#define ACPI_LVDS_OUTPUT (4<<8) 228#define ACPI_LVDS_OUTPUT (4<<8)
229 229
230#define MAX_DSLP 1500
231
230#ifdef CONFIG_ACPI 232#ifdef CONFIG_ACPI
231static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out) 233static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
232{ 234{
@@ -261,10 +263,11 @@ static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
261 /* The spec says 2ms should be the default, but it's too small 263 /* The spec says 2ms should be the default, but it's too small
262 * for some machines. */ 264 * for some machines. */
263 dslp = 50; 265 dslp = 50;
264 } else if (dslp > 500) { 266 } else if (dslp > MAX_DSLP) {
265 /* Hey bios, trust must be earned. */ 267 /* Hey bios, trust must be earned. */
266 WARN_ONCE(1, "excessive driver sleep timeout (DSPL) %u\n", dslp); 268 DRM_INFO_ONCE("ACPI BIOS requests an excessive sleep of %u ms, "
267 dslp = 500; 269 "using %u ms instead\n", dslp, MAX_DSLP);
270 dslp = MAX_DSLP;
268 } 271 }
269 272
270 /* The spec tells us to do this, but we are the only user... */ 273 /* The spec tells us to do this, but we are the only user... */