Am Mittwoch, 17. November 2021, 15:50:54 CET schrieb Sascha Hauer: > On Wed, Nov 17, 2021 at 03:40:26PM +0100, Heiko Stübner wrote: > > Am Mittwoch, 17. November 2021, 15:33:46 CET schrieb Sascha Hauer: > > > With upcoming VOP2 support VOP won't be the only choice anymore, so make > > > the VOP driver optional. > > > > > > Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > > > --- > > > arch/arm/configs/multi_v7_defconfig | 1 + > > > arch/arm64/configs/defconfig | 1 + > > > drivers/gpu/drm/rockchip/Kconfig | 7 +++++++ > > > drivers/gpu/drm/rockchip/Makefile | 3 ++- > > > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- > > > 5 files changed, 12 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > > > index c951aeed2138c..fc123e8f3e2f9 100644 > > > --- a/arch/arm/configs/multi_v7_defconfig > > > +++ b/arch/arm/configs/multi_v7_defconfig > > > @@ -667,6 +667,7 @@ CONFIG_DRM_EXYNOS_DPI=y > > > CONFIG_DRM_EXYNOS_DSI=y > > > CONFIG_DRM_EXYNOS_HDMI=y > > > CONFIG_DRM_ROCKCHIP=m > > > +CONFIG_ROCKCHIP_VOP=y > > > CONFIG_ROCKCHIP_ANALOGIX_DP=y > > > CONFIG_ROCKCHIP_DW_HDMI=y > > > CONFIG_ROCKCHIP_DW_MIPI_DSI=y > > > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > > > index f2e2b9bdd7024..a623386473dc9 100644 > > > --- a/arch/arm64/configs/defconfig > > > +++ b/arch/arm64/configs/defconfig > > > @@ -682,6 +682,7 @@ CONFIG_DRM_EXYNOS_DSI=y > > > CONFIG_DRM_EXYNOS_HDMI=y > > > CONFIG_DRM_EXYNOS_MIC=y > > > CONFIG_DRM_ROCKCHIP=m > > > +CONFIG_ROCKCHIP_VOP=y > > > CONFIG_ROCKCHIP_ANALOGIX_DP=y > > > CONFIG_ROCKCHIP_CDN_DP=y > > > CONFIG_ROCKCHIP_DW_HDMI=y > > > diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig > > > index 9f1ecefc39332..a1c4158259099 100644 > > > --- a/drivers/gpu/drm/rockchip/Kconfig > > > +++ b/drivers/gpu/drm/rockchip/Kconfig > > > @@ -21,8 +21,15 @@ config DRM_ROCKCHIP > > > > > > if DRM_ROCKCHIP > > > > > > +config ROCKCHIP_VOP > > > + bool "Rockchip VOP driver" > > > > would this benefit from a default-y ? > > For builds reusing preexisting .configs. > > I enabled CONFIG_ROCKCHIP_VOP for all configs in the tree that enable > CONFIG_DRM_ROCKCHIP, so defconfig users shouldn't see any surprises. > That won't help users of custom configs of course. > > I don't know what's preferred in such cases, I can change to default-y > if you like. default-y would keep the behaviour identical for all existing configs I guess and right now vop(1) is still the most used variant and will stay that way for a while longer, so I guess my preference would be for going that route - also so that we don't drown in "my display stopped working" during 5.17 ;-) Heiko
