[Intel-gfx] [PATCH] drm/i915: demote opregion excessive timeout WARN_ONCE to DRM_INFO

Chris Wilson chris at chris-wilson.co.uk
Fri Jan 31 12:56:08 CET 2014


On Fri, Jan 31, 2014 at 01:55:47PM +0200, Jani Nikula wrote:
> On Fri, 31 Jan 2014, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> > On Fri, Jan 31, 2014 at 01:41:08PM +0200, Jani Nikula wrote:
> >> The WARN is a bit too verbose, make it a DRM_INFO that gets printed
> >> once.
> >> 
> >> While at it, fix the typo in DSLP.
> >> 
> >> Suggested-by: Chris Wilson <chris at chris-wilson.co.uk>
> >> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/intel_opregion.c |    6 +++++-
> >>  1 file changed, 5 insertions(+), 1 deletion(-)
> >> 
> >> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> >> index 46d288055345..0fae017c4c7b 100644
> >> --- a/drivers/gpu/drm/i915/intel_opregion.c
> >> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> >> @@ -263,7 +263,11 @@ static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)
> >>  		dslp = 50;
> >>  	} else if (dslp > 1500) {
> >>  		/* Hey bios, trust must be earned. */
> >> -		WARN_ONCE(1, "excessive driver sleep timeout (DSPL) %u\n", dslp);
> >> +		static bool warned;
> >> +		if (!warned) {
> >> +			DRM_INFO("excessive driver sleep timeout (DSLP) %u\n", dslp);
> >
> > DRM_INFO("ACPI BIOS requests an excessive sleep of %d ms, using %d instead\n", dslp, MAX_DSLP);
> 
> You're just saying that because I didn't dare to write the new value
> back to opregion! :p

I'm just trying to clarify that it is not our fault we want to sleep for
several seconds during startup, but the manufacturer...

But yes, you are a coward. ;-)
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre



More information about the Intel-gfx mailing list