lkml.org 
[lkml]   [2010]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] drm/i915/sdvo: Always fallback to querying the shared DDC line
    Date
    On a few devices, like the Mac Mini, the CRT DDC pins are shared between
    the analog connector and the digital connector. In this scenario, use
    the EDID to determine if a digital panel is connected to the digital
    connector.

    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    ---

    Looking closer I can't see any rationale for checking whether or not the
    analog device is attached since we check whether the display is digital
    before accepting the EDID.

    ---
    drivers/gpu/drm/i915/intel_sdvo.c | 45 +-----------------------------------
    1 files changed, 2 insertions(+), 43 deletions(-)

    diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
    index 8431825..906696f 100644
    --- a/drivers/gpu/drm/i915/intel_sdvo.c
    +++ b/drivers/gpu/drm/i915/intel_sdvo.c
    @@ -1296,55 +1296,14 @@ intel_sdvo_get_edid(struct drm_connector *connector)
    return drm_get_edid(connector, &sdvo->ddc);
    }

    -static struct drm_connector *
    -intel_find_analog_connector(struct drm_device *dev)
    -{
    - struct drm_connector *connector;
    - struct intel_sdvo *encoder;
    -
    - list_for_each_entry(encoder,
    - &dev->mode_config.encoder_list,
    - base.base.head) {
    - if (encoder->base.type == INTEL_OUTPUT_ANALOG) {
    - list_for_each_entry(connector,
    - &dev->mode_config.connector_list,
    - head) {
    - if (&encoder->base ==
    - intel_attached_encoder(connector))
    - return connector;
    - }
    - }
    - }
    -
    - return NULL;
    -}
    -
    -static int
    -intel_analog_is_connected(struct drm_device *dev)
    -{
    - struct drm_connector *analog_connector;
    -
    - analog_connector = intel_find_analog_connector(dev);
    - if (!analog_connector)
    - return false;
    -
    - if (analog_connector->funcs->detect(analog_connector, false) ==
    - connector_status_disconnected)
    - return false;
    -
    - return true;
    -}
    -
    /* Mac mini hack -- use the same DDC as the analog connector */
    static struct edid *
    intel_sdvo_get_analog_edid(struct drm_connector *connector)
    {
    struct drm_i915_private *dev_priv = connector->dev->dev_private;

    - if (!intel_analog_is_connected(connector->dev))
    - return NULL;
    -
    - return drm_get_edid(connector, &dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter);
    + return drm_get_edid(connector,
    + &dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter);
    }

    enum drm_connector_status
    --
    1.7.2.3


    \
     
     \ /
      Last update: 2010-11-23 23:45    [W:0.023 / U:4.324 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site