On Wed, 29 Apr 2015, Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote: > On 04/29/2015 05:30 AM, Jani Nikula wrote: >> Add port check for ibx similar to vlv in >> >> commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3 >> Author: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> >> Date: Wed Apr 15 16:52:29 2015 -0700 >> >> drm/i915/vlv: check port in infoframe_enabled v2 >> >> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> >> --- >> drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c >> index 7774ca2b9bdf..65bc3867dda2 100644 >> --- a/drivers/gpu/drm/i915/intel_hdmi.c >> +++ b/drivers/gpu/drm/i915/intel_hdmi.c >> @@ -223,10 +223,14 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder) >> struct drm_device *dev = encoder->dev; >> struct drm_i915_private *dev_priv = dev->dev_private; >> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); >> + struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); >> int reg = TVIDEO_DIP_CTL(intel_crtc->pipe); >> u32 val = I915_READ(reg); >> >> - return val & VIDEO_DIP_ENABLE; >> + if (VIDEO_DIP_PORT(intel_dig_port->port) == (val & VIDEO_DIP_PORT_MASK)) >> + return val & VIDEO_DIP_ENABLE; >> + >> + return false; >> } >> >> static void cpt_write_infoframe(struct drm_encoder *encoder, >> > > Ah great, thanks Jani. R-b for both. Both pushed to drm-intel-next-queued, thanks for the review. BR, Jani. > > Jesse -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
