diff mbox

drm/ttm: make TTM_MAX_BO_PRIORITY unsigned

Message ID 20170214122557.7705-1-nhaehnle@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Nicolai Hähnle Feb. 14, 2017, 12:25 p.m. UTC
From: Nicolai Hähnle <nicolai.haehnle@amd.com>

Fix a warning about different types in min() macro in amdgpu:

In file included from ./include/linux/list.h:8:0,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:32:
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c: In function ‘amdgpu_bo_create_restricted’:
./include/linux/kernel.h:739:16: warning: comparison of distinct pointer types lacks a cast
  (void) (&min1 == &min2);   \
                ^
./include/linux/kernel.h:742:2: note: in expansion of macro ‘__min’
  __min(typeof(x), typeof(y),   \
  ^~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:434:21: note: in expansion of macro ‘min’
  bo->tbo.priority = min(bo->tbo.priority, TTM_MAX_BO_PRIORITY - 1);
                     ^~~

Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---
 include/drm/ttm/ttm_bo_driver.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Christian König Feb. 14, 2017, 12:46 p.m. UTC | #1
Am 14.02.2017 um 13:25 schrieb Nicolai Hähnle:
> From: Nicolai Hähnle <nicolai.haehnle@amd.com>
>
> Fix a warning about different types in min() macro in amdgpu:
>
> In file included from ./include/linux/list.h:8:0,
>                   from drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:32:
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c: In function ‘amdgpu_bo_create_restricted’:
> ./include/linux/kernel.h:739:16: warning: comparison of distinct pointer types lacks a cast
>    (void) (&min1 == &min2);   \
>                  ^
> ./include/linux/kernel.h:742:2: note: in expansion of macro ‘__min’
>    __min(typeof(x), typeof(y),   \
>    ^~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:434:21: note: in expansion of macro ‘min’
>    bo->tbo.priority = min(bo->tbo.priority, TTM_MAX_BO_PRIORITY - 1);
>                       ^~~
>
> Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   include/drm/ttm/ttm_bo_driver.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index 4395db1..c3d74be 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -42,7 +42,7 @@
>   #include <linux/spinlock.h>
>   #include <linux/reservation.h>
>   
> -#define TTM_MAX_BO_PRIORITY	16
> +#define TTM_MAX_BO_PRIORITY	16U
>   
>   struct ttm_backend_func {
>   	/**
diff mbox

Patch

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 4395db1..c3d74be 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -42,7 +42,7 @@ 
 #include <linux/spinlock.h>
 #include <linux/reservation.h>
 
-#define TTM_MAX_BO_PRIORITY	16
+#define TTM_MAX_BO_PRIORITY	16U
 
 struct ttm_backend_func {
 	/**