diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-05-09 11:03:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-05-09 11:04:00 +1000 |
| commit | eb85d03e01c3e9f3b0ba7282b2e3515a635decb2 (patch) | |
| tree | acffc7d52bae052a8181a81725f9c44c5e432ac9 /drivers/gpu/drm/panfrost/Kconfig | |
| parent | f2e8d169b2b96d234be7f109f8222d7fa4612899 (diff) | |
| parent | 15273ffd7efdf6e9f21c4e4beef6539229167343 (diff) | |
Merge tag 'drm-misc-next-fixes-2019-05-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- A handful of fixes from -next that just missed feature freeze
- More panfrost fixes that went directly in -misc-next-fixes (various)
- Fix searchpaths during build (Masahiro)
- msm patch to fix the driver for chips without zap shader (Rob)
- Fix freeing imported buffers in drm_gem_cma_free_object() (Noralf)
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Rob Clark <robdclark@chromium.org>
Cc: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190508205153.GA91135@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/panfrost/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/panfrost/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/panfrost/Kconfig b/drivers/gpu/drm/panfrost/Kconfig index 7f5e572daa2d..591611dc4e34 100644 --- a/drivers/gpu/drm/panfrost/Kconfig +++ b/drivers/gpu/drm/panfrost/Kconfig @@ -3,7 +3,7 @@ config DRM_PANFROST tristate "Panfrost (DRM support for ARM Mali Midgard/Bifrost GPUs)" depends on DRM - depends on ARM || ARM64 || COMPILE_TEST + depends on ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64) depends on MMU select DRM_SCHED select IOMMU_SUPPORT |