[PATCH] drm: Fix O= out-of-tree builds for selftests

[PATCH] drm: Fix O= out-of-tree builds for selftests

[Daniel Vetter]

Kbuild really doesn't like non-recursive Makefiles, but they do work
as long as you build without O=

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Fixes: 50f0033d1a0f ("drm: Add some kselftests for the DRM range manager (struct drm_mm)")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Christian König <christian.koenig@amd.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com># Please enter the commit message for your changes. Lines starting
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/Makefile           | 2 +-
 drivers/gpu/drm/selftests/Makefile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpu/drm/selftests/Makefile

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index c0d1aed8588b..d00c389f24bf 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -38,7 +38,7 @@ drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
 drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
 
 obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
-obj-$(CONFIG_DRM_DEBUG_MM_SELFTEST) += selftests/test-drm_mm.o
+obj-$(CONFIG_DRM_DEBUG_MM_SELFTEST) += selftests/
 
 CFLAGS_drm_trace_points.o := -I$(src)
 
diff --git a/drivers/gpu/drm/selftests/Makefile b/drivers/gpu/drm/selftests/Makefile
new file mode 100644
index 000000000000..4aebfc7f27d4
--- /dev/null
+++ b/drivers/gpu/drm/selftests/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_DRM_DEBUG_MM_SELFTEST) += test-drm_mm.o
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm: Fix O= out-of-tree builds for selftests

[Chris Wilson]

On Wed, Dec 28, 2016 at 10:41:17AM +0100, Daniel Vetter wrote:
> Kbuild really doesn't like non-recursive Makefiles, but they do work
> as long as you build without O=
> 
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Fixes: 50f0033d1a0f ("drm: Add some kselftests for the DRM range manager (struct drm_mm)")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com># Please enter the commit message for your changes. Lines starting
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

That's a shame, but it gets us over the breakage so
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

> ---
>  drivers/gpu/drm/Makefile           | 2 +-
>  drivers/gpu/drm/selftests/Makefile | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/gpu/drm/selftests/Makefile
> 
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> index c0d1aed8588b..d00c389f24bf 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -38,7 +38,7 @@ drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
>  drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
>  
>  obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
> -obj-$(CONFIG_DRM_DEBUG_MM_SELFTEST) += selftests/test-drm_mm.o
> +obj-$(CONFIG_DRM_DEBUG_MM_SELFTEST) += selftests/

For the next set of selftests we should add a common
CONFIG_DRM_SELFTESTS.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm: Fix O= out-of-tree builds for selftests

[Daniel Vetter]

On Wed, Dec 28, 2016 at 10:06:00AM +0000, Chris Wilson wrote:
> On Wed, Dec 28, 2016 at 10:41:17AM +0100, Daniel Vetter wrote:
> > Kbuild really doesn't like non-recursive Makefiles, but they do work
> > as long as you build without O=
> > 
> > Reported-by: kbuild test robot <fengguang.wu@intel.com>
> > Fixes: 50f0033d1a0f ("drm: Add some kselftests for the DRM range manager (struct drm_mm)")
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Christian König <christian.koenig@amd.com>
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com># Please enter the commit message for your changes. Lines starting
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> 
> That's a shame, but it gets us over the breakage so
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Thx for the review, applied.

> For the next set of selftests we should add a common
> CONFIG_DRM_SELFTESTS.

Yeah, one for all of them is probably enough.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm: Fix O= out-of-tree builds for selftests

[Eric Engestrom]

On Wednesday, 2016-12-28 11:09:59 +0100, Daniel Vetter wrote:
> On Wed, Dec 28, 2016 at 10:06:00AM +0000, Chris Wilson wrote:
> > On Wed, Dec 28, 2016 at 10:41:17AM +0100, Daniel Vetter wrote:
> > > Kbuild really doesn't like non-recursive Makefiles, but they do work
> > > as long as you build without O=
> > > 
> > > Reported-by: kbuild test robot <fengguang.wu@intel.com>
> > > Fixes: 50f0033d1a0f ("drm: Add some kselftests for the DRM range manager (struct drm_mm)")
> > > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > > Cc: Christian König <christian.koenig@amd.com>
> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com># Please enter the commit message for your changes. Lines starting

In case you haven't pushed it yet, the line above could be fixed :)

> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > 
> > That's a shame, but it gets us over the breakage so
> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> 
> Thx for the review, applied.
> 
> > For the next set of selftests we should add a common
> > CONFIG_DRM_SELFTESTS.
> 
> Yeah, one for all of them is probably enough.
> -Daniel
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel