mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
From c1dd77c13169d70bbfd79f69c1f57ac5601ae68c Mon Sep 17 00:00:00 2001
|
|
From: Sascha Hauer <s.hauer@pengutronix.de>
|
|
Date: Fri, 8 Apr 2022 13:22:35 +0200
|
|
Subject: [PATCH 45/50] 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>
|
|
---
|
|
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
|
|
@@ -23,8 +23,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,8 +4,9 @@
|
|
# 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_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
|
|
@@ -481,7 +481,7 @@ static int __init rockchip_drm_init(void
|
|
return -ENODEV;
|
|
|
|
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,
|