From patchwork Thu Mar 7 15:30:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 2232671 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id C4D9EDF223 for ; Thu, 7 Mar 2013 15:30:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9FB09E5EAA for ; Thu, 7 Mar 2013 07:30:56 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 01FA4E5C54 for ; Thu, 7 Mar 2013 07:30:45 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 07 Mar 2013 07:30:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,803,1355126400"; d="scan'208";a="300981496" Received: from unknown (HELO dyon.amr.corp.intel.com) ([10.255.12.183]) by fmsmga002.fm.intel.com with ESMTP; 07 Mar 2013 07:30:29 -0800 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Thu, 7 Mar 2013 15:30:23 +0000 Message-Id: <1362670228-19494-1-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.7.7.5 Subject: [Intel-gfx] [PATCH 1/6] drm/i915: Warn if a pipe is enabled with a bogus port 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 If TRANS_DDI_FUNC_CTL has been wrongly programmed with an incorrect port, we are currently trying to read PORT_CLK_SEL(port) with an initialized value. Handle that case by returning PORT_CLK_SEL_NONE and warning about it. Signed-off-by: Damien Lespiau to add to first --- drivers/gpu/drm/i915/intel_ddi.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 56bb7cb..3b5838d 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1157,7 +1157,7 @@ static uint32_t intel_ddi_get_crtc_pll(struct drm_i915_private *dev_priv, enum pipe pipe) { uint32_t temp, ret; - enum port port; + enum port port = I915_MAX_PORTS; enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, pipe); int i; @@ -1173,7 +1173,10 @@ static uint32_t intel_ddi_get_crtc_pll(struct drm_i915_private *dev_priv, port = i; } - ret = I915_READ(PORT_CLK_SEL(port)); + if (port == I915_MAX_PORTS) + ret = PORT_CLK_SEL_NONE; + else + ret = I915_READ(PORT_CLK_SEL(port)); DRM_DEBUG_KMS("Pipe %c connected to port %c using clock 0x%08x\n", pipe_name(pipe), port_name(port), ret); @@ -1207,6 +1210,10 @@ void intel_ddi_setup_hw_pll_state(struct drm_device *dev) case PORT_CLK_SEL_WRPLL2: dev_priv->ddi_plls.wrpll2_refcount++; break; + case PORT_CLK_SEL_NONE: + WARN(1, "Pipe %c enabled but no clock selected\n", + pipe_name(pipe)); + break; } } }