From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 2/4] drm/i915: Enable DisplayPort audio
Date: Sun, 19 Sep 2010 08:43:30 +0100
Message-ID: <89k77n$p02tuc@fmsmga001.fm.intel.com>
References: <1284879129-19720-1-git-send-email-zhenyuw@linux.intel.com>
	<1284879129-19720-3-git-send-email-zhenyuw@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
In-Reply-To: <1284879129-19720-3-git-send-email-zhenyuw@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=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: Zhenyu Wang <zhenyuw@linux.intel.com>, dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org, fengguang.wu@intel.com
List-Id: dri-devel@lists.freedesktop.org

On Sun, 19 Sep 2010 14:52:07 +0800, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> This will turn on DP audio output by checking monitor's audio
> capability.
> 
> Tested-by: Wu Fengguang <fengguang.wu@intel.com>
> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c |   61 +++++++++++++++++++++++----------------
>  1 files changed, 36 insertions(+), 25 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 208a4ec..81fca1e 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1444,39 +1444,50 @@ intel_dp_detect(struct drm_connector *connector)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	uint32_t temp, bit;
>  	enum drm_connector_status status;
> +	struct edid *edid = NULL;
>  
>  	intel_dp->has_audio = false;
>  
> -	if (HAS_PCH_SPLIT(dev))
> -		return ironlake_dp_detect(connector);
> +	if (HAS_PCH_SPLIT(dev)) {
> +		status = ironlake_dp_detect(connector);
> +	} else {
> +		switch (intel_dp->output_reg) {
> +		case DP_B:
> +			bit = DPB_HOTPLUG_INT_STATUS;
> +			break;
> +		case DP_C:
> +			bit = DPC_HOTPLUG_INT_STATUS;
> +			break;
> +		case DP_D:
> +			bit = DPD_HOTPLUG_INT_STATUS;
> +			break;
> +		default:
> +			return connector_status_unknown;
> +		}
Move the switch and register check into a separate function, so
the main detect body becomes:
  if (HAS_PCH_SPLIT(dev))
    status = ironlake_dp_detect(connector);
  else
    status = g4x_dp_detect(connector);
  if (status != connector_status_connected)
    return status;

-- 
Chris Wilson, Intel Open Source Technology Centre