diff options
| author |   Dave Airlie <airlied@redhat.com> | 2021-10-28 14:59:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-10-28 14:59:38 +1000 |
| commit | 970eae15600a883e4ad27dd0757b18871cc983ab (patch) | |
| tree | 7aeb639a35ca2ab8b54a5987837f8ac5f96ee5f4 /drivers/gpu/drm/msm/Kconfig | |
| parent | Merge tag 'topic/amdgpu-dp2.0-mst-2021-10-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| parent | Linux 5.15-rc7 (diff) | |
| download | linux-dev-970eae15600a883e4ad27dd0757b18871cc983ab.tar.xz linux-dev-970eae15600a883e4ad27dd0757b18871cc983ab.zip | |
BackMerge tag 'v5.15-rc7' into drm-next
The msm next tree is based on rc3, so let's just backmerge rc7 before pulling it in.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/msm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/msm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 5879f67bc88c..f5107b6ded7b 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -17,7 +17,7 @@ config DRM_MSM select DRM_SCHED select SHMEM select TMPFS - select QCOM_SCM if ARCH_QCOM + select QCOM_SCM select WANT_DEV_COREDUMP select SND_SOC_HDMI_CODEC if SND_SOC select SYNC_FILE @@ -55,7 +55,7 @@ config DRM_MSM_GPU_SUDO config DRM_MSM_HDMI_HDCP bool "Enable HDMI HDCP support in MSM DRM driver" - depends on DRM_MSM && QCOM_SCM + depends on DRM_MSM default y help Choose this option to enable HDCP state machine |