| Message ID | 20210602215252.695994-2-keescook@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: Fix randconfig link failures | expand |
On Wed, Jun 02, 2021 at 02:52:50PM -0700, Kees Cook wrote: > When cleaning up other drm config dependencies, it is too easy to create > larger problems. Instead, mark CONFIG_FB as a "depends": > > drivers/gpu/drm/Kconfig:74:error: recursive dependency detected! > > Suggested-by: Arnd Bergmann <arnd@kernel.org> > Link: https://lore.kernel.org/lkml/CAK8P3a3jUQs6c5tESSNMbqfuymewj9FhqRizyHcfOXf8Rgy-nA@mail.gmail.com/ > Signed-off-by: Kees Cook <keescook@chromium.org> I rebased this one for -next and applied all three patches to drm-misc-next. -Daniel > --- > drivers/gpu/drm/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 3c16bd1afd87..90891284ccec 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -83,7 +83,7 @@ config DRM_KMS_HELPER > config DRM_KMS_FB_HELPER > bool > depends on DRM_KMS_HELPER > - select FB > + depends on FB > select FRAMEBUFFER_CONSOLE if !EXPERT > select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE > select FB_SYS_FOPS > -- > 2.25.1 >
On Thu, Jun 3, 2021 at 3:48 AM Daniel Vetter <daniel@ffwll.ch> wrote: > > On Wed, Jun 02, 2021 at 02:52:50PM -0700, Kees Cook wrote: > > When cleaning up other drm config dependencies, it is too easy to create > > larger problems. Instead, mark CONFIG_FB as a "depends": > > > > drivers/gpu/drm/Kconfig:74:error: recursive dependency detected! > > > > Suggested-by: Arnd Bergmann <arnd@kernel.org> > > Link: https://lore.kernel.org/lkml/CAK8P3a3jUQs6c5tESSNMbqfuymewj9FhqRizyHcfOXf8Rgy-nA@mail.gmail.com/ > > Signed-off-by: Kees Cook <keescook@chromium.org> > > I rebased this one for -next and applied all three patches to > drm-misc-next. Patch 3 is not the right fix and I think breaks some platforms. Rob
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 3c16bd1afd87..90891284ccec 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -83,7 +83,7 @@ config DRM_KMS_HELPER config DRM_KMS_FB_HELPER bool depends on DRM_KMS_HELPER - select FB + depends on FB select FRAMEBUFFER_CONSOLE if !EXPERT select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE select FB_SYS_FOPS
When cleaning up other drm config dependencies, it is too easy to create larger problems. Instead, mark CONFIG_FB as a "depends": drivers/gpu/drm/Kconfig:74:error: recursive dependency detected! Suggested-by: Arnd Bergmann <arnd@kernel.org> Link: https://lore.kernel.org/lkml/CAK8P3a3jUQs6c5tESSNMbqfuymewj9FhqRizyHcfOXf8Rgy-nA@mail.gmail.com/ Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/gpu/drm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)