From patchwork Thu Nov 7 14:31:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3152951 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 15234BEEB2 for ; Thu, 7 Nov 2013 14:31:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DBA9204AD for ; Thu, 7 Nov 2013 14:31:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 81AFD202B8 for ; Thu, 7 Nov 2013 14:31:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AB8A3836B; Thu, 7 Nov 2013 06:31:36 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 49A4B38299 for ; Thu, 7 Nov 2013 06:31:28 -0800 (PST) Received: by mail-ee0-f41.google.com with SMTP id e53so357284eek.14 for ; Thu, 07 Nov 2013 06:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=0D67zU6dmNMSux1QGbQQddB6TXoW47yTItnm+9xGUjY=; b=W3xwh3G+Dzu9cP+3dQMPD7MLhu+/rCGDPkMEhxN4HAvHu9jTcTV7D7BmX3NyhGwRR2 peGHoNzA5LPHZcIV0iw+CwuODbNGSwTBbzd7vzE72gAsB4nsoBeu4meNcIVNlWB2HQ78 CXnOU+H6GSy3/Sccrmu2AutYawT7H+dEyr2xk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=0D67zU6dmNMSux1QGbQQddB6TXoW47yTItnm+9xGUjY=; b=cweg0hVIHW5h+fFbUkJxdOMKIyyKM6FM1bYylPKOLLOFsorKZN5v4Y99hVQjIaKQnI Bdry8xT8Gt2lIkRaP9UK/9fYcQkN6BcEsPrOu2sQ0O1GBA85jHP8hv+bN1YkSlKNCm7R If0coWVy/YMiMAg7vD+59plqqo9WHe8vorC/KgvCvoUrN2V99GMwy52FmxRbkitF4Gof Xb4MhjYsA832BA6w/f6QHTbW8IP3rqhThcqeW0VVGA6IqlQShPUj5/7TmIx3cxCCKyjM rtwvLoqlWdUa2qzzBD6yJVDdzA2X7C4gSRFTwWbgwKSgCQeOLaoGXcbw+yFSKFdTZrHd LTOQ== X-Gm-Message-State: ALoCoQmzJLS5up8ilp7etve2jCgOqOcsEv/Kj58fT5TZTgL2S7MO1MEu4Nzl8rr0M4hm5XeRe+V/ X-Received: by 10.14.6.134 with SMTP id 6mr9755471een.66.1383834686686; Thu, 07 Nov 2013 06:31:26 -0800 (PST) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id m54sm1673814eex.2.2013.11.07.06.31.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2013 06:31:25 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 7 Nov 2013 15:31:52 +0100 Message-Id: <1383834713-3153-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <20131107133754.GO5986@intel.com> References: <20131107133754.GO5986@intel.com> MIME-Version: 1.0 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/2] drm/i915: Mask the vblank interrupt on bdw by default X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reported-by: Ville Syrjälä Cc: Ville Syrjälä Signed-off-by: Daniel Vetter Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/i915_irq.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index bf71e352fd74..1ce5722c2462 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2917,15 +2917,15 @@ static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv) static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) { struct drm_device *dev = dev_priv->dev; - uint32_t de_pipe_enables = GEN8_PIPE_FLIP_DONE | - GEN8_PIPE_VBLANK | - GEN8_PIPE_CDCLK_CRC_DONE | - GEN8_PIPE_FIFO_UNDERRUN | - GEN8_DE_PIPE_IRQ_FAULT_ERRORS; + uint32_t de_pipe_masked = GEN8_PIPE_FLIP_DONE | + GEN8_PIPE_CDCLK_CRC_DONE | + GEN8_PIPE_FIFO_UNDERRUN | + GEN8_DE_PIPE_IRQ_FAULT_ERRORS; + uint32_t de_pipe_enables = de_pipe_masked | GEN8_PIPE_VBLANK; int pipe; - dev_priv->de_irq_mask[PIPE_A] = ~de_pipe_enables; - dev_priv->de_irq_mask[PIPE_B] = ~de_pipe_enables; - dev_priv->de_irq_mask[PIPE_C] = ~de_pipe_enables; + dev_priv->de_irq_mask[PIPE_A] = ~de_pipe_masked; + dev_priv->de_irq_mask[PIPE_B] = ~de_pipe_masked; + dev_priv->de_irq_mask[PIPE_C] = ~de_pipe_masked; for_each_pipe(pipe) { u32 tmp = I915_READ(GEN8_DE_PIPE_IIR(pipe));