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

drm/amd: 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 849ad2a3

drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

+0 −1
Original line number Diff line number Diff line
@@ -507,7 +507,6 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
				pm_runtime_get_sync(adev_to_drm(adev)->dev);

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

				drm_helper_hpd_irq_event(adev_to_drm(adev));

				pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

				pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			}

		}

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

+4 −12
Original line number Diff line number Diff line
@@ -734,10 +734,8 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) 


	amdgpu_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;

}
@@ -919,10 +917,8 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) 
	amdgpu_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;

}
@@ -1146,10 +1142,8 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) 
	amdgpu_connector_update_scratch_regs(connector, ret);



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;

}
@@ -1486,10 +1480,8 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) 


	amdgpu_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);

	}



	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||

	    connector->connector_type == DRM_MODE_CONNECTOR_eDP)

drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c

+0 −25
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, 
	if (use_bank) {

		if ((sh_bank != 0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) ||

		    (se_bank != 0xFFFFFFFF && se_bank >= adev->gfx.config.max_shader_engines)) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			amdgpu_virt_disable_access_debugfs(adev);

			return -EINVAL;
@@ -179,7 +178,6 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, 
	if (pm_pg_lock)

		mutex_unlock(&adev->pm.mutex);



	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	amdgpu_virt_disable_access_debugfs(adev);
@@ -255,7 +253,6 @@ static ssize_t amdgpu_debugfs_regs2_op(struct file *f, char __user *buf, u32 off 
	if (rd->id.use_grbm) {

		if ((rd->id.grbm.sh != 0xFFFFFFFF && rd->id.grbm.sh >= adev->gfx.config.max_sh_per_se) ||

		    (rd->id.grbm.se != 0xFFFFFFFF && rd->id.grbm.se >= adev->gfx.config.max_shader_engines)) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			amdgpu_virt_disable_access_debugfs(adev);

			mutex_unlock(&rd->lock);
@@ -310,7 +307,6 @@ static ssize_t amdgpu_debugfs_regs2_op(struct file *f, char __user *buf, u32 off 


	mutex_unlock(&rd->lock);



	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	amdgpu_virt_disable_access_debugfs(adev);
@@ -446,7 +442,6 @@ static ssize_t amdgpu_debugfs_gprwave_read(struct file *f, char __user *buf, siz 
	amdgpu_gfx_select_se_sh(adev, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, rd->id.xcc_id);

	mutex_unlock(&adev->grbm_idx_mutex);



	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	if (!x) {
@@ -557,7 +552,6 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf, 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

	amdgpu_virt_disable_access_debugfs(adev);

	return r;
@@ -617,7 +611,6 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

	amdgpu_virt_disable_access_debugfs(adev);

	return r;
@@ -676,7 +669,6 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

	amdgpu_virt_disable_access_debugfs(adev);

	return r;
@@ -736,7 +728,6 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

	amdgpu_virt_disable_access_debugfs(adev);

	return r;
@@ -795,7 +786,6 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf, 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

	amdgpu_virt_disable_access_debugfs(adev);

	return r;
@@ -855,7 +845,6 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user * 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

	amdgpu_virt_disable_access_debugfs(adev);

	return r;
@@ -1003,7 +992,6 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, 


	r = amdgpu_dpm_read_sensor(adev, idx, &values[0], &valuesize);



	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	if (r) {
@@ -1094,7 +1082,6 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf, 
	amdgpu_gfx_select_se_sh(adev, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0);

	mutex_unlock(&adev->grbm_idx_mutex);



	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	if (!x) {
@@ -1192,7 +1179,6 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, 
	amdgpu_gfx_select_se_sh(adev, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0);

	mutex_unlock(&adev->grbm_idx_mutex);



	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	while (size) {
@@ -1266,7 +1252,6 @@ static ssize_t amdgpu_debugfs_gfxoff_residency_read(struct file *f, char __user 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return r;
@@ -1315,7 +1300,6 @@ static ssize_t amdgpu_debugfs_gfxoff_residency_write(struct file *f, const char 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return r;
@@ -1365,7 +1349,6 @@ static ssize_t amdgpu_debugfs_gfxoff_count_read(struct file *f, char __user *buf 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return r;
@@ -1414,7 +1397,6 @@ static ssize_t amdgpu_debugfs_gfxoff_write(struct file *f, const char __user *bu 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return r;
@@ -1460,7 +1442,6 @@ static ssize_t amdgpu_debugfs_gfxoff_read(struct file *f, char __user *buf, 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return r;
@@ -1501,7 +1482,6 @@ static ssize_t amdgpu_debugfs_gfxoff_status_read(struct file *f, char __user *bu 


	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return r;
@@ -1701,7 +1681,6 @@ static int amdgpu_debugfs_test_ib_show(struct seq_file *m, void *unused) 


	up_write(&adev->reset_domain->sem);



	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);



	return 0;
@@ -1721,7 +1700,6 @@ static int amdgpu_debugfs_evict_vram(void *data, u64 *val) 


	*val = amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM);



	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);



	return 0;
@@ -1742,7 +1720,6 @@ static int amdgpu_debugfs_evict_gtt(void *data, u64 *val) 


	*val = amdgpu_ttm_evict_resources(adev, TTM_PL_TT);



	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);



	return 0;
@@ -1762,7 +1739,6 @@ static int amdgpu_debugfs_benchmark(void *data, u64 val) 


	r = amdgpu_benchmark(adev, val);



	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);



	return r;
@@ -2014,7 +1990,6 @@ static int amdgpu_debugfs_sclk_set(void *data, u64 val) 
		ret = -EINVAL;



out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return ret;

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

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

			active = true;



	pm_runtime_mark_last_busy(dev->dev);



	adev = drm_to_adev(dev);

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

	 * take the current one

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -2228,7 +2228,6 @@ static void amdgpu_get_secondary_funcs(struct amdgpu_device *adev) 
						adev->pdev->bus->number, i);

		if (p) {

			pm_runtime_get_sync(&p->dev);

			pm_runtime_mark_last_busy(&p->dev);

			pm_runtime_put_autosuspend(&p->dev);

			pci_dev_put(p);

		}
@@ -2474,7 +2473,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 


		pm_runtime_allow(ddev->dev);



		pm_runtime_mark_last_busy(ddev->dev);

		pm_runtime_put_autosuspend(ddev->dev);



		pci_wake_from_d3(pdev, TRUE);
@@ -2920,7 +2918,6 @@ static int amdgpu_pmops_runtime_idle(struct device *dev) 


	ret = amdgpu_runtime_idle_check_userq(dev);

done:

	pm_runtime_mark_last_busy(dev);

	pm_runtime_autosuspend(dev);

	return ret;

}
@@ -2956,7 +2953,6 @@ long amdgpu_drm_ioctl(struct file *filp, 


	ret = drm_ioctl(filp, cmd, arg);



	pm_runtime_mark_last_busy(dev->dev);

out:

	pm_runtime_put_autosuspend(dev->dev);

	return ret;