Commit 04e30c9c authored by Daniel Vetter's avatar Daniel Vetter Committed by Alex Deucher
Browse files

drm/amdgpu: Merge pre/postclose hooks 



Again no apparent explanation for the split except hysterical raisins.
Merging them also makes it a bit more obviuos what's going on wrt the
runtime pm refdancing.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 78910246

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −2
Original line number Diff line number Diff line
@@ -1774,8 +1774,6 @@ void amdgpu_driver_lastclose_kms(struct drm_device *dev); 
int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);

void amdgpu_driver_postclose_kms(struct drm_device *dev,

				 struct drm_file *file_priv);

void amdgpu_driver_preclose_kms(struct drm_device *dev,

				struct drm_file *file_priv);

int amdgpu_suspend(struct amdgpu_device *adev);

int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon);

int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon);

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

+0 −1
Original line number Diff line number Diff line
@@ -689,7 +689,6 @@ static struct drm_driver kms_driver = { 
	    DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,

	.load = amdgpu_driver_load_kms,

	.open = amdgpu_driver_open_kms,

	.preclose = amdgpu_driver_preclose_kms,

	.postclose = amdgpu_driver_postclose_kms,

	.lastclose = amdgpu_driver_lastclose_kms,

	.set_busid = drm_pci_set_busid,

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

+2 −15
Original line number Diff line number Diff line
@@ -779,6 +779,8 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 
	if (!fpriv)

		return;



	pm_runtime_get_sync(dev->dev);



	amdgpu_ctx_mgr_fini(&fpriv->ctx_mgr);



	amdgpu_uvd_free_handles(adev, file_priv);
@@ -809,21 +811,6 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 
	pm_runtime_put_autosuspend(dev->dev);

}



/**

 * amdgpu_driver_preclose_kms - drm callback for pre close

 *

 * @dev: drm dev pointer

 * @file_priv: drm file

 *

 * On device pre close, tear down hyperz and cmask filps on r1xx-r5xx

 * (all asics).

 */

void amdgpu_driver_preclose_kms(struct drm_device *dev,

				struct drm_file *file_priv)

{

	pm_runtime_get_sync(dev->dev);

}



/*

 * VBlank related functions.

 */