[PATCH] drm/amdgpu: Fix minmax error
Christian König
ckoenig.leichtzumerken at gmail.com
Sat Nov 26 14:00:55 UTC 2022
Am 26.11.22 um 06:25 schrieb Luben Tuikov:
> Fix minmax compilation error by using the correct constant and correct integer
> suffix.
>
> Cc: James Zhu <James.Zhu at amd.com>
> Cc: Felix Kuehling <Felix.Kuehling at amd.com>
> Fixes: 58170a7a002ad6 ("drm/amdgpu: fix stall on CPU when allocate large system memory")
> Signed-off-by: Luben Tuikov <luben.tuikov at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
> index 8a2e5716d8dba2..65715cb395d838 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
> @@ -51,7 +51,7 @@
> #include "amdgpu_amdkfd.h"
> #include "amdgpu_hmm.h"
>
> -#define MAX_WALK_BYTE (64ULL<<30)
> +#define MAX_WALK_BYTE (2UL << 30)
>
> /**
> * amdgpu_hmm_invalidate_gfx - callback to notify about mm change
> @@ -197,8 +197,8 @@ int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,
> hmm_range->start, hmm_range->end);
>
> /* Assuming 512MB takes maxmium 1 second to fault page address */
> - timeout = max((hmm_range->end - hmm_range->start) >> 29, 1ULL) *
> - HMM_RANGE_DEFAULT_TIMEOUT;
> + timeout = max((hmm_range->end - hmm_range->start) >> 29, 1UL);
> + timeout *= HMM_RANGE_DEFAULT_TIMEOUT;
> timeout = jiffies + msecs_to_jiffies(timeout);
>
> retry:
>
> base-commit: 9e95ce4c60631c1339204f8723008a715391f410
More information about the amd-gfx
mailing list