[Public] > -----Original Message----- > From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Sent: Monday, January 16, 2023 10:50 AM > To: stable@xxxxxxxxxxxxxxx > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>; > patches@xxxxxxxxxxxxxxx; Tuikov, Luben <Luben.Tuikov@xxxxxxx>; Koenig, > Christian <Christian.Koenig@xxxxxxx>; Deucher, Alexander > <Alexander.Deucher@xxxxxxx> > Subject: [PATCH 5.4 537/658] drm/amdgpu: make display pinning more > flexible (v2) > > From: Alex Deucher <alexander.deucher@xxxxxxx> > > commit 81d0bcf9900932633d270d5bc4a54ff599c6ebdb upstream. > > Only apply the static threshold for Stoney and Carrizo. > This hardware has certain requirements that don't allow mixing of GTT and > VRAM. Newer asics do not have these requirements so we should be able to > be more flexible with where buffers end up. > > Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2270 > Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2291 > Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2255 > Acked-by: Luben Tuikov <luben.tuikov@xxxxxxx> > Reviewed-by: Christian König <christian.koenig@xxxxxxx> > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Let's drop this patch. There are regressions for hibernation on some platforms on kernels older than 6.1.x Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > @@ -1458,7 +1458,8 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_b > 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)) { > + if ((domain == (AMDGPU_GEM_DOMAIN_VRAM | > AMDGPU_GEM_DOMAIN_GTT)) && > + ((adev->asic_type == CHIP_CARRIZO) || (adev->asic_type == > +CHIP_STONEY))) { > domain = AMDGPU_GEM_DOMAIN_VRAM; > if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD) > domain = AMDGPU_GEM_DOMAIN_GTT; >
