From patchwork Thu Jun 9 22:45:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?St=C3=A9phane_Marchesin?= X-Patchwork-Id: 867382 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p59MkFlJ014578 for ; Thu, 9 Jun 2011 22:46:36 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D209E9EB22 for ; Thu, 9 Jun 2011 15:46:14 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pv0-f177.google.com (mail-pv0-f177.google.com [74.125.83.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 05DC69E732 for ; Thu, 9 Jun 2011 15:45:54 -0700 (PDT) Received: by pvh11 with SMTP id 11so1372801pvh.36 for ; Thu, 09 Jun 2011 15:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=IOggiAvfyE8IQ1LHKRjm0gRXRoc8Rn368LiHjZ4qotg=; b=CM75as8n9MsnISzuohv6BE2MoneZFrpxMuF0Yt3Ch6XNxMXf97Bvsv6u0Vgmk4TZQh KUuyX+ExthyTLaQE5XKbMq/E6r9szNuUGzSpkJKKqGEdLfrUV6RtkNh5icIzLPGs/ioc lYASvd95TBit9XDhLQZwKnYBIz0pqdKK/HT+4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:x-mailer; b=gyp8U9qAY77fMcHCZWRSjM4SzTG3LFqB2cLTGjj8/DefX2R98SeSrryJqx42/xcKA9 rdWE8VocIxZEoz6JJUe/QCJutupwu16CDVPNq3FD5NDKi1jIagMAiYbvC8W/aIP3ytqK OPG6r7GDSF4SbVqgiRcCJICoqkMs4mtogdA4k= Received: by 10.68.52.199 with SMTP id v7mr568965pbo.244.1307659552728; Thu, 09 Jun 2011 15:45:52 -0700 (PDT) Received: from localhost (marcheu.mtv.corp.google.com [172.22.68.221]) by mx.google.com with ESMTPS id p5sm1769542pbk.36.2011.06.09.15.45.49 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Jun 2011 15:45:51 -0700 (PDT) From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Jun 2011 15:45:42 -0700 Message-Id: <1307659542-19335-1-git-send-email-marcheu@chromium.org> X-Mailer: git-send-email 1.7.5.3.367.ga9930 Subject: [Intel-gfx] [PATCH] Properly decrement flip_count if we want to undo. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 09 Jun 2011 22:46:36 +0000 (UTC) --- src/intel_display.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/intel_display.c b/src/intel_display.c index b55b110..c9fdc59 100644 --- a/src/intel_display.c +++ b/src/intel_display.c @@ -1499,6 +1499,9 @@ intel_do_pageflip(intel_screen_private *intel, error_undo: drmModeRmFB(mode->fd, mode->fb_id); mode->fb_id = old_fb_id; + for (i = 0; i < config->num_crtc; i++) + if (config->crtc[i]->enabled) + mode->flip_count--; error_out: xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n",