From patchwork Wed Oct 9 00:35:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11180193 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A9C6C13BD for ; Wed, 9 Oct 2019 00:36:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8594A20640 for ; Wed, 9 Oct 2019 00:36:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8594A20640 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02F6E6E8C2; Wed, 9 Oct 2019 00:36:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 096366E8C2; Wed, 9 Oct 2019 00:36:01 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 46nwHf173jz9sDB; Wed, 9 Oct 2019 11:35:58 +1100 (AEDT) Date: Wed, 9 Oct 2019 11:35:57 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Alex Deucher Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20191009113557.41ced49e@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1570581359; bh=hjJjL/ozQrg33SwOSe/5cE0JrIJlL2UK7Xv7UiyjKvU=; h=Date:From:To:Cc:Subject:From; b=Q5c1fMRcW2DjlwospuJTfTmx6lD90/9vQLamOPSg49xJbmdptqXpRhjYu4jVllD36 8zE0swWHmMB688MmGmzrACzpEA8CZXJ1nJZX9b0wfCUxt4qYEvRKAro2TIVQkKV3GR L1Y418l2N7+ABK/4SjHuJJYX4vxzSlC6tztgI6ep6oHuA4/Y+Yf4DfEbZ35QyiF+0t RNHPcgZkGr3RL0uCpxSWul8wZXFtPSa0uGTYQ5Ul7JB4UrVU4Qn/7Guf7VXjHNMJvT i5dZFv0l5JqlHyG7qimG9xWJs2qQ41K4VI5v7tk5fKG56dsyYxwNO+6Tmv47pbIfCu +Hk9hQknr/p3w== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Linux Next Mailing List , Harish Kasiviswanathan , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_module.c:25: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory 40 | #include | ^~~~~~~~~~~~ In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_chardev.c:38: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory 40 | #include | ^~~~~~~~~~~~ In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:26: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory 40 | #include | ^~~~~~~~~~~~ In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:34: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory 40 | #include | ^~~~~~~~~~~~ Caused by commit 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h") interacting with commit 6b855f7b83d2 ("drm/amdkfd: Check against device cgroup") from the amdgpu tree. I added the following merge fix patch for today: From: Stephen Rothwell Date: Wed, 9 Oct 2019 11:24:38 +1100 Subject: [PATCH] drm/amdkfd: update for drmP.h removal Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index b8b4485c8f74..41bc0428bfc0 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -37,7 +37,9 @@ #include #include #include -#include +#include +#include +#include #include #include "amd_shared.h" @@ -49,8 +51,6 @@ /* GPU ID hash width in bits */ #define KFD_GPU_ID_HASH_WIDTH 16 -struct drm_device; - /* Use upper bits of mmap offset to store KFD driver specific information. * BITS[63:62] - Encode MMAP type * BITS[61:46] - Encode gpu_id. To identify to which GPU the offset belongs to