From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH] drm/i915: Don't die in
 wait_for_pending_flips
Date: Mon, 19 May 2014 08:06:06 -0700
Message-ID: <20140519080606.19afa359@jbarnes-desktop>
References: <1400508575-8041-1-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from gproxy5-pub.mail.unifiedlayer.com
 (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55])
 by gabe.freedesktop.org (Postfix) with SMTP id 0A0A36E0E1
 for <intel-gfx@lists.freedesktop.org>; Mon, 19 May 2014 08:06:11 -0700 (PDT)
In-Reply-To: <1400508575-8041-1-git-send-email-daniel.vetter@ffwll.ch>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Mon, 19 May 2014 16:09:35 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> We can apperently miss them, but breaking the entire driver hampers
> testing. So bail out after one minute, our customerary "this is a lost
> cause" timeout.
> 
> References: https://bugs.freedesktop.org/show_bug.cgi?id=78383
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0f8f9bcb3012..6eca24d8b282 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3284,8 +3284,9 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
>  
>  	WARN_ON(waitqueue_active(&dev_priv->pending_flip_queue));
>  
> -	wait_event(dev_priv->pending_flip_queue,
> -		   !intel_crtc_has_pending_flip(crtc));
> +	WARN_ON(wait_event_timeout(dev_priv->pending_flip_queue,
> +				   !intel_crtc_has_pending_flip(crtc),
> +				   60*HZ) == 0);
>  
>  	mutex_lock(&dev->struct_mutex);
>  	intel_finish_fb(crtc->primary->fb);

Updating our page flip ioctl man page (hah!) with the timeout info
would be good, in case people like Mario queue flips for after lunch. :)

-- 
Jesse Barnes, Intel Open Source Technology Center