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

Commit 8b8bfe01 authored by Shashank Babu Chinta Venkata's avatar Shashank Babu Chinta Venkata Committed by Chandan Uddaraju
Browse files

disp: msm: make msm_drm into single module 



Make msm_drm into single module and all child driver
registers and unregisters are handled from parent's
register and unregister respectively.

Change-Id: I017513d1de3b6b25dd5543d7fa7741c0bac1740d
Signed-off-by: default avatarShashank Babu Chinta Venkata <sbchin@codeaurora.org>
Signed-off-by: default avatarNarendra Muppalla <NarendraM@codeaurora.org>
Signed-off-by: default avatarChandan Uddaraju <chandanu@codeaurora.org>
parent eaa458b1

hdcp/msm_hdcp.c

+4 −10
Original line number Diff line number Diff line
@@ -328,18 +328,12 @@ static struct platform_driver msm_hdcp_driver = { 
	}

};



static int __init msm_hdcp_init(void)

void __init msm_hdcp_register(void)

{

	return platform_driver_register(&msm_hdcp_driver);

	platform_driver_register(&msm_hdcp_driver);

}



static void __exit msm_hdcp_exit(void)

void __exit msm_hdcp_unregister(void)

{

	return platform_driver_unregister(&msm_hdcp_driver);

	platform_driver_unregister(&msm_hdcp_driver);

}
 


module_init(msm_hdcp_init);

module_exit(msm_hdcp_exit);



MODULE_DESCRIPTION("MSM HDCP driver");

MODULE_LICENSE("GPL v2");

include/linux/sde_rsc.h

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ struct sde_rsc_cmd_config { 
	u32 prefill_lines;

};



#ifdef CONFIG_DRM_SDE_RSC

#if IS_ENABLED(CONFIG_DRM_SDE_RSC)

/**

 * sde_rsc_client_create() - create the client for sde rsc.

 * Different displays like DSI, HDMI, DP, WB, etc should call this

msm/dp/dp_display.c

+3 −12
Original line number Diff line number Diff line
@@ -3347,22 +3347,13 @@ static struct platform_driver dp_display_driver = { 
	},

};



static int __init dp_display_init(void)

void __init dp_display_register(void)

{

	int ret;



	ret = platform_driver_register(&dp_display_driver);

	if (ret) {

		DP_ERR("driver register failed\n");

		return ret;

	}



	return ret;

	platform_driver_register(&dp_display_driver);

}

late_initcall(dp_display_init);



static void __exit dp_display_cleanup(void)

void __exit dp_display_unregister(void)

{

	platform_driver_unregister(&dp_display_driver);

}
 
module_exit(dp_display_cleanup);

msm/dp/dp_display.h

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ struct dp_display { 
			bool wakeup);

};



#ifdef CONFIG_DRM_MSM_DP

#if IS_ENABLED(CONFIG_DRM_MSM_DP)

int dp_display_get_num_of_displays(void);

int dp_display_get_displays(void **displays, int count);

int dp_display_get_num_of_streams(void);
@@ -149,5 +149,5 @@ static inline int dp_connector_update_pps(struct drm_connector *connector, 
{

	return 0;

}

#endif

#endif /* CONFIG_DRM_MSM_DP */

#endif /* _DP_DISPLAY_H_ */

msm/dp/dp_drm.h

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct dp_bridge { 
};





#ifdef CONFIG_DRM_MSM_DP

#if IS_ENABLED(CONFIG_DRM_MSM_DP)

/**

 * dp_connector_config_hdr - callback to configure HDR

 * @connector: Pointer to drm connector structure
@@ -231,6 +231,6 @@ static inline void convert_to_drm_mode(const struct dp_display_mode *dp_mode, 
				struct drm_display_mode *drm_mode)

{

}

#endif

#endif /* CONFIG_DRM_MSM_DP */



#endif /* _DP_DRM_H_ */