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

Commit 2cff4ac8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: register rotator platform driver after genpd init"

parents 5100a8e9 26833249

config/gki_holidisp.conf

+3 −0
Original line number Diff line number Diff line
@@ -13,3 +13,6 @@ export CONFIG_DRM_MSM_REGISTER_LOGGING=y 
export CONFIG_QCOM_MDSS_PLL=y

export CONFIG_DRM_SDE_RSC=n

export CONFIG_DISPLAY_BUILD=m

export CONFIG_MSM_SDE_ROTATOR=y

export CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

export CONFIG_MSM_SDE_ROTATOR_INIT_ONLY=y

config/gki_holidispconf.h

+3 −0
Original line number Diff line number Diff line
@@ -12,3 +12,6 @@ 
#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1

#define CONFIG_QCOM_MDSS_PLL 1

#define CONFIG_GKI_DISPLAY 1

#define CONFIG_MSM_SDE_ROTATOR 1

#define CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG 1

#define CONFIG_MSM_SDE_ROTATOR_INIT_ONLY 1

msm/msm_drv.c

+4 −2
Original line number Diff line number Diff line
@@ -860,6 +860,10 @@ static int msm_drm_component_init(struct device *dev) 
		goto fail;

	}



	/* Register rotator platform driver only after genpd init */

	sde_rotator_register();

	sde_rotator_smmu_driver_register();



	ret = msm_drm_display_thread_create(param, priv, ddev, dev);

	if (ret) {

		dev_err(dev, "msm_drm_display_thread_create failed\n");
@@ -2198,8 +2202,6 @@ static int __init msm_drm_register(void) 
	msm_hdcp_register();

	dp_display_register();

	msm_smmu_driver_init();

	sde_rotator_register();

	sde_rotator_smmu_driver_register();

	msm_dsi_register();

	msm_edp_register();

	msm_hdmi_register();

msm/msm_drv.h

+8 −8
Original line number Diff line number Diff line
@@ -1294,25 +1294,25 @@ static inline void __exit sde_wb_unregister(void) 
#endif /* CONFIG_DRM_SDE_WB */



#if IS_ENABLED(CONFIG_MSM_SDE_ROTATOR)

void  __init sde_rotator_register(void);

void __exit sde_rotator_unregister(void);

void sde_rotator_register(void);

void sde_rotator_unregister(void);

#else

static inline void __init sde_rotator_register(void)

static inline void sde_rotator_register(void)

{

}

static inline void __exit sde_rotator_unregister(void)

static inline void sde_rotator_unregister(void)

{

}

#endif /* CONFIG_MSM_SDE_ROTATOR */



#if IS_ENABLED(CONFIG_MSM_SDE_ROTATOR)

void __init sde_rotator_smmu_driver_register(void);

void __exit sde_rotator_smmu_driver_unregister(void);

void sde_rotator_smmu_driver_register(void);

void sde_rotator_smmu_driver_unregister(void);

#else

static inline void __init sde_rotator_smmu_driver_register(void)

static inline void sde_rotator_smmu_driver_register(void)

{

}

static inline void __exit sde_rotator_smmu_driver_unregister(void)

static inline void sde_rotator_smmu_driver_unregister(void)

{

}

#endif /* CONFIG_MSM_SDE_ROTATOR */

rotator/sde_rotator_debug.c

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 


#define SDE_ROT_TEST_MASK(id, tp)	((id << 4) | (tp << 1) | BIT(0))



#if defined(CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG) && \

	defined(CONFIG_DEBUG_FS)

static DEFINE_SPINLOCK(sde_rot_xlock);



/*
@@ -1358,3 +1360,4 @@ void sde_rotator_destroy_debugfs(struct dentry *debugfs) 
{

	debugfs_remove_recursive(debugfs);

}

#endif