lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 40/86] drm/i915: HDMI hot remove notification to audio driver
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Wu Fengguang <fengguang.wu@intel.com>

    commit 2deed761188d7480eb5f7efbfe7aa77f09322ed8 upstream.

    On HDMI monitor hot remove, clear SDVO_AUDIO_ENABLE accordingly, so that
    the audio driver will receive hot plug events and take action to refresh
    its device state and ELD contents.

    The cleared SDVO_AUDIO_ENABLE bit needs to be restored to prevent losing
    HDMI audio after DPMS on.

    CC: Wang Zhenyu <zhenyu.z.wang@intel.com>
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/i915/intel_hdmi.c
    +++ b/drivers/gpu/drm/i915/intel_hdmi.c
    @@ -269,6 +269,10 @@ static void intel_hdmi_dpms(struct drm_e
    struct drm_i915_private *dev_priv = dev->dev_private;
    struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
    u32 temp;
    + u32 enable_bits = SDVO_ENABLE;
    +
    + if (intel_hdmi->has_audio)
    + enable_bits |= SDVO_AUDIO_ENABLE;

    temp = I915_READ(intel_hdmi->sdvox_reg);

    @@ -281,9 +285,9 @@ static void intel_hdmi_dpms(struct drm_e
    }

    if (mode != DRM_MODE_DPMS_ON) {
    - temp &= ~SDVO_ENABLE;
    + temp &= ~enable_bits;
    } else {
    - temp |= SDVO_ENABLE;
    + temp |= enable_bits;
    }

    I915_WRITE(intel_hdmi->sdvox_reg, temp);



    \
     
     \ /
      Last update: 2012-02-11 00:19    [W:0.035 / U:0.936 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site