From patchwork Fri Aug 7 02:55:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 39756 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n772sUNu001299 for ; Fri, 7 Aug 2009 02:54:30 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DDF22A0310; Thu, 6 Aug 2009 19:54:29 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BDBCA0305 for ; Thu, 6 Aug 2009 19:54:26 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 06 Aug 2009 19:40:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.43,338,1246863600"; d="scan'208";a="436923475" Received: from yakui_zhao.sh.intel.com (HELO localhost.localdomain) ([10.239.13.194]) by orsmga002.jf.intel.com with ESMTP; 06 Aug 2009 20:01:01 -0700 From: yakui.zhao@intel.com To: eric@anholt.net, jbarnes@virtuousgeek.org Date: Fri, 7 Aug 2009 10:55:19 +0800 Message-Id: <1249613719-22194-4-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1249613719-22194-3-git-send-email-yakui.zhao@intel.com> References: <1249613719-22194-1-git-send-email-yakui.zhao@intel.com> <1249613719-22194-2-git-send-email-yakui.zhao@intel.com> <1249613719-22194-3-git-send-email-yakui.zhao@intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [RFC Patch 3/3] DRM/I915: Use the child device to decide whether the given DP should be intialized X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org From: Zhao Yakui Use the child device array to decide whether the given DP output should be initialized. If the given DP port can't be found in child device array, it is not present and won't be initialized. Signed-off-by: Zhao Yakui --- drivers/gpu/drm/i915/intel_dp.c | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) Index: linux-2.6/drivers/gpu/drm/i915/intel_dp.c =================================================================== --- linux-2.6.orig/drivers/gpu/drm/i915/intel_dp.c 2009-08-07 10:46:25.000000000 +0800 +++ linux-2.6/drivers/gpu/drm/i915/intel_dp.c 2009-08-07 10:49:15.000000000 +0800 @@ -35,6 +35,11 @@ #include "i915_drv.h" #include "intel_dp.h" +#define INT_DP_CLASS 0x68C6 +#define PORT_IDPB 0x7 +#define PORT_IDPC 0x8 +#define PORT_IDPD 0x9 + #define DP_LINK_STATUS_SIZE 6 #define DP_LINK_CHECK_TIMEOUT (10 * 1000) @@ -1227,7 +1232,44 @@ if (dp_priv->dpms_mode == DRM_MODE_DPMS_ON) intel_dp_check_link_status(intel_output); } +/* + * Enumerate the child dev array parsed from VBT to check whether + * the given DP is present. + * If it is present, return 1. + * If it is not present, return false. + * If no child dev is parsed from VBT, it assumes that the given + * DP is present. + */ +int dp_is_present_in_vbt(struct drm_device *dev, int dp_reg) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct child_device_config *p_child; + int i, dp_port, ret; + + if (!dev_priv->child_dev_num) + return 1; + if (dp_reg == DP_B) + dp_port = PORT_IDPB; + else if (dp_reg == DP_C) + dp_port = PORT_IDPC; + else + dp_port = PORT_IDPD; + + ret = 0; + for (i = 0; i < dev_priv->child_dev_num; i++) { + p_child = dev_priv->child_dev + i; + /* + * If the device type is not HDMI, continue. + */ + if (p_child->device_type != INT_DP_CLASS) + continue; + /* Find the DP port */ + if (p_child->dvo_port == dp_port) + ret = 1; + } + return ret; +} void intel_dp_init(struct drm_device *dev, int output_reg) { @@ -1237,6 +1279,10 @@ struct intel_dp_priv *dp_priv; const char *name = NULL; + if (!dp_is_present_in_vbt(dev, output_reg)) { + DRM_DEBUG("DP is not present. Ignore it\n"); + return; + } intel_output = kcalloc(sizeof(struct intel_output) + sizeof(struct intel_dp_priv), 1, GFP_KERNEL); if (!intel_output)