ACK: [PATCH] [TRUSTY] UBUNTU: SAUCE: drm/i915: demote opregion excessive timeout WARN_ONCE to DRM_INFO_ONCE

[Brad Figg]

On 07/31/2014 12:49 PM, Robert Hooker wrote:
> From: Jani Nikula <jani.nikula at intel.com>
> 
> commit bdde5c6a258a702bdfa7d1f4ae804a7bc405e788 upstream.
> 
> BugLink: http://bugs.launchpad.net/bugs/1351014
> 
> 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 at chris-wilson.co.uk>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> 
> adjusted to only apply to i915_bdw
> Signed-off-by: Robert Hooker <robert.hooker at canonical.com>
> ---
>  ubuntu/i915/intel_opregion.c |    9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/ubuntu/i915/intel_opregion.c b/ubuntu/i915/intel_opregion.c
> index 37e9a96..6845960 100644
> --- a/ubuntu/i915/intel_opregion.c
> +++ b/ubuntu/i915/intel_opregion.c
> @@ -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... */
> 


-- 
Brad Figg brad.figg at canonical.com http://www.canonical.com