Commit 6f2e8acd authored by Aditya Pakki's avatar Aditya Pakki Committed by Alex Deucher
Browse files

drm/radeon: fix multiple reference count leak 



On calling pm_runtime_get_sync() the reference count of the device
is incremented. In case of failure, decrement the
reference count before returning the error.

Signed-off-by: default avatarAditya Pakki <pakki001@umn.edu>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 74a353ff

drivers/gpu/drm/radeon/radeon_connectors.c

+15 −5
Original line number Diff line number Diff line
@@ -879,9 +879,11 @@ radeon_lvds_detect(struct drm_connector *connector, bool force) 


	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

		if (r < 0) {

			pm_runtime_put_autosuspend(connector->dev->dev);

			return connector_status_disconnected;

		}

	}



	if (encoder) {

		struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
@@ -1025,9 +1027,11 @@ radeon_vga_detect(struct drm_connector *connector, bool force) 


	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

		if (r < 0) {

			pm_runtime_put_autosuspend(connector->dev->dev);

			return connector_status_disconnected;

		}

	}



	encoder = radeon_best_single_encoder(connector);

	if (!encoder)
@@ -1163,9 +1167,11 @@ radeon_tv_detect(struct drm_connector *connector, bool force) 


	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

		if (r < 0) {

			pm_runtime_put_autosuspend(connector->dev->dev);

			return connector_status_disconnected;

		}

	}



	encoder = radeon_best_single_encoder(connector);

	if (!encoder)
@@ -1247,9 +1253,11 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) 


	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

		if (r < 0) {

			pm_runtime_put_autosuspend(connector->dev->dev);

			return connector_status_disconnected;

		}

	}



	if (radeon_connector->detected_hpd_without_ddc) {

		force = true;
@@ -1657,9 +1665,11 @@ radeon_dp_detect(struct drm_connector *connector, bool force) 


	if (!drm_kms_helper_is_poll_worker()) {

		r = pm_runtime_get_sync(connector->dev->dev);

		if (r < 0)

		if (r < 0) {

			pm_runtime_put_autosuspend(connector->dev->dev);

			return connector_status_disconnected;

		}

	}



	if (!force && radeon_check_hpd_status_unchanged(connector)) {

		ret = connector->status;

CRA Git | Maintained and supported by SUSTech CRA and CCSE