lkml.org 
[lkml]   [2011]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/4] drm/i915: dont trigger hotplug events on unchanged ELD
    The ELD may or may not change when switching the video mode.
    If unchanged, don't trigger hot plug events to HDMI audio driver.

    This avoids disturbing the user with repeated printks.

    Reported-by: Nick Bowler <nbowler@elliptictech.com>
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    ---
    drivers/gpu/drm/i915/intel_display.c | 51 ++++++++++++++++++++++---
    1 file changed, 46 insertions(+), 5 deletions(-)

    --- linux.orig/drivers/gpu/drm/i915/intel_display.c 2011-11-24 08:25:26.000000000 +0800
    +++ linux/drivers/gpu/drm/i915/intel_display.c 2011-11-24 08:25:27.000000000 +0800
    @@ -5811,6 +5811,35 @@ static int intel_crtc_mode_set(struct dr
    return ret;
    }

    +static bool intel_eld_uptodate(struct drm_connector *connector,
    + int reg_eldv, uint32_t bits_eldv,
    + int reg_elda, uint32_t bits_elda,
    + int reg_edid)
    +{
    + struct drm_i915_private *dev_priv = connector->dev->dev_private;
    + uint8_t *eld = connector->eld;
    + uint32_t i;
    +
    + i = I915_READ(reg_eldv);
    + i &= bits_eldv;
    +
    + if (!eld[0])
    + return !i;
    +
    + if (!i)
    + return false;
    +
    + i = I915_READ(reg_elda);
    + i &= ~bits_elda;
    + I915_WRITE(reg_elda, i);
    +
    + for (i = 0; i < eld[2]; i++)
    + if (I915_READ(reg_edid) != *((uint32_t *)eld + i))
    + return false;
    +
    + return true;
    +}
    +
    static void g4x_write_eld(struct drm_connector *connector,
    struct drm_crtc *crtc)
    {
    @@ -5827,6 +5856,12 @@ static void g4x_write_eld(struct drm_con
    else
    eldv = G4X_ELDV_DEVCTG;

    + if (intel_eld_uptodate(connector,
    + G4X_AUD_CNTL_ST, eldv,
    + G4X_AUD_CNTL_ST, G4X_ELD_ADDR,
    + G4X_HDMIW_HDMIEDID))
    + return;
    +
    i = I915_READ(G4X_AUD_CNTL_ST);
    i &= ~(eldv | G4X_ELD_ADDR);
    len = (i >> 9) & 0x1f; /* ELD buffer size */
    @@ -5886,6 +5921,17 @@ static void ironlake_write_eld(struct dr
    eldv = IBX_ELD_VALIDB << ((i - 1) * 4);
    }

    + if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
    + DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
    + eld[5] |= (1 << 2); /* Conn_Type, 0x1 = DisplayPort */
    + }
    +
    + if (intel_eld_uptodate(connector,
    + aud_cntrl_st2, eldv,
    + aud_cntl_st, IBX_ELD_ADDRESS,
    + hdmiw_hdmiedid))
    + return;
    +
    i = I915_READ(aud_cntrl_st2);
    i &= ~eldv;
    I915_WRITE(aud_cntrl_st2, i);
    @@ -5893,11 +5939,6 @@ static void ironlake_write_eld(struct dr
    if (!eld[0])
    return;

    - if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
    - DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
    - eld[5] |= (1 << 2); /* Conn_Type, 0x1 = DisplayPort */
    - }
    -
    i = I915_READ(aud_cntl_st);
    i &= ~IBX_ELD_ADDRESS;
    I915_WRITE(aud_cntl_st, i);



    \
     
     \ /
      Last update: 2011-11-28 08:43    [W:0.026 / U:29.828 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site