diff options
author | Dave Airlie <airlied@redhat.com> | 2015-11-13 10:08:19 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-11-13 10:08:19 +1000 |
commit | f20780f3e8feec0eebcf9fb41e1d90202fffaeff (patch) | |
tree | 301d2f9d42df4d9903e1cf168318abc3bd439e3e /drivers/gpu/drm/sti/Kconfig | |
parent | a18e2fa5e670a1b84e66522b221c42875b02028a (diff) | |
parent | e00fe64a5ccd94590e1c3325346b60aa0ffdc1ff (diff) |
Merge branch 'drm-sti-next-2015-11-03' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next
sti/drm changes
Add better support for firmware loading
lots of fixes.
* 'drm-sti-next-2015-11-03' of http://git.linaro.org/people/benjamin.gaignard/kernel:
drm/sti: load HQVDP firmware the first time HQVDP's plane is used
drm/sti: fix typo issue in sti_mode_config_init
drm/sti: set mixer background color through module param
drm/sti: Remove local fbdev emulation Kconfig option
drm/sti: remove redundant sign extensions
drm/sti: hdmi use of_get_i2c_adapter_by_node interface
drm/sti: hdmi fix i2c adapter device refcounting
drm/sti: Do not export symbols
drm/sti: Build monolithic driver
drm/sti: Use drm_crtc_vblank_*() API
drm/sti: Store correct CRTC index in events
drm/sti: Select FW_LOADER
drm/sti: Constify function pointer structs
Diffstat (limited to 'drivers/gpu/drm/sti/Kconfig')
-rw-r--r-- | drivers/gpu/drm/sti/Kconfig | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig index fbccc105819b..10c1b1926e6f 100644 --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig @@ -6,12 +6,6 @@ config DRM_STI select DRM_GEM_CMA_HELPER select DRM_KMS_CMA_HELPER select DRM_PANEL - select FW_LOADER_USER_HELPER_FALLBACK + select FW_LOADER help Choose this option to enable DRM on STM stiH41x chipset - -config DRM_STI_FBDEV - bool "DRM frame buffer device for STMicroelectronics SoC stiH41x Serie" - depends on DRM_STI - help - Choose this option to enable FBDEV on top of DRM for STM stiH41x chipset |