Re: linux-next: build failure after merge of the drm tree

Christian König <christian.koenig@xxxxxxx> · Thu, 17 Mar 2016 09:41:19 +0100

Hi Stephen,

yeah, indeed the release_pages() function is now used in two more files.

Your fix is Reviewed-by: Christian König <christian.koenig@xxxxxxx>.

Regards,
Christian.

Am 17.03.2016 um 05:41 schrieb Stephen Rothwell:
Hi Dave,

After merging the drm tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c: In function 'amdgpu_gem_userptr_ioctl':
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c:321:2: error: implicit declaration of function 'release_pages' [-Werror=implicit-function-declaration]
   release_pages(bo->tbo.ttm->pages, bo->tbo.ttm->num_pages, false);
   ^
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c: In function 'amdgpu_cs_parser_bos':
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:410:5: error: implicit declaration of function 'release_pages' [-Werror=implicit-function-declaration]
      release_pages(e->user_pages,
      ^

Caused by commit

   2f568dbd6b94 ("drm/amdgpu: move get_user_pages out of amdgpu_ttm_tt_pin_userptr v6")

Presumably a forgotten include file.

I added this fix patch for today:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 17 Mar 2016 15:30:49 +1100
Subject: [PATCH] drm/amdgpu: release_pages requires linux/pagemap.h

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c  | 1 +
  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 +
  2 files changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 4f5ef4149e87..9392e50a7ba4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -25,6 +25,7 @@
   *    Jerome Glisse <glisse@xxxxxxxxxxxxxxx>
   */
  #include <linux/list_sort.h>
+#include <linux/pagemap.h>
  #include <drm/drmP.h>
  #include <drm/amdgpu_drm.h>
  #include "amdgpu.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 1ecdf6c01368..0f2391ec1ed9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -26,6 +26,7 @@
   *          Jerome Glisse
   */
  #include <linux/ktime.h>
+#include <linux/pagemap.h>
  #include <drm/drmP.h>
  #include <drm/amdgpu_drm.h>
  #include "amdgpu.h"

--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html






