diff options
| author |   Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-02-14 11:06:52 +0100 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2017-02-16 11:44:26 -0500 |
| commit | 5187b6cd1d22a010e7701e3ed74bdf0ad175904a (patch) | |
| tree | d534085302a47ab1ffed5bdaedf738b6791b996a /include/drm | |
| parent | drm/amd/amdgpu: Fix flow control in uvd_v4_2_stop() (diff) | |
| download | linux-dev-5187b6cd1d22a010e7701e3ed74bdf0ad175904a.tar.xz linux-dev-5187b6cd1d22a010e7701e3ed74bdf0ad175904a.zip | |
drm/ttm: make TTM_MAX_BO_PRIORITY unsigned
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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 7e75fa053473..a8e8db024980 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 { /** |