From patchwork Tue Jun 7 22:54:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Graunke X-Patchwork-Id: 860052 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p57Mub12026467 for ; Tue, 7 Jun 2011 22:56:58 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C21D59F0F1 for ; Tue, 7 Jun 2011 15:56:37 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from homiemail-a3.g.dreamhost.com (caiajhbdcbef.dreamhost.com [208.97.132.145]) by gabe.freedesktop.org (Postfix) with ESMTP id D7E8A9F0FD for ; Tue, 7 Jun 2011 15:55:51 -0700 (PDT) Received: from homiemail-a3.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a3.g.dreamhost.com (Postfix) with ESMTP id 329AA28406C; Tue, 7 Jun 2011 15:55:51 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=whitecape.org; h=from:to:cc :subject:date:message-id:in-reply-to:references; q=dns; s= whitecape.org; b=sdp7/JymkALLWf6MjuJanMUKWWeWVKJhl4jvpJcEHn4pvzF sWRITqxNtgsNU7G41MRZs/fDyrnMksGQEN4Jgu7bw/Dko7YYZWW2Q8Z5ZUgD7tCQ OMIsqMP5Su+Ed29oH8l4OSkio8zd7kOGA+GfH+SEh2wpxRubNfKPytoaDDSo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=whitecape.org; h=from:to :cc:subject:date:message-id:in-reply-to:references; s= whitecape.org; bh=G/LrC/O229iCMAhLu/pNZjgIK+A=; b=SoyCR+iJ2i2UgF KMlDQ4F7UUjRz7lLIhK0kgPYYECust88+uCAgASxEroi4RI0B18KsQK6HWUHXdek 8SNnS0vNnHpqBPmFJOY7WJN6U87mJbJq4VpsSkMpmjI7kgyYeI7sYvsNkx5AGAvY Efz1ADxGmPIJ/0wwwyJGFgyBTlORk= Received: from localhost (c-24-21-202-86.hsd1.or.comcast.net [24.21.202.86]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: kenneth@whitecape.org) by homiemail-a3.g.dreamhost.com (Postfix) with ESMTPSA id EB35328406A; Tue, 7 Jun 2011 15:55:49 -0700 (PDT) From: Kenneth Graunke To: intel-gfx@lists.freedesktop.org Date: Tue, 7 Jun 2011 15:54:40 -0700 Message-Id: <1307487281-3015-2-git-send-email-kenneth@whitecape.org> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1307487281-3015-1-git-send-email-kenneth@whitecape.org> References: <1307487281-3015-1-git-send-email-kenneth@whitecape.org> Subject: [Intel-gfx] [PATCH 2/3] drm/i915: Remove HAS_BLT/HAS_BSD checks from ivybridge_irq_postinstall. 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 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 22:56:58 +0000 (UTC) Ivybridge has BLT and BSD rings, so there's no need to check. Signed-off-by: Kenneth Graunke Reviewed-by: Keith Packard --- drivers/gpu/drm/i915/i915_irq.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index b9fafe3..6a2b7f4 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1841,10 +1841,8 @@ int ivybridge_irq_postinstall(struct drm_device *dev) u32 hotplug_mask; DRM_INIT_WAITQUEUE(&dev_priv->ring[RCS].irq_queue); - if (HAS_BSD(dev)) - DRM_INIT_WAITQUEUE(&dev_priv->ring[VCS].irq_queue); - if (HAS_BLT(dev)) - DRM_INIT_WAITQUEUE(&dev_priv->ring[BCS].irq_queue); + DRM_INIT_WAITQUEUE(&dev_priv->ring[VCS].irq_queue); + DRM_INIT_WAITQUEUE(&dev_priv->ring[BCS].irq_queue); dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B; dev_priv->irq_mask = ~display_mask;