diff options
author | Jani Nikula <jani.nikula@intel.com> | 2019-12-11 09:35:37 +0100 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2019-12-11 10:13:50 +0100 |
commit | 023265ed75d8792ca1d555430a8985511d3f8788 (patch) | |
tree | 0940ba6f005f102062e5842b4ec8073ecd583ac0 /drivers/gpu/drm/Kconfig | |
parent | drm/i915/dsi: add support for DSC (diff) | |
parent | Linux 5.5-rc1 (diff) | |
download | linux-023265ed75d8792ca1d555430a8985511d3f8788.tar.xz linux-023265ed75d8792ca1d555430a8985511d3f8788.zip |
Merge drm/drm-next into drm-intel-next-queued
Sync up with v5.5-rc1 to get the updated lock_release() API among other
things. Fix the conflict reported by Stephen Rothwell [1].
[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.au
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
-rw-r--r-- | drivers/gpu/drm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 76db8bc0dd1f..c87262997dcb 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -99,6 +99,7 @@ config DRM_KMS_FB_HELPER config DRM_DEBUG_DP_MST_TOPOLOGY_REFS bool "Enable refcount backtrace history in the DP MST helpers" + depends on STACKTRACE_SUPPORT select STACKDEPOT depends on DRM_KMS_HELPER depends on DEBUG_KERNEL |