drm/qxl: only report first monitor as connected if we have no state
Subsystems (3)
Dave Airlie
maintainerPATCH 1/1 drm/qxl: only report first monitor as connected if we have no state
From: Dave Airlie <[email protected]>
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 <[email protected]>
--- drivers/gpu/drm/qxl/qxl_display.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/qxl/qxl_display.c +7 -5
@@ -886,13 +886,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)
Signature · 6 lines
2.4.3 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel