public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 2/5] drm/i915: HSW_BLC_PWM2_CTL doesn't exist on BDW
Date: Fri,  4 Jul 2014 11:50:30 -0300	[thread overview]
Message-ID: <1404485433-4488-3-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1404485433-4488-1-git-send-email-przanoni@gmail.com>

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

So don't write it, otherwise we will trigger unclaimed register
errors.

Testcase: igt/pm_rpm/rte
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c12a5da..14505a1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7345,8 +7345,9 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv)
 	WARN(I915_READ(PCH_PP_STATUS) & PP_ON, "Panel power on\n");
 	WARN(I915_READ(BLC_PWM_CPU_CTL2) & BLM_PWM_ENABLE,
 	     "CPU PWM1 enabled\n");
-	WARN(I915_READ(HSW_BLC_PWM2_CTL) & BLM_PWM_ENABLE,
-	     "CPU PWM2 enabled\n");
+	if (IS_HASWELL(dev))
+		WARN(I915_READ(HSW_BLC_PWM2_CTL) & BLM_PWM_ENABLE,
+		     "CPU PWM2 enabled\n");
 	WARN(I915_READ(BLC_PWM_PCH_CTL1) & BLM_PCH_PWM_ENABLE,
 	     "PCH PWM1 enabled\n");
 	WARN(I915_READ(UTIL_PIN_CTL) & UTIL_PIN_ENABLE,
-- 
2.0.0

  parent reply	other threads:[~2014-07-04 14:50 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-04 14:50 [PATCH 0/5] BDW unclaimed registers Paulo Zanoni
2014-07-04 14:50 ` [PATCH 1/5] drm/i915: don't write powered down IRQ registers on Gen 8 Paulo Zanoni
2014-07-07 21:23   ` Daniel Vetter
2014-07-08 14:15     ` Paulo Zanoni
2014-07-08 14:58       ` Daniel Vetter
2014-07-10 19:31         ` Paulo Zanoni
2014-07-15 16:42           ` Rodrigo Vivi
2014-07-04 14:50 ` Paulo Zanoni [this message]
2014-07-15 16:43   ` [PATCH 2/5] drm/i915: HSW_BLC_PWM2_CTL doesn't exist on BDW Rodrigo Vivi
2014-07-04 14:50 ` [PATCH 3/5] drm/i915: extract and improve gen8_irq_power_well_post_enable Paulo Zanoni
2014-07-15 17:25   ` Rodrigo Vivi
2014-07-04 14:50 ` [PATCH 4/5] drm/i915: reorganize the unclaimed register detection code Paulo Zanoni
2014-07-07 21:34   ` Daniel Vetter
2014-07-15 19:17     ` Rodrigo Vivi
2014-07-04 14:50 ` [PATCH 5/5] drm/i915: BDW can also detect unclaimed registers Paulo Zanoni
2014-07-15 19:20   ` Rodrigo Vivi
2014-07-16 13:57     ` Daniel Vetter
2014-07-16 20:49       ` [PATCH 1/2] drm/i915: reorganize the unclaimed register detection code Paulo Zanoni
2014-07-16 20:49         ` [PATCH 2/2] drm/i915: BDW can also detect unclaimed registers Paulo Zanoni
2014-07-17  8:33           ` Daniel Vetter
2014-08-26 10:22         ` [PATCH 1/2] drm/i915: reorganize the unclaimed register detection code Chris Wilson
2014-08-26 12:17           ` Paulo Zanoni
2014-08-26 12:42             ` Chris Wilson
2014-08-26 13:04               ` Paulo Zanoni
2014-08-26 13:18                 ` Chris Wilson
2014-08-26 13:29                   ` Paulo Zanoni
2014-08-26 13:34                     ` Daniel Vetter
2014-08-26 13:46                       ` Chris Wilson
2014-08-26 14:08                         ` Daniel Vetter

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=1404485433-4488-3-git-send-email-przanoni@gmail.com \
    --to=przanoni@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=paulo.r.zanoni@intel.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox