Merge tag 'drm-misc-next-fixes-2020-12-15' of git://anongit.freedesktop.org/drm/drm...

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / radeon / radeon_ttm.c

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 2b59814..d59ef6e 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -51,6 +51,7 @@
 
 #include "radeon_reg.h"
 #include "radeon.h"
+#include "radeon_ttm.h"
 
 static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
 static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);
@@ -509,20 +510,18 @@ static void radeon_ttm_backend_destroy(struct ttm_bo_device *bdev, struct ttm_tt
 static struct ttm_tt *radeon_ttm_tt_create(struct ttm_buffer_object *bo,
                                           uint32_t page_flags)
 {
-       struct radeon_device *rdev;
        struct radeon_ttm_tt *gtt;
        enum ttm_caching caching;
        struct radeon_bo *rbo;
-
-       rbo = container_of(bo, struct radeon_bo, tbo);
-
-       rdev = radeon_get_rdev(bo->bdev);
 #if IS_ENABLED(CONFIG_AGP)
+       struct radeon_device *rdev = radeon_get_rdev(bo->bdev);
+
        if (rdev->flags & RADEON_IS_AGP) {
                return ttm_agp_tt_create(bo, rdev->ddev->agp->bridge,
                                         page_flags);
        }
 #endif
+       rbo = container_of(bo, struct radeon_bo, tbo);
 
        gtt = kzalloc(sizeof(struct radeon_ttm_tt), GFP_KERNEL);
        if (gtt == NULL) {