This is a note to let you know that I've just added the patch titled
Revert "drm/amdgpu: make display pinning more flexible (v2)"
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-drm-amdgpu-make-display-pinning-more-flexible-v2.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From alexander.deucher@xxxxxxx Sun Jan 22 15:15:38 2023
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Mon, 16 Jan 2023 16:44:11 -0500
Subject: Revert "drm/amdgpu: make display pinning more flexible (v2)"
To: <gregkh@xxxxxxxxxxxxxxxxxxx>, <stable@xxxxxxxxxxxxxxx>
Cc: Alex Deucher <alexander.deucher@xxxxxxx>, <kolAflash@xxxxxxxxxxxx>, <jrf@xxxxxxxxxxx>, <mario.limonciello@xxxxxxx>
Message-ID: <20230116214411.1091288-1-alexander.deucher@xxxxxxx>
From: Alex Deucher <alexander.deucher@xxxxxxx>
This reverts commit 630270978483a63dd641c1183a179437ab4900df which is
commit 81d0bcf9900932633d270d5bc4a54ff599c6ebdb upstream.
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@xxxxxxx>
Cc: kolAflash@xxxxxxxxxxxx
Cc: jrf@xxxxxxxxxxx
Cc: mario.limonciello@xxxxxxx
Cc: stable@xxxxxxxxxxxxxxx # 5.15.x
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1531,8 +1531,7 @@ u64 amdgpu_bo_gpu_offset_no_check(struct
uint32_t amdgpu_bo_get_preferred_pin_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;
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-5.10/drm-amd-display-fix-set-scaling-doesn-s-work.patch
queue-5.10/drm-amd-display-calculate-output_color_space-after-pixel-encoding-adjustment.patch
queue-5.10/revert-drm-amdgpu-make-display-pinning-more-flexible-v2.patch
queue-5.10/drm-amd-display-fix-color_space_ycbcr2020_type-matrix.patch
