Message ID | 1362172471-7643-24-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Mar 01, 2013 at 01:14:26PM -0800, Jesse Barnes wrote: > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > drivers/gpu/drm/i915/intel_hdmi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index fcb36c6..9982b7f 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -1038,7 +1038,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > BUG(); > } > > - if (!HAS_PCH_SPLIT(dev)) { > + if (!HAS_PCH_SPLIT(dev) && !IS_VALLEYVIEW(dev)) { We have an IS_VLV block right below ... move it up? Or just rework the if ladder here to not use negation, that's imo easier to parse, too. -Daniel > intel_hdmi->write_infoframe = g4x_write_infoframe; > intel_hdmi->set_infoframes = g4x_set_infoframes; > } else if (IS_VALLEYVIEW(dev)) { > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, 6 Mar 2013 20:00:37 +0100 Daniel Vetter <daniel@ffwll.ch> wrote: > On Fri, Mar 01, 2013 at 01:14:26PM -0800, Jesse Barnes wrote: > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > --- > > drivers/gpu/drm/i915/intel_hdmi.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > > index fcb36c6..9982b7f 100644 > > --- a/drivers/gpu/drm/i915/intel_hdmi.c > > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > > @@ -1038,7 +1038,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > > BUG(); > > } > > > > - if (!HAS_PCH_SPLIT(dev)) { > > + if (!HAS_PCH_SPLIT(dev) && !IS_VALLEYVIEW(dev)) { > > We have an IS_VLV block right below ... move it up? Or just rework the if > ladder here to not use negation, that's imo easier to parse, too. > -Daniel > > > intel_hdmi->write_infoframe = g4x_write_infoframe; > > intel_hdmi->set_infoframes = g4x_set_infoframes; > > } else if (IS_VALLEYVIEW(dev)) { > > -- Yeah that would be better.
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index fcb36c6..9982b7f 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1038,7 +1038,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, BUG(); } - if (!HAS_PCH_SPLIT(dev)) { + if (!HAS_PCH_SPLIT(dev) && !IS_VALLEYVIEW(dev)) { intel_hdmi->write_infoframe = g4x_write_infoframe; intel_hdmi->set_infoframes = g4x_set_infoframes; } else if (IS_VALLEYVIEW(dev)) {
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)