Merge remote-tracking branch 'v4l-dvb-next/master'

diff --cc drivers/gpu/drm/amd/display/Kconfig
index 13a6ce9c8e94a30478058db0d0d7dbd3a9bb8c33,5ce1b64c8ff2765a0b8fe52ffa0f5235002ac0af..c985475961df921c06b7476587e2f570a1893ffe
--- 1/drivers/gpu/drm/amd/display/Kconfig
--- 2/drivers/gpu/drm/amd/display/Kconfig
+++ b/drivers/gpu/drm/amd/display/Kconfig
@@@ -3,9 -3,8 +3,10 @@@ menu "Display Engine Configuration
  
  config DRM_AMD_DC
        bool "AMD DC - Enable new display engine"
+       depends on !X86 || !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS) || BROKEN
        default y
 +      select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
 +      select DRM_AMD_DC_DCN1_01 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
        help
          Choose this option if you want to use the new display engine
          support for AMDGPU. This adds required support for Vega and