|
@@ -737,9 +737,11 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force)
|
|
|
enum drm_connector_status ret = connector_status_disconnected;
|
|
|
int r;
|
|
|
|
|
|
- r = pm_runtime_get_sync(connector->dev->dev);
|
|
|
- if (r < 0)
|
|
|
- return connector_status_disconnected;
|
|
|
+ if (!drm_kms_helper_is_poll_worker()) {
|
|
|
+ r = pm_runtime_get_sync(connector->dev->dev);
|
|
|
+ if (r < 0)
|
|
|
+ return connector_status_disconnected;
|
|
|
+ }
|
|
|
|
|
|
if (encoder) {
|
|
|
struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
|
|
@@ -758,8 +760,12 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force)
|
|
|
/* check acpi lid status ??? */
|
|
|
|
|
|
amdgpu_connector_update_scratch_regs(connector, ret);
|
|
|
- pm_runtime_mark_last_busy(connector->dev->dev);
|
|
|
- pm_runtime_put_autosuspend(connector->dev->dev);
|
|
|
+
|
|
|
+ if (!drm_kms_helper_is_poll_worker()) {
|
|
|
+ pm_runtime_mark_last_busy(connector->dev->dev);
|
|
|
+ pm_runtime_put_autosuspend(connector->dev->dev);
|
|
|
+ }
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -869,9 +875,11 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)
|
|
|
enum drm_connector_status ret = connector_status_disconnected;
|
|
|
int r;
|
|
|
|
|
|
- r = pm_runtime_get_sync(connector->dev->dev);
|
|
|
- if (r < 0)
|
|
|
- return connector_status_disconnected;
|
|
|
+ if (!drm_kms_helper_is_poll_worker()) {
|
|
|
+ r = pm_runtime_get_sync(connector->dev->dev);
|
|
|
+ if (r < 0)
|
|
|
+ return connector_status_disconnected;
|
|
|
+ }
|
|
|
|
|
|
encoder = amdgpu_connector_best_single_encoder(connector);
|
|
|
if (!encoder)
|
|
@@ -925,8 +933,10 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)
|
|
|
amdgpu_connector_update_scratch_regs(connector, ret);
|
|
|
|
|
|
out:
|
|
|
- pm_runtime_mark_last_busy(connector->dev->dev);
|
|
|
- pm_runtime_put_autosuspend(connector->dev->dev);
|
|
|
+ if (!drm_kms_helper_is_poll_worker()) {
|
|
|
+ pm_runtime_mark_last_busy(connector->dev->dev);
|
|
|
+ pm_runtime_put_autosuspend(connector->dev->dev);
|
|
|
+ }
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -989,9 +999,11 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)
|
|
|
enum drm_connector_status ret = connector_status_disconnected;
|
|
|
bool dret = false, broken_edid = false;
|
|
|
|
|
|
- r = pm_runtime_get_sync(connector->dev->dev);
|
|
|
- if (r < 0)
|
|
|
- return connector_status_disconnected;
|
|
|
+ if (!drm_kms_helper_is_poll_worker()) {
|
|
|
+ r = pm_runtime_get_sync(connector->dev->dev);
|
|
|
+ if (r < 0)
|
|
|
+ return connector_status_disconnected;
|
|
|
+ }
|
|
|
|
|
|
if (!force && amdgpu_connector_check_hpd_status_unchanged(connector)) {
|
|
|
ret = connector->status;
|
|
@@ -1116,8 +1128,10 @@ out:
|
|
|
amdgpu_connector_update_scratch_regs(connector, ret);
|
|
|
|
|
|
exit:
|
|
|
- pm_runtime_mark_last_busy(connector->dev->dev);
|
|
|
- pm_runtime_put_autosuspend(connector->dev->dev);
|
|
|
+ if (!drm_kms_helper_is_poll_worker()) {
|
|
|
+ pm_runtime_mark_last_busy(connector->dev->dev);
|
|
|
+ pm_runtime_put_autosuspend(connector->dev->dev);
|
|
|
+ }
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -1360,9 +1374,11 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
|
|
|
struct drm_encoder *encoder = amdgpu_connector_best_single_encoder(connector);
|
|
|
int r;
|
|
|
|
|
|
- r = pm_runtime_get_sync(connector->dev->dev);
|
|
|
- if (r < 0)
|
|
|
- return connector_status_disconnected;
|
|
|
+ if (!drm_kms_helper_is_poll_worker()) {
|
|
|
+ r = pm_runtime_get_sync(connector->dev->dev);
|
|
|
+ if (r < 0)
|
|
|
+ return connector_status_disconnected;
|
|
|
+ }
|
|
|
|
|
|
if (!force && amdgpu_connector_check_hpd_status_unchanged(connector)) {
|
|
|
ret = connector->status;
|
|
@@ -1430,8 +1446,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
|
|
|
|
|
|
amdgpu_connector_update_scratch_regs(connector, ret);
|
|
|
out:
|
|
|
- pm_runtime_mark_last_busy(connector->dev->dev);
|
|
|
- pm_runtime_put_autosuspend(connector->dev->dev);
|
|
|
+ if (!drm_kms_helper_is_poll_worker()) {
|
|
|
+ pm_runtime_mark_last_busy(connector->dev->dev);
|
|
|
+ pm_runtime_put_autosuspend(connector->dev->dev);
|
|
|
+ }
|
|
|
|
|
|
return ret;
|
|
|
}
|