On Fri, Mar 08, 2013 at 10:46:01AM -0800, Jesse Barnes wrote: > v2: clean up init ordering (Daniel) > > Signed-off-by: Jesse Barnes <[email protected]> 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 > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
-- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
