Kconfig symbol clean-up on gpu
Subsystems (7)
v2 cover Kconfig symbol clean-up on gpu
Dear DRM maintainers,
The script ./scripts/checkkconfigsymbols.py warns on invalid references to Kconfig symbols (often, minor typos, name confusions or outdated references).
This patch series addresses all issues reported by ./scripts/checkkconfigsymbols.py in ./drivers/gpu/ for Kconfig and Makefile files. Issues in the Kconfig and Makefile files indicate some shortcomings in the overall build definitions, and often are true actionable issues to address.
These issues can be identified and filtered by:
./scripts/checkkconfigsymbols.py | grep -E "drivers/gpu/.*(Kconfig|Makefile)" -B 1 -A 1
After applying this patch series on linux-next (next-20210817), the command above yields just one further issues to address:
DRM_AMD_DC_DCE11_0
Referencing files: drivers/gpu/drm/amd/display/dc/dce100/Makefile
Conclusion: No action required.
Rationale:
drivers/gpu/drm/amd/display/dc/dce100/Makefile refers to DRM_AMD_DC_DCE11_0 in a comment, after an "ifdef 0".
Please pick this patch series into your drm-next tree.
Note that patch "drm: amdgpu: remove obsolete reference to config CHASH" was already picked and applied by Alex Deucher.
Best regards,
Lukas
v1 -> v2:
- adjusted sources in drivers/gpu/drm/Kconfig
for drm: zte: remove obsolete DRM Support for ZTE SoCs after report by kernel test robot
- removed Tomi from recipient list as email is unreachable.
Lukas Bulwahn (5):
drm: rockchip: remove reference to non-existing config DRM_RGB
drm: amdgpu: remove obsolete reference to config CHASH
drm: v3d: correct reference to config ARCH_BRCMSTB
drm: zte: remove obsolete DRM Support for ZTE SoCs
drm: omap: remove obsolete selection of OMAP2_DSS in config DRM_OMAP
drivers/gpu/drm/Kconfig | 3 - drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/omapdrm/Kconfig | 1 - drivers/gpu/drm/rockchip/Kconfig | 1 - drivers/gpu/drm/v3d/Kconfig | 2 +- drivers/gpu/drm/zte/Kconfig | 10 - drivers/gpu/drm/zte/Makefile | 10 - drivers/gpu/drm/zte/zx_common_regs.h | 28 - drivers/gpu/drm/zte/zx_drm_drv.c | 184 ------ drivers/gpu/drm/zte/zx_drm_drv.h | 34 - drivers/gpu/drm/zte/zx_hdmi.c | 760 ---------------------- drivers/gpu/drm/zte/zx_hdmi_regs.h | 66 -- drivers/gpu/drm/zte/zx_plane.c | 537 ---------------- drivers/gpu/drm/zte/zx_plane.h | 26 - drivers/gpu/drm/zte/zx_plane_regs.h | 120 ---- drivers/gpu/drm/zte/zx_tvenc.c | 400 ------------ drivers/gpu/drm/zte/zx_tvenc_regs.h | 27 - drivers/gpu/drm/zte/zx_vga.c | 527 --------------- drivers/gpu/drm/zte/zx_vga_regs.h | 33 - drivers/gpu/drm/zte/zx_vou.c | 921 --------------------------- drivers/gpu/drm/zte/zx_vou.h | 64 -- drivers/gpu/drm/zte/zx_vou_regs.h | 212 ------ 22 files changed, 1 insertion(+), 3966 deletions(-) delete mode 100644 drivers/gpu/drm/zte/Kconfig delete mode 100644 drivers/gpu/drm/zte/Makefile delete mode 100644 drivers/gpu/drm/zte/zx_common_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.c delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.h delete mode 100644 drivers/gpu/drm/zte/zx_hdmi.c delete mode 100644 drivers/gpu/drm/zte/zx_hdmi_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_plane.c delete mode 100644 drivers/gpu/drm/zte/zx_plane.h delete mode 100644 drivers/gpu/drm/zte/zx_plane_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_tvenc.c delete mode 100644 drivers/gpu/drm/zte/zx_tvenc_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_vga.c delete mode 100644 drivers/gpu/drm/zte/zx_vga_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_vou.c delete mode 100644 drivers/gpu/drm/zte/zx_vou.h delete mode 100644 drivers/gpu/drm/zte/zx_vou_regs.h
Signature · 1 line
2.26.2
PATCH v2 1/5 drm: rockchip: remove reference to non-existing config DRM_RGB
commit 1f0f01515172 ("drm/rockchip: Add support for Rockchip Soc RGB output interface") accidently adds to select the non-existing config DRM_RGB in ./drivers/gpu/drm/rockchip/Kconfig.
Luckily, ./scripts/checkkconfigsymbols.py warns on non-existing configs:
DRM_RGB
Referencing files: drivers/gpu/drm/rockchip/Kconfig
So, remove the reference to the non-existing config DRM_RGB.
--- drivers/gpu/drm/rockchip/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/rockchip/Kconfig +0 -1
@@ -9,7 +9,6 @@ config DRM_ROCKCHIP select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP select DRM_DW_HDMI if ROCKCHIP_DW_HDMI select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI - select DRM_RGB if ROCKCHIP_RGB select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI select GENERIC_PHY_MIPI_DPHY if ROCKCHIP_DW_MIPI_DSI select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC
Signature · 1 line
2.26.2
PATCH v2 2/5 drm: amdgpu: remove obsolete reference to config CHASH
In reply to Lukas BulwahnCommit 04ed8459f334 ("drm/amdgpu: remove chash") removes the chash architecture and its corresponding config CHASH.
There is still a reference to CHASH in the config DRM_AMDGPU in ./drivers/gpu/drm/Kconfig.
Remove this obsolete reference to config CHASH.
--- drivers/gpu/drm/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/Kconfig +0 -1
@@ -257,7 +257,6 @@ config DRM_AMDGPU select HWMON select BACKLIGHT_CLASS_DEVICE select INTERVAL_TREE - select CHASH help Choose this option if you have a recent AMD Radeon graphics card.
Signature · 1 line
2.26.2
PATCH v2 3/5 drm: v3d: correct reference to config ARCH_BRCMSTB
In reply to Lukas BulwahnCommit 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") adds the config DRM_V3D, which depends on "ARCH_BCMSTB".
Although, a bit confusing: all Broadcom architectures in ./arch/arm/mach-bcm/Kconfig have the prefix "ARCH_BCM", except for ARCH_BRCMSTB, i.e., the config for Broadcom BCM7XXX based boards.
So, correct the reference ARCH_BCMSTB to the intended ARCH_BRCMSTB.
--- drivers/gpu/drm/v3d/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/v3d/Kconfig +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_V3D tristate "Broadcom V3D 3.x and newer" - depends on ARCH_BCM || ARCH_BCMSTB || COMPILE_TEST + depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST depends on DRM depends on COMMON_CLK depends on MMU
Signature · 1 line
2.26.2
PATCH v2 4/5 drm: zte: remove obsolete DRM Support for ZTE SoCs
In reply to Lukas BulwahnCommit 89d4f98ae90d ("ARM: remove zte zx platform") removes the config ARCH_ZX. So, since then, the DRM Support for ZTE SoCs (config DRM_ZTE) depends on this removed config ARCH_ZX and cannot be selected.
Fortunately, ./scripts/checkkconfigsymbols.py detects this and warns:
ARCH_ZX
Referencing files: drivers/gpu/drm/zte/Kconfig
So, remove this obsolete DRM support.
--- drivers/gpu/drm/Kconfig | 2 - drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/zte/Kconfig | 10 - drivers/gpu/drm/zte/Makefile | 10 - drivers/gpu/drm/zte/zx_common_regs.h | 28 - drivers/gpu/drm/zte/zx_drm_drv.c | 184 ------ drivers/gpu/drm/zte/zx_drm_drv.h | 34 - drivers/gpu/drm/zte/zx_hdmi.c | 760 ---------------------- drivers/gpu/drm/zte/zx_hdmi_regs.h | 66 -- drivers/gpu/drm/zte/zx_plane.c | 537 ---------------- drivers/gpu/drm/zte/zx_plane.h | 26 - drivers/gpu/drm/zte/zx_plane_regs.h | 120 ---- drivers/gpu/drm/zte/zx_tvenc.c | 400 ------------ drivers/gpu/drm/zte/zx_tvenc_regs.h | 27 - drivers/gpu/drm/zte/zx_vga.c | 527 --------------- drivers/gpu/drm/zte/zx_vga_regs.h | 33 - drivers/gpu/drm/zte/zx_vou.c | 921 --------------------------- drivers/gpu/drm/zte/zx_vou.h | 64 -- drivers/gpu/drm/zte/zx_vou_regs.h | 212 ------ 19 files changed, 3962 deletions(-) delete mode 100644 drivers/gpu/drm/zte/Kconfig delete mode 100644 drivers/gpu/drm/zte/Makefile delete mode 100644 drivers/gpu/drm/zte/zx_common_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.c delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.h delete mode 100644 drivers/gpu/drm/zte/zx_hdmi.c delete mode 100644 drivers/gpu/drm/zte/zx_hdmi_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_plane.c delete mode 100644 drivers/gpu/drm/zte/zx_plane.h delete mode 100644 drivers/gpu/drm/zte/zx_plane_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_tvenc.c delete mode 100644 drivers/gpu/drm/zte/zx_tvenc_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_vga.c delete mode 100644 drivers/gpu/drm/zte/zx_vga_regs.h delete mode 100644 drivers/gpu/drm/zte/zx_vou.c delete mode 100644 drivers/gpu/drm/zte/zx_vou.h delete mode 100644 drivers/gpu/drm/zte/zx_vou_regs.h
drivers/gpu/drm/Kconfig +0 -2
@@ -352,8 +352,6 @@ source "drivers/gpu/drm/hisilicon/Kconfig" source "drivers/gpu/drm/mediatek/Kconfig" -source "drivers/gpu/drm/zte/Kconfig" - source "drivers/gpu/drm/mxsfb/Kconfig" source "drivers/gpu/drm/meson/Kconfig"
drivers/gpu/drm/Makefile +0 -1
@@ -113,7 +113,6 @@ obj-y += bridge/ obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu/ obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/ obj-y += hisilicon/ -obj-$(CONFIG_DRM_ZTE) += zte/ obj-$(CONFIG_DRM_MXSFB) += mxsfb/ obj-y += tiny/ obj-$(CONFIG_DRM_PL111) += pl111/
drivers/gpu/drm/zte/Kconfig deleted +0 -10
@@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -config DRM_ZTE - tristate "DRM Support for ZTE SoCs" - depends on DRM && ARCH_ZX - select DRM_KMS_CMA_HELPER - select DRM_KMS_HELPER - select SND_SOC_HDMI_CODEC if SND_SOC - select VIDEOMODE_HELPERS - help - Choose this option to enable DRM on ZTE ZX SoCs.
drivers/gpu/drm/zte/Makefile deleted +0 -10
@@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -zxdrm-y := \ - zx_drm_drv.o \ - zx_hdmi.o \ - zx_plane.o \ - zx_tvenc.o \ - zx_vga.o \ - zx_vou.o - -obj-$(CONFIG_DRM_ZTE) += zxdrm.o
drivers/gpu/drm/zte/zx_common_regs.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright (C) 2017 Sanechips Technology Co., Ltd. -* Copyright 2017 Linaro Ltd. -*/ - -#ifndef __ZX_COMMON_REGS_H__ -#define __ZX_COMMON_REGS_H__ - -/* CSC registers */ -#define CSC_CTRL0 0x30 -#define CSC_COV_MODE_SHIFT 16 -#define CSC_COV_MODE_MASK (0xffff << CSC_COV_MODE_SHIFT) -#define CSC_BT601_IMAGE_RGB2YCBCR 0 -#define CSC_BT601_IMAGE_YCBCR2RGB 1 -#define CSC_BT601_VIDEO_RGB2YCBCR 2 -#define CSC_BT601_VIDEO_YCBCR2RGB 3 -#define CSC_BT709_IMAGE_RGB2YCBCR 4 -#define CSC_BT709_IMAGE_YCBCR2RGB 5 -#define CSC_BT709_VIDEO_RGB2YCBCR 6 -#define CSC_BT709_VIDEO_YCBCR2RGB 7 -#define CSC_BT2020_IMAGE_RGB2YCBCR 8 -#define CSC_BT2020_IMAGE_YCBCR2RGB 9 -#define CSC_BT2020_VIDEO_RGB2YCBCR 10 -#define CSC_BT2020_VIDEO_YCBCR2RGB 11 -#define CSC_WORK_ENABLE BIT(0) - -#endif /* __ZX_COMMON_REGS_H__ */
drivers/gpu/drm/zte/zx_drm_drv.c deleted +0 -184
184 lines not on this page · raw message
drivers/gpu/drm/zte/zx_drm_drv.h deleted +0 -34
@@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright 2016 Linaro Ltd. -* Copyright 2016 ZTE Corporation. -*/ - -#ifndef __ZX_DRM_DRV_H__ -#define __ZX_DRM_DRV_H__ - -extern struct platform_driver zx_crtc_driver; -extern struct platform_driver zx_hdmi_driver; -extern struct platform_driver zx_tvenc_driver; -extern struct platform_driver zx_vga_driver; - -static inline u32 zx_readl (void __iomem *reg) -{ -return readl_relaxed (reg); -} - -static inline void zx_writel (void __iomem *reg,u32 val) -{ -writel_relaxed (val, reg); -} - -static inline void zx_writel_mask (void __iomem *reg,u32 mask,u32 val) -{ -u32 tmp; - - tmp =zx_readl (reg); - tmp = (tmp & ~mask) | (val & mask); -zx_writel (reg, tmp); -} - -#endif /* __ZX_DRM_DRV_H__ */
drivers/gpu/drm/zte/zx_hdmi.c deleted +0 -760
760 lines not on this page · raw message
drivers/gpu/drm/zte/zx_hdmi_regs.h deleted +0 -66
66 lines not on this page · raw message
drivers/gpu/drm/zte/zx_plane.c deleted +0 -537
537 lines not on this page · raw message
drivers/gpu/drm/zte/zx_plane.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright 2016 Linaro Ltd. -* Copyright 2016 ZTE Corporation. -*/ - -#ifndef __ZX_PLANE_H__ -#define __ZX_PLANE_H__ - -struct zx_plane { -struct drm_plane plane; -struct device *dev; -void __iomem *layer; -void __iomem *csc; -void __iomem *hbsc; -void __iomem *rsz; -const struct vou_layer_bits *bits; -}; - -#define to_zx_plane (plane) container_of(plane, struct zx_plane, plane) - -int zx_plane_init (struct drm_device *drm,struct zx_plane *zplane, -enum drm_plane_type type); -void zx_plane_set_update (struct drm_plane *plane); - -#endif /* __ZX_PLANE_H__ */
drivers/gpu/drm/zte/zx_plane_regs.h deleted +0 -120
120 lines not on this page · raw message
drivers/gpu/drm/zte/zx_tvenc.c deleted +0 -400
400 lines not on this page · raw message
drivers/gpu/drm/zte/zx_tvenc_regs.h deleted +0 -27
@@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright 2017 Linaro Ltd. -* Copyright 2017 ZTE Corporation. -*/ - -#ifndef __ZX_TVENC_REGS_H__ -#define __ZX_TVENC_REGS_H__ - -#define VENC_VIDEO_INFO 0x04 -#define VENC_VIDEO_RES 0x08 -#define VENC_FIELD1_PARAM 0x10 -#define VENC_FIELD2_PARAM 0x14 -#define VENC_LINE_O_1 0x18 -#define VENC_LINE_E_1 0x1c -#define VENC_LINE_O_2 0x20 -#define VENC_LINE_E_2 0x24 -#define VENC_LINE_TIMING_PARAM 0x28 -#define VENC_WEIGHT_VALUE 0x2c -#define VENC_BLANK_BLACK_LEVEL 0x30 -#define VENC_BURST_LEVEL 0x34 -#define VENC_CONTROL_PARAM 0x3c -#define VENC_SUB_CARRIER_PHASE1 0x40 -#define VENC_PHASE_LINE_INCR_CVBS 0x48 -#define VENC_ENABLE 0xa8 - -#endif /* __ZX_TVENC_REGS_H__ */
drivers/gpu/drm/zte/zx_vga.c deleted +0 -527
527 lines not on this page · raw message
drivers/gpu/drm/zte/zx_vga_regs.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright (C) 2017 Sanechips Technology Co., Ltd. -* Copyright 2017 Linaro Ltd. -*/ - -#ifndef __ZX_VGA_REGS_H__ -#define __ZX_VGA_REGS_H__ - -#define VGA_CMD_CFG 0x04 -#define VGA_CMD_TRANS BIT(6) -#define VGA_CMD_COMBO BIT(5) -#define VGA_CMD_RW BIT(4) -#define VGA_SUB_ADDR 0x0c -#define VGA_DEVICE_ADDR 0x10 -#define VGA_CLK_DIV_FS 0x14 -#define VGA_RXF_CTRL 0x20 -#define VGA_RX_FIFO_CLEAR BIT(7) -#define VGA_DATA 0x24 -#define VGA_I2C_STATUS 0x28 -#define VGA_DEVICE_DISCONNECTED BIT(7) -#define VGA_DEVICE_CONNECTED BIT(6) -#define VGA_CLEAR_IRQ BIT(4) -#define VGA_TRANS_DONE BIT(0) -#define VGA_RXF_STATUS 0x30 -#define VGA_RXF_COUNT_SHIFT 2 -#define VGA_RXF_COUNT_MASK GENMASK(7, 2) -#define VGA_AUTO_DETECT_PARA 0x34 -#define VGA_AUTO_DETECT_SEL 0x38 -#define VGA_DETECT_SEL_HAS_DEVICE BIT(1) -#define VGA_DETECT_SEL_NO_DEVICE BIT(0) - -#endif /* __ZX_VGA_REGS_H__ */
drivers/gpu/drm/zte/zx_vou.c deleted +0 -921
223 lines not on this page · raw message
drivers/gpu/drm/zte/zx_vou.h deleted +0 -64
64 lines not on this page · raw message
drivers/gpu/drm/zte/zx_vou_regs.h deleted +0 -212
212 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.2
Part of the diff is not shown here. View the raw message.
PATCH v2 5/5 drm: omap: remove obsolete selection of OMAP2_DSS in config DRM_OMAP
In reply to Lukas BulwahnCommit 55b68fb856b5 ("drm/omap: squash omapdrm sub-modules into one") removes the config OMAP2_DSS in ./drivers/gpu/drm/omapdrm/dss/Kconfig, while moving the other configs into./drivers/gpu/drm/omapdrm/Kconfig, but misses to remove an obsolete selection of OMAP2_DSS in config DRM_OMAP.
Hence, ./scripts/checkkconfigsymbols.py warns:
OMAP2_DSS
Referencing files: drivers/gpu/drm/omapdrm/Kconfig
Remove this reference in an obsolete selection.
--- drivers/gpu/drm/omapdrm/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/omapdrm/Kconfig +0 -1
@@ -3,7 +3,6 @@ config DRM_OMAP tristate "OMAP DRM" depends on DRM depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM - select OMAP2_DSS select DRM_KMS_HELPER select VIDEOMODE_HELPERS select HDMI
Signature · 1 line
2.26.2
Re: [PATCH v2 5/5] drm: omap: remove obsolete selection of OMAP2_DSS in config DRM_OMAP
Quoted 5 lines · Lukas Bulwahn
Commit
55b68fb856b5("drm/omap: squash omapdrm sub-modules into one") removes the configOMAP2_DSSin./drivers/gpu/drm/omapdrm/dss/Kconfig, while moving the other configs into./drivers/gpu/drm/omapdrm/Kconfig, but misses to remove an obsolete selection ofOMAP2_DSSin configDRM_OMAP.
Quoted 8 lines
Hence,
./scripts/checkkconfigsymbols.pywarns:
OMAP2_DSS
Referencing files:drivers/gpu/drm/omapdrm/KconfigRemove this reference in an obsolete selection.
Signed-off-by Lukas Bulwahn <[email protected]>
Except the amdgpu patch all merged to drm-misc-next. amdgpu should get picked up by Alex.
-Daniel
Quoted 19 lines
--- drivers/gpu/drm/omapdrm/Kconfig | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/omapdrm/Kconfig +0
-1@@ -3,7 +3,6 @@ config DRM_OMAP tristate "OMAP DRM" depends on DRM depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM - select OMAP2_DSS select DRM_KMS_HELPER select VIDEOMODE_HELPERS select HDMISignature · 1 line
2.26.2
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch