diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_tv.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_tv.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index e211eef4b7e4..c69d3ce1b3d6 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c | |||
@@ -1311,6 +1311,7 @@ intel_tv_detect(struct drm_connector *connector, bool force) | |||
1311 | { | 1311 | { |
1312 | struct drm_display_mode mode; | 1312 | struct drm_display_mode mode; |
1313 | struct intel_tv *intel_tv = intel_attached_tv(connector); | 1313 | struct intel_tv *intel_tv = intel_attached_tv(connector); |
1314 | enum drm_connector_status status; | ||
1314 | int type; | 1315 | int type; |
1315 | 1316 | ||
1316 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n", | 1317 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n", |
@@ -1323,16 +1324,24 @@ intel_tv_detect(struct drm_connector *connector, bool force) | |||
1323 | struct intel_load_detect_pipe tmp; | 1324 | struct intel_load_detect_pipe tmp; |
1324 | struct drm_modeset_acquire_ctx ctx; | 1325 | struct drm_modeset_acquire_ctx ctx; |
1325 | 1326 | ||
1327 | drm_modeset_acquire_init(&ctx, 0); | ||
1328 | |||
1326 | if (intel_get_load_detect_pipe(connector, &mode, &tmp, &ctx)) { | 1329 | if (intel_get_load_detect_pipe(connector, &mode, &tmp, &ctx)) { |
1327 | type = intel_tv_detect_type(intel_tv, connector); | 1330 | type = intel_tv_detect_type(intel_tv, connector); |
1328 | intel_release_load_detect_pipe(connector, &tmp, &ctx); | 1331 | intel_release_load_detect_pipe(connector, &tmp); |
1332 | status = type < 0 ? | ||
1333 | connector_status_disconnected : | ||
1334 | connector_status_connected; | ||
1329 | } else | 1335 | } else |
1330 | return connector_status_unknown; | 1336 | status = connector_status_unknown; |
1337 | |||
1338 | drm_modeset_drop_locks(&ctx); | ||
1339 | drm_modeset_acquire_fini(&ctx); | ||
1331 | } else | 1340 | } else |
1332 | return connector->status; | 1341 | return connector->status; |
1333 | 1342 | ||
1334 | if (type < 0) | 1343 | if (status != connector_status_connected) |
1335 | return connector_status_disconnected; | 1344 | return status; |
1336 | 1345 | ||
1337 | intel_tv->type = type; | 1346 | intel_tv->type = type; |
1338 | intel_tv_find_better_format(connector); | 1347 | intel_tv_find_better_format(connector); |