From patchwork Fri Jan 18 20:29:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 2004361 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id AA2343FED4 for ; Fri, 18 Jan 2013 20:34:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C38AE5F6B for ; Fri, 18 Jan 2013 12:34:57 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=7zkGQbEg0/yxlLCJvSvaNesLE3rNP3kCW2g8QLYy1HA=; b=IK6m2eFn6nWeGWyTRpECc2DSfn1kVa+YmgT30Ovf3E0tU/wTd+xoh3AlqLxbOqsJYL oOBSMa5fmHdiu8ik5/9IuGIbFlTstssjzqhQo5D98XIjUI9is6BtnuCGvGnU7ZK0vuqf h/+8ie8zHmLq922JaA0r68IelK75BMmUGrljEyriNmYhUF+ktCtPG6CHL16fKnDzDzWG kb/JWTTw77a9ijdAZPd1LcgQrKyAQiFahY3dm45iFLOyi49F9OeJJkCz5vRCzjlxvYq1 v2Rn9nbFdmTje6118+AXshqiCf+Kl++WlPU79gm4dYGnhYRLwP5v64VHiaeFsseZ4iAJ cCPw== X-Received: by 10.236.119.197 with SMTP id n45mr11450434yhh.49.1358540997290; Fri, 18 Jan 2013 12:29:57 -0800 (PST) Received: from vicky.domain.invalid ([177.40.96.79]) by mx.google.com with ESMTPS id v7sm5008529anh.5.2013.01.18.12.29.55 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jan 2013 12:29:56 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 18 Jan 2013 18:29:08 -0200 Message-Id: <1358540953-3979-7-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358540953-3979-1-git-send-email-przanoni@gmail.com> References: <1358540953-3979-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 06/10] drm/i915: check the power down well on assert_pipe() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 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));