Re: [PATCH] Revert "drm/amdgpu: make display pinning more flexible (v2)"

[Greg KH <gregkh@linuxfoundation.org>]

On Mon, Jan 16, 2023 at 04:44:11PM -0500, Alex Deucher wrote:
> This reverts commit 78623b10fc9f8231802536538c85527dc54640a0.
> 
> This commit causes hiberation regressions on some platforms
> on kernels older than 6.1.x (6.1.x and newer kernels works
> fine) so let's revert it from 5.15 and older stable kernels.
> This should be reverted from 6.0.x as well, but that kernel
> is no longer supported.
> 
> Bug: https://bugzilla.kernel.org/show_bug.cgi?id=216917
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: kolAflash@kolahilft.de
> Cc: jrf@mailbox.org
> Cc: mario.limonciello@amd.com
> Cc: stable@vger.kernel.org # 5.15.x
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index b1d0cad00b2e..a0b1bf17cb74 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -1510,8 +1510,7 @@ u64 amdgpu_bo_gpu_offset_no_check(struct amdgpu_bo *bo)
>  uint32_t amdgpu_bo_get_preferred_domain(struct amdgpu_device *adev,
>  					    uint32_t domain)
>  {
> -	if ((domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) &&
> -	    ((adev->asic_type == CHIP_CARRIZO) || (adev->asic_type == CHIP_STONEY))) {
> +	if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
>  		domain = AMDGPU_GEM_DOMAIN_VRAM;
>  		if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)
>  			domain = AMDGPU_GEM_DOMAIN_GTT;
> -- 
> 2.39.0
> 

Now queued up, thanks.

greg k-h