From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 20/28] drm/i915: don't enumerate VGA on VLV Date: Wed, 6 Mar 2013 19:58:25 +0100 Message-ID: <20130306185825.GT9021@phenom.ffwll.local> References: <1362172471-7643-1-git-send-email-jbarnes@virtuousgeek.org> <1362172471-7643-21-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by gabe.freedesktop.org (Postfix) with ESMTP id E2610E5C77 for ; Wed, 6 Mar 2013 10:55:52 -0800 (PST) Received: by mail-wg0-f49.google.com with SMTP id 15so7851950wgd.4 for ; Wed, 06 Mar 2013 10:55:52 -0800 (PST) Content-Disposition: inline In-Reply-To: <1362172471-7643-21-git-send-email-jbarnes@virtuousgeek.org> 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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 01, 2013 at 01:14:23PM -0800, Jesse Barnes wrote: > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_display.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index fd4a0d4..60397e8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8503,7 +8503,8 @@ static void intel_setup_outputs(struct drm_device *dev) > I915_WRITE(PFIT_CONTROL, 0); > } > > - if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) > + if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)) && > + !IS_VALLEYVIEW(dev)) If HAS_DDI is true on baytrail, that's a bug in the HAS_DDI macro. And I'd like that to be a feature-flag in the intel_infor struct anyway, iirc Damien is volunteered. -Daniel > intel_crt_init(dev); > > if (HAS_DDI(dev)) { > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch