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

Alex Deucher
2019-10-16T16:22:11Z

Applied. Thanks!

Alex

On Tue, Oct 15, 2019 at 8:22 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c:23:10: fatal error: drm/drmP.h: No such file or directory
> 23 | #include <drm/drmP.h>
> | ^~~~~~~~~~~~
>
> Caused by commit
>
> 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
>
> interacting with commit
>
> 8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)")
>
> from the amdgpu tree.
>
> I applied the following merge fix patch for today (which should also
> apply to the amdgpu tree).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 16 Oct 2019 11:17:32 +1100
> Subject: [PATCH] drm/amdgpu: fix up for amdgpu_tmz.c and removal of drm/drmP.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> index 14a55003dd81..823527a0fa47 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> @@ -20,7 +20,10 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <drm/drmP.h>
> +#include <linux/device.h>
> +
> +#include <drm/amd_asic_type.h>
> +
> #include "amdgpu.h"
> #include "amdgpu_tmz.h"
>
> --
> 2.23.0
>
> --
> Cheers,
> Stephen Rothwell