Messages in this thread | | | From | Daniel Vetter <> | Date | Fri, 4 Jun 2021 00:30:00 +0200 | Subject | Re: [PATCH] drm/pl111: Actually fix CONFIG_VEXPRESS_CONFIG depends |
| |
[gmail is funny]
On Thu, Jun 3, 2021 at 11:58 PM Kees Cook <keescook@chromium.org> wrote: > > VEXPRESS_CONFIG needs to either be missing, built-in, or modular when > pl111 is modular. Update the Kconfig to reflect the need. > > Cc: Emma Anholt <emma@anholt.net> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: dri-devel@lists.freedesktop.org > Fixes: 4dc7c97d04dc ("drm/pl111: depend on CONFIG_VEXPRESS_CONFIG") > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > drivers/gpu/drm/pl111/Kconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig > index c5210a5bef1b..b84879ca430d 100644 > --- a/drivers/gpu/drm/pl111/Kconfig > +++ b/drivers/gpu/drm/pl111/Kconfig > @@ -2,7 +2,8 @@ > config DRM_PL111 > tristate "DRM Support for PL111 CLCD Controller" > depends on DRM > - depends on VEXPRESS_CONFIG > + depends on ARM || ARM64 || COMPILE_TEST > + depends on !VEXPRESS_CONFIG || VEXPRESS_CONFIG=DRM
I thought the canonical way to represent optional dependencies was depends on FOO || FOO=n
Since we don't really care whether it's the same as DRM (that's sufficient, but a bit too much), it needs to match DRM_PL111, or be disabled. It's at least the pattern various drm drivers use for AGP. If that still works in testing, can you pls respin? -Daniel
> depends on COMMON_CLK > select DRM_KMS_HELPER > select DRM_KMS_CMA_HELPER > -- > 2.25.1 >
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
| |