From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 06/10] drm/i915: check the power down well on assert_pipe() Date: Fri, 18 Jan 2013 18:29:08 -0200 Message-ID: <1358540953-3979-7-git-send-email-przanoni@gmail.com> References: <1358540953-3979-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-gg0-f172.google.com (mail-gg0-f172.google.com [209.85.161.172]) by gabe.freedesktop.org (Postfix) with ESMTP id AE608E5F56 for ; Fri, 18 Jan 2013 12:29:57 -0800 (PST) Received: by mail-gg0-f172.google.com with SMTP id f4so215472ggn.17 for ; Fri, 18 Jan 2013 12:29:57 -0800 (PST) In-Reply-To: <1358540953-3979-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni If the power well is disabled, we should not try to read its registers, otherwise we'll get "unclaimed register" messages. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a7fb7e1..921b020 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1214,9 +1214,15 @@ void assert_pipe(struct drm_i915_private *dev_priv, if (pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE) state = true; - reg = PIPECONF(cpu_transcoder); - val = I915_READ(reg); - cur_state = !!(val & PIPECONF_ENABLE); + if (cpu_transcoder == TRANSCODER_EDP || + (I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE)) { + reg = PIPECONF(cpu_transcoder); + val = I915_READ(reg); + cur_state = !!(val & PIPECONF_ENABLE); + } else { + cur_state = false; + } + WARN(cur_state != state, "pipe %c assertion failure (expected %s, current %s)\n", pipe_name(pipe), state_string(state), state_string(cur_state)); -- 1.7.10.4