[PATCH] gpu/drm/radeon: Do not evict VRAM with disabled HIBERNATE

[Christian König]

Am 25.07.2018 um 00:15 schrieb Paul Menzel:
> From: Paul Menzel <pmenzel at molgen.mpg.de>
> Date: Wed, 18 Jul 2018 18:15:44 +0200
>
> Improve commit d796d844 (drm/radeon/kms: make hibernate work on IGPs) to
> only migrate VRAM objects if the Linux kernel is actually built with
> support for hibernation (suspend to disk).
>
> Link: https://bugs.freedesktop.org/show_bug.cgi?id=107277
> Cc: stable at vger.kernel.org
> Signed-off-by: Paul Menzel <pmenzel at molgen.mpg.de>

At least a step into the right direction.

Patch is Reviewed-by: Christian König <christian.koenig at amd.com>, but we 
are also going to need one for amdgpu.

Christian.

> ---
>  drivers/gpu/drm/radeon/radeon_object.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_object.c 
> b/drivers/gpu/drm/radeon/radeon_object.c
> index edbb4cd519fd..0cb5eb013a4f 100644
> --- a/drivers/gpu/drm/radeon/radeon_object.c
> +++ b/drivers/gpu/drm/radeon/radeon_object.c
> @@ -422,11 +422,13 @@ int radeon_bo_unpin(struct radeon_bo *bo)
>  int radeon_bo_evict_vram(struct radeon_device *rdev)
>  {
>      /* late 2.6.33 fix IGP hibernate - we need pm ops to do this 
> correct */
> -    if (0 && (rdev->flags & RADEON_IS_IGP)) {
> +#ifndef CONFIG_HIBERNATION
> +    if (rdev->flags & RADEON_IS_IGP) {
>          if (rdev->mc.igp_sideport_enabled == false)
>              /* Useless to evict on IGP chips */
>              return 0;
>      }
> +#endif
>      return ttm_bo_evict_mm(&rdev->mman.bdev, TTM_PL_VRAM);
>  }
>