lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[099/156] drm/nouveau: report unknown connector state if lid closed
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

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

    From: Ben Skeggs <bskeggs@redhat.com>

    commit b30083bdb990bcc2829fce83d871a86059ff4fc1 upstream.

    This is in preference to disconnected. If there's no other outputs
    connected this will cause LVDS to be programmed even with the lid
    closed rather than having X fail to start because of no available
    outputs.

    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/nouveau/nouveau_connector.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
    @@ -239,12 +239,14 @@ nouveau_connector_detect(struct drm_conn
    if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
    nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
    if (nv_encoder && nv_connector->native_mode) {
    + unsigned status = connector_status_connected;
    +
    #ifdef CONFIG_ACPI
    if (!nouveau_ignorelid && !acpi_lid_open())
    - return connector_status_disconnected;
    + status = connector_status_unknown;
    #endif
    nouveau_connector_set_encoder(connector, nv_encoder);
    - return connector_status_connected;
    + return status;
    }

    /* Cleanup the previous EDID block. */



    \
     
     \ /
      Last update: 2010-03-31 01:37    [W:4.032 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site