lkml.org 
[lkml]   [2015]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 052/104] drm/qxl: only report first monitor as connected if we have no state
    Date
    3.16.7-ckt19 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Dave Airlie <airlied@redhat.com>

    commit 69e5d3f893e19613486f300fd6e631810338aa4b upstream.

    If the server isn't new enough to give us state, report the first
    monitor as always connected, otherwise believe the server side.

    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/qxl/qxl_display.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
    index db72b4c17987..6071a9943ed9 100644
    --- a/drivers/gpu/drm/qxl/qxl_display.c
    +++ b/drivers/gpu/drm/qxl/qxl_display.c
    @@ -820,13 +820,15 @@ static enum drm_connector_status qxl_conn_detect(
    drm_connector_to_qxl_output(connector);
    struct drm_device *ddev = connector->dev;
    struct qxl_device *qdev = ddev->dev_private;
    - int connected;
    + bool connected = false;

    /* The first monitor is always connected */
    - connected = (output->index == 0) ||
    - (qdev->client_monitors_config &&
    - qdev->client_monitors_config->count > output->index &&
    - qxl_head_enabled(&qdev->client_monitors_config->heads[output->index]));
    + if (!qdev->client_monitors_config) {
    + if (output->index == 0)
    + connected = true;
    + } else
    + connected = qdev->client_monitors_config->count > output->index &&
    + qxl_head_enabled(&qdev->client_monitors_config->heads[output->index]);

    DRM_DEBUG("#%d connected: %d\n", output->index, connected);
    if (!connected)

    \
     
     \ /
      Last update: 2015-10-26 15:41    [W:3.892 / U:0.752 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site