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

Commit feb46f02 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: make HDCP support optional 



It is already optional at runtime.  But this at least simplifies
backports to kernels without QCOM_SCM.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 0552f765

drivers/gpu/drm/msm/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,13 @@ config DRM_MSM_REGISTER_LOGGING 
	  that can be parsed by envytools demsm tool.  If enabled, register

	  that can be parsed by envytools demsm tool.  If enabled, register

	  logging can be switched on via msm.reglog=y module param.

	  logging can be switched on via msm.reglog=y module param.





config DRM_MSM_HDMI_HDCP

	bool "Enable HDMI HDCP support in MSM DRM driver"

	depends on DRM_MSM && QCOM_SCM

	default y

	help

	  Choose this option to enable HDCP state machine



config DRM_MSM_DSI

config DRM_MSM_DSI

	bool "Enable DSI support in MSM DRM driver"

	bool "Enable DSI support in MSM DRM driver"

	depends on DRM_MSM

	depends on DRM_MSM

drivers/gpu/drm/msm/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ msm-y := \ 
	hdmi/hdmi_audio.o \

	hdmi/hdmi_audio.o \

	hdmi/hdmi_bridge.o \

	hdmi/hdmi_bridge.o \

	hdmi/hdmi_connector.o \

	hdmi/hdmi_connector.o \

	hdmi/hdmi_hdcp.o \

	hdmi/hdmi_i2c.o \

	hdmi/hdmi_i2c.o \

	hdmi/hdmi_phy.o \

	hdmi/hdmi_phy.o \

	hdmi/hdmi_phy_8960.o \

	hdmi/hdmi_phy_8960.o \
@@ -56,6 +55,8 @@ msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o 
msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_pll_8960.o

msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_pll_8960.o

msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_phy_8996.o

msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_phy_8996.o





msm-$(CONFIG_DRM_MSM_HDMI_HDCP) += hdmi/hdmi_hdcp.o



msm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi.o \

msm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi.o \

			mdp/mdp4/mdp4_dsi_encoder.o \

			mdp/mdp4/mdp4_dsi_encoder.o \

			dsi/dsi_cfg.o \

			dsi/dsi_cfg.o \

drivers/gpu/drm/msm/hdmi/hdmi.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -243,10 +243,21 @@ struct i2c_adapter *msm_hdmi_i2c_init(struct hdmi *hdmi); 
/*

/*

 * hdcp

 * hdcp

 */

 */

#ifdef CONFIG_DRM_MSM_HDMI_HDCP

struct hdmi_hdcp_ctrl *msm_hdmi_hdcp_init(struct hdmi *hdmi);

struct hdmi_hdcp_ctrl *msm_hdmi_hdcp_init(struct hdmi *hdmi);

void msm_hdmi_hdcp_destroy(struct hdmi *hdmi);

void msm_hdmi_hdcp_destroy(struct hdmi *hdmi);

void msm_hdmi_hdcp_on(struct hdmi_hdcp_ctrl *hdcp_ctrl);

void msm_hdmi_hdcp_on(struct hdmi_hdcp_ctrl *hdcp_ctrl);

void msm_hdmi_hdcp_off(struct hdmi_hdcp_ctrl *hdcp_ctrl);

void msm_hdmi_hdcp_off(struct hdmi_hdcp_ctrl *hdcp_ctrl);

void msm_hdmi_hdcp_irq(struct hdmi_hdcp_ctrl *hdcp_ctrl);

void msm_hdmi_hdcp_irq(struct hdmi_hdcp_ctrl *hdcp_ctrl);

#else

static inline struct hdmi_hdcp_ctrl *msm_hdmi_hdcp_init(struct hdmi *hdmi)

{

	return ERR_PTR(-ENXIO);

}

static inline void msm_hdmi_hdcp_destroy(struct hdmi *hdmi) {}

static inline void msm_hdmi_hdcp_on(struct hdmi_hdcp_ctrl *hdcp_ctrl) {}

static inline void msm_hdmi_hdcp_off(struct hdmi_hdcp_ctrl *hdcp_ctrl) {}

static inline void msm_hdmi_hdcp_irq(struct hdmi_hdcp_ctrl *hdcp_ctrl) {}

#endif





#endif /* __HDMI_CONNECTOR_H__ */
 
#endif /* __HDMI_CONNECTOR_H__ */