mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
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>
This commit is contained in:
parent
48b8f6315a
commit
bdde5c6a25
1 changed files with 6 additions and 3 deletions
|
@ -227,6 +227,8 @@ struct opregion_asle {
|
|||
#define ACPI_DIGITAL_OUTPUT (3<<8)
|
||||
#define ACPI_LVDS_OUTPUT (4<<8)
|
||||
|
||||
#define MAX_DSLP 1500
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
|
||||
{
|
||||
|
@ -261,10 +263,11 @@ static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
|
|||
/* The spec says 2ms should be the default, but it's too small
|
||||
* for some machines. */
|
||||
dslp = 50;
|
||||
} else if (dslp > 500) {
|
||||
} else if (dslp > MAX_DSLP) {
|
||||
/* Hey bios, trust must be earned. */
|
||||
WARN_ONCE(1, "excessive driver sleep timeout (DSPL) %u\n", dslp);
|
||||
dslp = 500;
|
||||
DRM_INFO_ONCE("ACPI BIOS requests an excessive sleep of %u ms, "
|
||||
"using %u ms instead\n", dslp, MAX_DSLP);
|
||||
dslp = MAX_DSLP;
|
||||
}
|
||||
|
||||
/* The spec tells us to do this, but we are the only user... */
|
||||
|
|
Loading…
Reference in a new issue