All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 4/6] drm/i915: cleanup redundant checks from intel_enable_asle
Date: Mon, 29 Apr 2013 13:02:53 +0300	[thread overview]
Message-ID: <8b84859405730230ba3469a452ebb50517fd7707.1367223972.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1367223972.git.jani.nikula@intel.com>
In-Reply-To: <cover.1367223972.git.jani.nikula@intel.com>

Realize that intel_enable_asle() is never called on PCH-split platforms
or on VLV. Rip out the GSE irq enable for PCH-split platforms, which
also happens to be incorrect for IVB+.

This should not cause any functional changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_irq.c |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index b0dbf4c..1783ebe 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -356,21 +356,11 @@ void intel_enable_asle(struct drm_device *dev)
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	unsigned long irqflags;
 
-	/* FIXME: opregion/asle for VLV */
-	if (IS_VALLEYVIEW(dev))
-		return;
-
 	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
 
-	if (HAS_PCH_SPLIT(dev))
-		ironlake_enable_display_irq(dev_priv, DE_GSE);
-	else {
-		i915_enable_pipestat(dev_priv, 1,
-				     PIPE_LEGACY_BLC_EVENT_ENABLE);
-		if (INTEL_INFO(dev)->gen >= 4)
-			i915_enable_pipestat(dev_priv, 0,
-					     PIPE_LEGACY_BLC_EVENT_ENABLE);
-	}
+	i915_enable_pipestat(dev_priv, 1, PIPE_LEGACY_BLC_EVENT_ENABLE);
+	if (INTEL_INFO(dev)->gen >= 4)
+		i915_enable_pipestat(dev_priv, 0, PIPE_LEGACY_BLC_EVENT_ENABLE);
 
 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
-- 
1.7.9.5

  parent reply	other threads:[~2013-04-29 10:02 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-29 10:02 [PATCH 0/6] opregion asle enable cleanups Jani Nikula
2013-04-29 10:02 ` [PATCH 1/6] drm/i915: cleanup opregion technology enabled indicator defines Jani Nikula
2013-04-29 11:12   ` Damien Lespiau
2013-04-29 10:02 ` [PATCH 2/6] drm/i915: manage opregion asle driver readiness properly Jani Nikula
2013-04-29 11:23   ` Damien Lespiau
2013-04-29 10:02 ` [PATCH 3/6] drm/i915: untie opregion init and asle irq/pipestat enable Jani Nikula
2013-04-29 11:24   ` Damien Lespiau
2013-04-29 11:29   ` Damien Lespiau
2013-04-29 11:34     ` Damien Lespiau
2013-04-29 10:02 ` Jani Nikula [this message]
2013-04-29 11:30   ` [PATCH 4/6] drm/i915: cleanup redundant checks from intel_enable_asle Damien Lespiau
2013-04-29 10:02 ` [PATCH 5/6] drm/i915: cleanup opregion asle pipestat enable Jani Nikula
2013-04-29 11:36   ` Damien Lespiau
2013-04-29 10:02 ` [PATCH 6/6] drm/i915: drop locking from " Jani Nikula
2013-04-29 11:37   ` Damien Lespiau
2013-04-30  8:47   ` Daniel Vetter
2013-04-30 11:30     ` [PATCH] drm/i915: make locking requirement for pipestat changes more explicit Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8b84859405730230ba3469a452ebb50517fd7707.1367223972.git.jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.