Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 75521c1086848346b2ae4e94118e903b1dcadfe4 Mon Sep 17 00:00:00 2001
- From: Michal Lazo <[email protected]>
- Date: Tue, 22 Oct 2019 19:05:27 +0000
- Subject: [PATCH 1/1] v3d
- ---
- arch/arm64/configs/bcm2711_defconfig | 2 ++
- arch/arm64/configs/bcmrpi3_defconfig | 2 ++
- debian.raspi2/config/annotations | 2 ++
- debian.raspi2/config/arm64/config.flavour.raspi2 | 3 +++
- drivers/gpu/drm/v3d/Kconfig | 2 +-
- 5 files changed, 10 insertions(+), 1 deletion(-)
- diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
- index 2265a77d6..c723875c0 100644
- --- a/arch/arm64/configs/bcm2711_defconfig
- +++ b/arch/arm64/configs/bcm2711_defconfig
- @@ -790,6 +790,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
- CONFIG_DRM_UDL=m
- CONFIG_DRM_PANEL_SIMPLE=m
- CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
- +CONFIG_DRM_V3D=m
- CONFIG_DRM_VC4=m
- CONFIG_DRM_TINYDRM=m
- CONFIG_TINYDRM_MI0283QT=m
- @@ -1134,6 +1135,7 @@ CONFIG_VIDEO_BCM2835=m
- CONFIG_MAILBOX=y
- CONFIG_BCM2835_MBOX=y
- # CONFIG_IOMMU_SUPPORT is not set
- +CONFIG_BCM2835_POWER=y
- CONFIG_RASPBERRYPI_POWER=y
- CONFIG_EXTCON=m
- CONFIG_EXTCON_ARIZONA=m
- diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
- index d860ffbcd..907fc1841 100644
- --- a/arch/arm64/configs/bcmrpi3_defconfig
- +++ b/arch/arm64/configs/bcmrpi3_defconfig
- @@ -764,6 +764,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
- CONFIG_DRM_UDL=m
- CONFIG_DRM_PANEL_SIMPLE=m
- CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
- +CONFIG_DRM_V3D=m
- CONFIG_DRM_VC4=m
- CONFIG_FB=y
- CONFIG_FB_BCM2708=y
- @@ -1087,6 +1088,7 @@ CONFIG_VIDEO_CODEC_BCM2835=m
- CONFIG_MAILBOX=y
- CONFIG_BCM2835_MBOX=y
- # CONFIG_IOMMU_SUPPORT is not set
- +CONFIG_BCM2835_POWER=y
- CONFIG_RASPBERRYPI_POWER=y
- CONFIG_EXTCON=m
- CONFIG_EXTCON_ARIZONA=m
- diff --git a/debian.raspi2/config/annotations b/debian.raspi2/config/annotations
- index c22a50d87..dd7111f70 100644
- --- a/debian.raspi2/config/annotations
- +++ b/debian.raspi2/config/annotations
- @@ -1542,6 +1542,7 @@ CONFIG_DRM_TEGRA policy<{'armhf-generic': 'm'}>
- CONFIG_DRM_TEGRA_DEBUG policy<{'armhf-generic': 'n'}>
- CONFIG_DRM_TEGRA_STAGING policy<{'armhf-generic': 'y'}>
- CONFIG_DRM_STI policy<{'armhf': 'n'}>
- +CONFIG_DRM_V3D policy<{'arm64': 'm'}>
- CONFIG_DRM_VC4 policy<{'arm64': 'm'}>
- CONFIG_DRM_ETNAVIV policy<{'armhf-generic': 'm'}>
- CONFIG_DRM_ETNAVIV_REGISTER_LOGGING policy<{'armhf-generic': 'n'}>
- @@ -6133,6 +6134,7 @@ CONFIG_ARCH_TEGRA_114_SOC policy<{'armhf-generic': 'y'}>
- CONFIG_ARCH_TEGRA_124_SOC policy<{'armhf-generic': 'y'}>
- # Menu: Device Drivers >> SOC (System On Chip) specific Drivers >> Broadcom SoC drivers
- +CONFIG_BCM2835_POWER policy<{'arm64': 'y'}>
- CONFIG_RASPBERRYPI_POWER policy<{'arm64': 'y'}>
- CONFIG_SOC_BRCMSTB policy<{'armhf': 'n'}>
- diff --git a/debian.raspi2/config/arm64/config.flavour.raspi2 b/debian.raspi2/config/arm64/config.flavour.raspi2
- index cdaca0048..19831ba6e 100644
- --- a/debian.raspi2/config/arm64/config.flavour.raspi2
- +++ b/debian.raspi2/config/arm64/config.flavour.raspi2
- @@ -1,3 +1,6 @@
- #
- # Config options for config.flavour.raspi2 automatically generated by splitconfig.pl
- #
- +
- +CONFIG_DRM_V3D=m
- +CONFIG_BCM2835_POWER=y
- \ No newline at end of file
- diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig
- index 9a5c44606..b0e048697 100644
- --- a/drivers/gpu/drm/v3d/Kconfig
- +++ b/drivers/gpu/drm/v3d/Kconfig
- @@ -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_BCMSTB || ARCH_BCM2835 || COMPILE_TEST
- depends on DRM
- depends on COMMON_CLK
- depends on MMU
- --
- 2.20.1
Advertisement
Add Comment
Please, Sign In to add comment
