mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
From b382406a2cf4afaa7320a7ad4b298ed6e2675437 Mon Sep 17 00:00:00 2001
|
|
From: Sascha Hauer <s.hauer@pengutronix.de>
|
|
Date: Fri, 22 Apr 2022 09:28:38 +0200
|
|
Subject: [PATCH] drm/rockchip: Make VOP driver optional
|
|
|
|
With upcoming VOP2 support VOP won't be the only choice anymore, so make
|
|
the VOP driver optional.
|
|
|
|
This also adds a dependency from ROCKCHIP_ANALOGIX_DP to ROCKCHIP_VOP,
|
|
because that driver currently only links and works with the VOP driver.
|
|
|
|
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
|
|
Tested-by: Michael Riesch <michael.riesch@wolfvision.net>
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20220422072841.2206452-22-s.hauer@pengutronix.de
|
|
---
|
|
drivers/gpu/drm/rockchip/Kconfig | 8 ++++++++
|
|
drivers/gpu/drm/rockchip/Makefile | 3 ++-
|
|
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
|
|
3 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/rockchip/Kconfig
|
|
+++ b/drivers/gpu/drm/rockchip/Kconfig
|
|
@@ -20,8 +20,16 @@ config DRM_ROCKCHIP
|
|
|
|
if DRM_ROCKCHIP
|
|
|
|
+config ROCKCHIP_VOP
|
|
+ bool "Rockchip VOP driver"
|
|
+ default y
|
|
+ help
|
|
+ This selects support for the VOP driver. You should enable it
|
|
+ on older SoCs.
|
|
+
|
|
config ROCKCHIP_ANALOGIX_DP
|
|
bool "Rockchip specific extensions for Analogix DP driver"
|
|
+ depends on ROCKCHIP_VOP
|
|
help
|
|
This selects support for Rockchip SoC specific extensions
|
|
for the Analogix Core DP driver. If you want to enable DP
|
|
--- a/drivers/gpu/drm/rockchip/Makefile
|
|
+++ b/drivers/gpu/drm/rockchip/Makefile
|
|
@@ -4,9 +4,10 @@
|
|
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
|
|
|
|
rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
|
|
- rockchip_drm_gem.o rockchip_drm_vop.o rockchip_vop_reg.o
|
|
+ rockchip_drm_gem.o
|
|
rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
|
|
|
|
+rockchipdrm-$(CONFIG_ROCKCHIP_VOP) += rockchip_drm_vop.o rockchip_vop_reg.o
|
|
rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
|
|
rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
|
|
rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
|
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
|
|
@@ -503,7 +503,7 @@ static int __init rockchip_drm_init(void
|
|
int ret;
|
|
|
|
num_rockchip_sub_drivers = 0;
|
|
- ADD_ROCKCHIP_SUB_DRIVER(vop_platform_driver, CONFIG_DRM_ROCKCHIP);
|
|
+ ADD_ROCKCHIP_SUB_DRIVER(vop_platform_driver, CONFIG_ROCKCHIP_VOP);
|
|
ADD_ROCKCHIP_SUB_DRIVER(rockchip_lvds_driver,
|
|
CONFIG_ROCKCHIP_LVDS);
|
|
ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver,
|