From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 18/20] drm/i915: use VLV DIP routines on VLV v2 Date: Tue, 19 Mar 2013 20:23:48 +0100 Message-ID: <20130319192348.GC9021@phenom.ffwll.local> References: <1362768363-3710-1-git-send-email-jbarnes@virtuousgeek.org> <1362768363-3710-18-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-ee0-f44.google.com (mail-ee0-f44.google.com [74.125.83.44]) by gabe.freedesktop.org (Postfix) with ESMTP id B001CE6610 for ; Tue, 19 Mar 2013 12:21:02 -0700 (PDT) Received: by mail-ee0-f44.google.com with SMTP id l10so437245eei.31 for ; Tue, 19 Mar 2013 12:21:01 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1362768363-3710-18-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 08, 2013 at 10:46:01AM -0800, Jesse Barnes wrote: > v2: clean up init ordering (Daniel) > > Signed-off-by: Jesse Barnes Queued for -next with a pimped commit message, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index 4d222ec..a285132 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -1034,12 +1034,12 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > BUG(); > } > > - if (!HAS_PCH_SPLIT(dev)) { > - intel_hdmi->write_infoframe = g4x_write_infoframe; > - intel_hdmi->set_infoframes = g4x_set_infoframes; > - } else if (IS_VALLEYVIEW(dev)) { > + if (IS_VALLEYVIEW(dev)) { > intel_hdmi->write_infoframe = vlv_write_infoframe; > intel_hdmi->set_infoframes = vlv_set_infoframes; > + } else if (!HAS_PCH_SPLIT(dev)) { > + intel_hdmi->write_infoframe = g4x_write_infoframe; > + intel_hdmi->set_infoframes = g4x_set_infoframes; > } else if (HAS_DDI(dev)) { > intel_hdmi->write_infoframe = hsw_write_infoframe; > intel_hdmi->set_infoframes = hsw_set_infoframes; > -- > 1.7.10.4 > > _______________________________________________ > 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