Commit 1bc9d392 authored by Sakari Ailus's avatar Sakari Ailus Committed by Alex Deucher
Browse files

drm/radeon: Remove redundant pm_runtime_mark_last_busy() calls 



pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(),
pm_runtime_autosuspend() and pm_request_autosuspend() now include a call
to pm_runtime_mark_last_busy(). Remove the now-redundant explicit call to
pm_runtime_mark_last_busy().

Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ef4a4b87

drivers/gpu/drm/radeon/radeon_acpi.c

+0 −1
Original line number Diff line number Diff line
@@ -408,7 +408,6 @@ static int radeon_atif_handler(struct radeon_device *rdev, 
			pm_runtime_get_sync(rdev_to_drm(rdev)->dev);

			/* Just fire off a uevent and let userspace tell us what to do */

			drm_helper_hpd_irq_event(rdev_to_drm(rdev));

			pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev);

			pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);

		}

	}

drivers/gpu/drm/radeon/radeon_connectors.c

+5 −15
Original line number Diff line number Diff line
@@ -875,10 +875,8 @@ radeon_lvds_detect(struct drm_connector *connector, bool force) 


	radeon_connector_update_scratch_regs(connector, ret);



	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -1066,10 +1064,8 @@ radeon_vga_detect(struct drm_connector *connector, bool force) 
	radeon_connector_update_scratch_regs(connector, ret);



out:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -1154,10 +1150,8 @@ radeon_tv_detect(struct drm_connector *connector, bool force) 
		ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, false);

	radeon_connector_update_scratch_regs(connector, ret);



	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -1402,10 +1396,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) 
	}



exit:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}
@@ -1714,10 +1706,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force) 
	}



out:

	if (!drm_kms_helper_is_poll_worker()) {

		pm_runtime_mark_last_busy(connector->dev->dev);

	if (!drm_kms_helper_is_poll_worker())

		pm_runtime_put_autosuspend(connector->dev->dev);

	}



	return ret;

}

drivers/gpu/drm/radeon/radeon_display.c

+0 −2
Original line number Diff line number Diff line
@@ -644,8 +644,6 @@ radeon_crtc_set_config(struct drm_mode_set *set, 
		if (crtc->enabled)

			active = true;



	pm_runtime_mark_last_busy(dev->dev);



	rdev = dev->dev_private;

	/* if we have active crtcs and we don't have a power ref,

	   take the current one */

drivers/gpu/drm/radeon/radeon_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ static int radeon_pmops_runtime_idle(struct device *dev) 
		}

	}



	pm_runtime_mark_last_busy(dev);

	pm_runtime_autosuspend(dev);

	/* we don't want the main rpm_idle to call suspend - we want to autosuspend */

	return 1;
@@ -484,7 +483,6 @@ long radeon_drm_ioctl(struct file *filp, 


	ret = drm_ioctl(filp, cmd, arg);



	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);

	return ret;

}

drivers/gpu/drm/radeon/radeon_fbdev.c

+0 −2
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static int radeon_fbdev_fb_open(struct fb_info *info, int user) 
	return 0;



err_pm_runtime_mark_last_busy:

	pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev);

	pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);

	return ret;

}
@@ -164,7 +163,6 @@ static int radeon_fbdev_fb_release(struct fb_info *info, int user) 
	struct drm_fb_helper *fb_helper = info->par;

	struct radeon_device *rdev = fb_helper->dev->dev_private;



	pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev);

	pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);



	return 0;