| Message ID | 20190307155323.2949975-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | a34ced4541cc453de520a0db47757f4b99983bf6 |
| Headers | show |
| Series | drm/stm: fix CONFIG_FB dependency | expand |
On Fri, Mar 8, 2019 at 4:50 PM Yannick FERTRE <yannick.fertre@st.com> wrote: > > Reviewed-by: Yannick Fertré <yannick.fertre@st.com> Thanks, > Arnd, > could you merge the patch? > I think that Benjamin could also merge it. I think this should go through the drm tree, so someone with access to that should merge it, not me. Arnd
Le lun. 11 mars 2019 à 15:24, Arnd Bergmann <arnd@arndb.de> a écrit : > > On Fri, Mar 8, 2019 at 4:50 PM Yannick FERTRE <yannick.fertre@st.com> wrote: > > > > Reviewed-by: Yannick Fertré <yannick.fertre@st.com> > > Thanks, > > > Arnd, > > could you merge the patch? > > I think that Benjamin could also merge it. > > I think this should go through the drm tree, so someone with > access to that should merge it, not me. Applied on drm-misc-next, Thanks, Benjamin > > Arnd
diff --git a/drivers/gpu/drm/stm/Kconfig b/drivers/gpu/drm/stm/Kconfig index 35367ada3bc1..d15b10de1da6 100644 --- a/drivers/gpu/drm/stm/Kconfig +++ b/drivers/gpu/drm/stm/Kconfig @@ -6,7 +6,7 @@ config DRM_STM select DRM_KMS_CMA_HELPER select DRM_PANEL_BRIDGE select VIDEOMODE_HELPERS - select FB_PROVIDE_GET_FB_UNMAPPED_AREA + select FB_PROVIDE_GET_FB_UNMAPPED_AREA if FB help Enable support for the on-chip display controller on
The DRM_STM driver can be built independently of the framebuffer layer, but it causes a Kconfig warning: WARNING: unmet direct dependencies detected for FB_PROVIDE_GET_FB_UNMAPPED_AREA Depends on [n]: HAS_IOMEM [=y] && FB [=n] Selected by [y]: - DRM_STM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_STM32 [=n] || ARCH_MULTIPLATFORM [=y]) Selecting FB_PROVIDE_GET_FB_UNMAPPED_AREA actually has no effect if CONFIG_FB is disabled, so we can make it a conditional 'select' instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/stm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)