| Message ID | 20220505114859.654eb7f0@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the drm-msm tree | expand |
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>
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(-)