From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Clark <robdclark@gmail•com>,
Sean Paul <seanpaul@chromium•org>, Dave Airlie <airlied@linux•ie>
Cc: DRI <dri-devel@lists•freedesktop.org>,
Thomas Zimmermann <tzimmermann@suse•de>,
Dmitry Baryshkov <dmitry.baryshkov@linaro•org>,
Vinod Koul <vkoul@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the drm-msm tree
Date: Thu, 5 May 2022 11:48:59 +1000 [thread overview]
Message-ID: <20220505114859.654eb7f0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3330 bytes --]
Hi all,
After merging the drm-msm tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
from drivers/gpu/drm/msm/adreno/a3xx_gpu.h:10,
from drivers/gpu/drm/msm/adreno/a3xx_gpu.c:9:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
33 | #include <drm/drm_dsc.h>
| ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
from drivers/gpu/drm/msm/adreno/adreno_gpu.c:19:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
33 | #include <drm/drm_dsc.h>
| ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
from drivers/gpu/drm/msm/adreno/adreno_device.c:9:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
33 | #include <drm/drm_dsc.h>
| ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/msm_gpu.h:17,
from drivers/gpu/drm/msm/adreno/adreno_gpu.h:15,
from drivers/gpu/drm/msm/adreno/a2xx_gpu.h:7,
from drivers/gpu/drm/msm/adreno/a2xx_gpu.c:4:
drivers/gpu/drm/msm/msm_drv.h:33:10: fatal error: drm/drm_dsc.h: No such file or directory
33 | #include <drm/drm_dsc.h>
| ^~~~~~~~~~~~~~~
Caused by commits
b9080324d6ca ("drm/msm/dsi: add support for dsc data")
c110cfd1753e ("drm/msm/disp/dpu1: Add support for DSC")
interacting with commit
2a64b147350f ("drm/display: Move DSC header and helpers into display-helper module")
from the drm tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 5 May 2022 11:31:20 +1000
Subject: [PATCH] fix up for "drm/display: Move DSC header and helpers into display-helper module"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 2 +-
drivers/gpu/drm/msm/msm_drv.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
index 164e5f5b1002..b39ee4ed32f7 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
@@ -4,7 +4,7 @@
#ifndef _DPU_HW_DSC_H
#define _DPU_HW_DSC_H
-#include <drm/drm_dsc.h>
+#include <drm/display/drm_dsc.h>
#define DSC_MODE_SPLIT_PANEL BIT(0)
#define DSC_MODE_MULTIPLEX BIT(1)
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index fdbaad53eb84..08388d742d65 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -30,7 +30,7 @@
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
#include <drm/drm_fb_helper.h>
-#include <drm/drm_dsc.h>
+#include <drm/display/drm_dsc.h>
#include <drm/msm_drm.h>
#include <drm/drm_gem.h>
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-05 1:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 1:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-11 0:59 linux-next: build failure after merge of the drm-msm tree Stephen Rothwell
2023-10-10 1:54 Stephen Rothwell
2022-05-05 1:43 Stephen Rothwell
2021-07-29 11:28 Mark Brown
2021-06-18 2:42 Stephen Rothwell
2021-06-18 2:50 ` Stephen Rothwell
2021-06-23 1:02 ` Stephen Rothwell
2018-10-05 1:37 Stephen Rothwell
2018-07-23 4:50 Stephen Rothwell
2018-07-25 12:08 ` Rob Clark
2018-06-04 3:20 Stephen Rothwell
2016-07-11 3:20 Stephen Rothwell
2015-12-15 1:27 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220505114859.654eb7f0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=dmitry.baryshkov@linaro$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robdclark@gmail$(echo .)com \
--cc=seanpaul@chromium$(echo .)org \
--cc=tzimmermann@suse$(echo .)de \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox