All of lore.kernel.org
 help / color / mirror / Atom feed
From: sonika.jindal@intel.com
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 2/7] drm/i915: Returning the right VGA control reg for platforms
Date: Fri, 18 Jul 2014 11:04:05 +0530	[thread overview]
Message-ID: <1405661650-5771-3-git-send-email-sonika.jindal@intel.com> (raw)
In-Reply-To: <1405661650-5771-1-git-send-email-sonika.jindal@intel.com>

From: Sonika Jindal <sonika.jindal@intel.com>

Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 991b663..90a682c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2800,10 +2800,10 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val);
 
 static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev)
 {
-	if (HAS_PCH_SPLIT(dev))
-		return CPU_VGACNTRL;
-	else if (IS_VALLEYVIEW(dev))
+	if (IS_VALLEYVIEW(dev))
 		return VLV_VGACNTRL;
+	else if (INTEL_INFO(dev)->gen >= 5)
+		return CPU_VGACNTRL;
 	else
 		return VGACNTRL;
 }
-- 
1.7.10.4

  parent reply	other threads:[~2014-07-18  5:38 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-18  5:34 [PATCH 0/7] Future preparation patches sonika.jindal
2014-07-18  5:34 ` [PATCH 1/7] drm/i915: Allowing changing of wm latencies for valid platforms sonika.jindal
2014-07-18  5:34 ` sonika.jindal [this message]
2014-07-18  5:34 ` [PATCH 3/7] drm/i915: Setting legacy palette correctly for different platforms sonika.jindal
2014-07-18  5:34 ` [PATCH 4/7] drm/i915: Returning from increase/decrease of pllclock when invalid sonika.jindal
2014-07-18  5:34 ` [PATCH 5/7] drm/i915: Writing proper check for reading of pipe status reg sonika.jindal
2014-07-18  5:34 ` [PATCH 6/7] drm/i915: Replace HAS_PCH_SPLIT which incorrectly lets some platforms in sonika.jindal
2014-07-18  5:34 ` [PATCH 7/7] drm/i915: Avoid incorrect returning for some platforms sonika.jindal
2014-07-18 10:56 ` [PATCH 0/7] Future preparation patches Damien Lespiau
2014-07-18 11:23   ` Jindal, Sonika
2014-07-18 13:04     ` Damien Lespiau
2014-07-18 13:30       ` Daniel Vetter
2014-07-21  5:46         ` Jindal, Sonika

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=1405661650-5771-3-git-send-email-sonika.jindal@intel.com \
    --to=sonika.jindal@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.