diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-30 07:24:06 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-30 11:20:43 -0400 |
| commit | e6bf6e5799f72f04bac61056804d6dd8dac98062 (patch) | |
| tree | 5ded144cffb3afd4843b2956f9285febbb7c8377 /include/drm | |
| parent | 67535531b1b2bfcc707c8c37f35196cf4ede4252 (diff) | |
drm/ttm: Remove TTM_HAS_AGP
It tries to do fancy things with excluding agp support if ttm is
built-in, but agp isn't. Instead just express this depency like drm
does and use CONFIG_AGP everywhere.
Also use the neat Makefile magic to make the entire ttm_agp_backend
file optional.
v2: Use IS_ENABLED(CONFIG_AGP) as suggested by Ville
v3: Review from Emil.
v4: Actually get it right as spotted by 0-day.
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1459337046-25882-1-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 3d4bf08aa21f..cb91f80c15b3 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h | |||
| @@ -1030,8 +1030,7 @@ extern pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp); | |||
| 1030 | 1030 | ||
| 1031 | extern const struct ttm_mem_type_manager_func ttm_bo_manager_func; | 1031 | extern const struct ttm_mem_type_manager_func ttm_bo_manager_func; |
| 1032 | 1032 | ||
| 1033 | #if (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) | 1033 | #if IS_ENABLED(CONFIG_AGP) |
| 1034 | #define TTM_HAS_AGP | ||
| 1035 | #include <linux/agp_backend.h> | 1034 | #include <linux/agp_backend.h> |
| 1036 | 1035 | ||
| 1037 | /** | 1036 | /** |