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

Commit 9a20b374 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: add mdss support for msm8937"

parents 9d84c0fc 8286fd78

drivers/video/msm/mdss/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ ifeq ($(CONFIG_ARCH_MSM8996),y) 
mdss-mdp-objs += mdss_mdp_pp_v1_7.o

endif



ifeq ($(CONFIG_ARCH_MSM8937),y)

mdss-mdp-objs += mdss_mdp_pp_v1_7.o

endif



ifeq ($(CONFIG_FB_MSM_MDSS),y)

obj-$(CONFIG_DEBUG_FS) += mdss_debug.o mdss_debug_xlog.o

endif

drivers/video/msm/mdss/mdss_mdp_pp.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ struct mdss_pp_res_type { 
	void *pp_data_res;

};



#ifdef CONFIG_ARCH_MSM8996

#if defined(CONFIG_ARCH_MSM8996) || defined(CONFIG_ARCH_MSM8937)

void *pp_get_driver_ops(struct mdp_pp_driver_ops *ops);

#else

static inline void *pp_get_driver_ops(struct mdp_pp_driver_ops *ops)

include/uapi/linux/msm_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#define MDSS_MDP_HW_REV_110	MDSS_MDP_REV(1, 10, 0) /* 8992 v1.0 */

#define MDSS_MDP_HW_REV_200	MDSS_MDP_REV(2, 0, 0) /* 8092 v1.0 */

#define MDSS_MDP_HW_REV_112	MDSS_MDP_REV(1, 12, 0) /* 8952 v1.0 */

#define MDSS_MDP_HW_REV_114	MDSS_MDP_REV(1, 14, 0) /* 8937 v1.0 */



enum {

	NOTIFY_UPDATE_INIT,