Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d8db9e authored by Jordan Crouse's avatar Jordan Crouse
Browse files

drm/msm/sde: Make DRM_MSM_DP depend on USB_PD 



Make sure that DRM_MSM_DP depends on USB_PD so it can't be
selected unless USB_PD support is also available and add a
stub for msm_edp_modeset_init() so it can be successfully
compiled if DRM_MSM_EDP is not selected.

Fixes: 1eae18f0 ("drm/msm: Add snapshot of SDE, DSI, DP and supporting files")
Change-Id: Ic0dedbad503ab2f7fa4a73e09d419c5247e3f13e
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 6888b254

drivers/gpu/drm/msm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ config DRM_MSM_SDE 


config DRM_MSM_DP

	bool "Enable Display Port"

	depends on DRM_MSM_SDE

	depends on DRM_MSM_SDE && USB_PD

	default n

	help

	  This option enables compilation of Display Port

drivers/gpu/drm/msm/msm_drv.h

+7 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 *
@@ -877,6 +877,12 @@ static inline void __init msm_edp_register(void) 
static inline void __exit msm_edp_unregister(void)

{

}



static inline int msm_edp_modeset_init(struct msm_edp *edp,

		struct drm_device *dev, struct drm_encoder *encoder)

{

	return -EINVAL;

}

#endif



struct msm_dsi;