From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 25/29] drm/i915: detect digital outputs on Haswell Date: Fri, 13 Apr 2012 22:17:07 +0100 Message-ID: <1334351837_416057@CP5-2952> References: <1334347745-11743-1-git-send-email-eugeni.dodonov@intel.com> <1334347745-11743-26-git-send-email-eugeni.dodonov@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 237E99E8BB for ; Fri, 13 Apr 2012 14:17:21 -0700 (PDT) In-Reply-To: <1334347745-11743-26-git-send-email-eugeni.dodonov@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: intel-gfx@lists.freedesktop.org Cc: Eugeni Dodonov List-Id: intel-gfx@lists.freedesktop.org On Fri, 13 Apr 2012 17:09:01 -0300, Eugeni Dodonov wrote: > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index bdc22f5..1524966 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8743,26 +8743,45 @@ static void intel_setup_outputs(struct drm_device *dev) > if (HAS_PCH_SPLIT(dev)) { > int found; > > - if (I915_READ(HDMIB) & PORT_DETECTED) { > - /* PCH SDVOB multiplex with HDMIB */ > - found = intel_sdvo_init(dev, PCH_SDVOB, true); > - if (!found) > - intel_hdmi_init(dev, HDMIB); > - if (!found && (I915_READ(PCH_DP_B) & DP_DETECTED)) > - intel_dp_init(dev, PCH_DP_B); > - } > + if (IS_HASWELL(dev)) { We're starting to get to ridiculous levels of indention. Break the PCH detection of SDVO/HDMI outputs into its own routine, and perhaps further down in architectures? -Chris -- Chris Wilson, Intel Open Source Technology Centre