lkml.org 
[lkml]   [2011]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 3/3 v2] drm/i915: hot plug/unplug notification to HDMI audio driver
    On Thu, Nov 24, 2011 at 03:26:49AM +0800, Keith Packard wrote:
    > On Wed, 23 Nov 2011 16:29:58 +0800, Wu Fengguang <fengguang.wu@intel.com> wrote:
    >
    > > What I need is a hot plug hook that knows whether the monitor is
    > > plugged or removed, which is only possible if the hook is called
    > > after ->detect().
    >
    > That would be mode_set to tell you that the monitor is in use, and the
    > disable function to tell you when the monitor is no longer in use.
    >
    > You do not want to do anything to the hardware in the hot_plug paths;
    > those are strictly informative; telling user space which connectors are
    > present.

    Thanks a lot for the tips! When doing things in the right path, I got
    a much reduced patch :-)

    Due to DP being a bit more tricky than HDMI and no convenient DP test
    environment, I'll have to delay the DP part to next week...

    Thanks,
    Fengguang
    ---
    Subject: drm/i915: HDMI hot remove notification to audio driver
    Date: Fri Nov 11 13:49:04 CST 2011

    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>
    ---
    drivers/gpu/drm/i915/intel_dp.c | 4 +++-
    drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++++--
    2 files changed, 9 insertions(+), 3 deletions(-)

    --- linux.orig/drivers/gpu/drm/i915/intel_hdmi.c 2011-11-24 17:11:38.000000000 +0800
    +++ linux/drivers/gpu/drm/i915/intel_hdmi.c 2011-11-24 17:15:03.000000000 +0800
    @@ -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: 2011-11-24 10:41    [W:0.026 / U:0.392 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site