From patchwork Thu Sep 16 06:31:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 184652 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8G6WnuY010631 for ; Thu, 16 Sep 2010 06:33:24 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B32DE9EEC2 for ; Wed, 15 Sep 2010 23:32:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 48C4C9ED70; Wed, 15 Sep 2010 23:31:34 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 15 Sep 2010 23:31:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.56,375,1280732400"; d="scan'208";a="607407513" Received: from ubuntu-hp.sh.intel.com ([10.239.36.210]) by fmsmga002.fm.intel.com with ESMTP; 15 Sep 2010 23:31:33 -0700 From: Zhenyu Wang To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] drm/i915: Enable DisplayPort audio Date: Thu, 16 Sep 2010 14:31:31 +0800 Message-Id: <1284618692-2296-2-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1284618692-2296-1-git-send-email-zhenyuw@linux.intel.com> References: <1284618692-2296-1-git-send-email-zhenyuw@linux.intel.com> Cc: intel-gfx@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 16 Sep 2010 06:33:24 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 208a4ec..4a14727 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1485,6 +1485,7 @@ static int intel_dp_get_modes(struct drm_connector *connector) struct intel_dp *intel_dp = intel_attached_dp(connector); struct drm_device *dev = intel_dp->base.base.dev; struct drm_i915_private *dev_priv = dev->dev_private; + struct edid *edid; int ret; /* We should parse the EDID data and find out if it has an audio sink @@ -1505,6 +1506,9 @@ static int intel_dp_get_modes(struct drm_connector *connector) } } + edid = (struct edid *)connector->display_info.raw_edid; + intel_dp->has_audio = drm_detect_monitor_audio(edid); + return ret; }