diff mbox

drm/i915: Increase OpRegion timeout

Message ID 1391160676-26766-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter Jan. 31, 2014, 9:31 a.m. UTC
I have a machine here which hits this (a g33):

[   13.368536] excessive driver sleep timeout (DSPL) 1024

Apparently people love pot numbers, and one second isn't that
unreasonable (for a bios writer at least) I guess.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/intel_opregion.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Chris Wilson Jan. 31, 2014, 9:38 a.m. UTC | #1
On Fri, Jan 31, 2014 at 10:31:16AM +0100, Daniel Vetter wrote:
> I have a machine here which hits this (a g33):
> 
> [   13.368536] excessive driver sleep timeout (DSPL) 1024
> 
> Apparently people love pot numbers, and one second isn't that
> unreasonable (for a bios writer at least) I guess.

Reference https://bugs.freedesktop.org/show_bug.cgi?id=74266
excessive driver sleep timeout (DSPL) 1280

Quirks are DRM_INFO not full blown oops!
-Chris
Jani Nikula Jan. 31, 2014, 11:42 a.m. UTC | #2
On Fri, 31 Jan 2014, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> I have a machine here which hits this (a g33):
>
> [   13.368536] excessive driver sleep timeout (DSPL) 1024
>
> Apparently people love pot numbers, and one second isn't that
> unreasonable (for a bios writer at least) I guess.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_opregion.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 3da259e280ba..3c7e38c7ed87 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -261,10 +261,10 @@ 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 > 1500) {
>  		/* Hey bios, trust must be earned. */
>  		WARN_ONCE(1, "excessive driver sleep timeout (DSPL) %u\n", dslp);
> -		dslp = 500;
> +		dslp = 1500;
>  	}
>  
>  	/* The spec tells us to do this, but we are the only user... */
> -- 
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 3da259e280ba..3c7e38c7ed87 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -261,10 +261,10 @@  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 > 1500) {
 		/* Hey bios, trust must be earned. */
 		WARN_ONCE(1, "excessive driver sleep timeout (DSPL) %u\n", dslp);
-		dslp = 500;
+		dslp = 1500;
 	}
 
 	/* The spec tells us to do this, but we are the only user... */