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

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

Merge "disp: msm: add changes for bengal target compilation"

parents b8165c35 669557d6

msm/dp/dp_drm.h

+13 −0
Original line number Diff line number Diff line
@@ -184,6 +184,19 @@ static inline int dp_connector_config_hdr(struct drm_connector *connector, 
	return 0;

}



int dp_connector_atomic_check(struct drm_connector *connector,

	void *display,

	struct drm_connector_state *c_state)

{

	return 0;

}



int dp_connector_set_colorspace(struct drm_connector *connector,

	void *display)

{

	return 0;

}



static inline int dp_connector_post_init(struct drm_connector *connector,

		void *display)

{

msm/msm_drv.c

+0 −12
Original line number Diff line number Diff line
@@ -2024,16 +2024,6 @@ static struct platform_driver msm_platform_driver = { 
	},

};



#ifdef CONFIG_QCOM_KGSL

void __init adreno_register(void)

{

}



void __exit adreno_unregister(void)

{

}

#endif



static int __init msm_drm_register(void)

{

	if (!modeset)
@@ -2044,7 +2034,6 @@ static int __init msm_drm_register(void) 
	msm_dsi_register();

	msm_edp_register();

	msm_hdmi_register();

	adreno_register();

	return platform_driver_register(&msm_platform_driver);

}
@@ -2053,7 +2042,6 @@ static void __exit msm_drm_unregister(void) 
	DBG("fini");

	platform_driver_unregister(&msm_platform_driver);

	msm_hdmi_unregister();

	adreno_unregister();

	msm_edp_unregister();

	msm_dsi_unregister();

	msm_smmu_driver_cleanup();

msm/sde/sde_wb.h

+19 −4
Original line number Diff line number Diff line
@@ -288,9 +288,7 @@ int sde_wb_config(struct drm_device *drm_dev, void *data, 
}

static inline

int sde_wb_connector_post_init(struct drm_connector *connector,

		void *info,

		void *display,

		struct msm_mode_info *mode_info)

					 void *display)

{

	return 0;

}
@@ -318,7 +316,8 @@ int sde_wb_connector_set_property(struct drm_connector *connector, 
	return 0;

}

static inline

int sde_wb_get_info(struct msm_display_info *info, void *display)

int sde_wb_get_info(struct drm_connector *connector,

		struct msm_display_info *info, void *display)

{

	return 0;

}
@@ -341,7 +340,23 @@ int sde_wb_connector_state_get_output_roi(struct drm_connector_state *state, 
{

	return 0;

}

static inline

int sde_wb_connector_set_info_blob(struct drm_connector *connector,

		void *info,

		void *display,

		struct msm_mode_info *mode_info)

{

	return 0;

}



static inline

int sde_wb_get_mode_info(struct drm_connector *connector,

		const struct drm_display_mode *drm_mode,

		struct msm_mode_info *mode_info,

		void *display, const struct msm_resource_caps_info *avail_res)

{

	return 0;

}

#endif

#endif /* __SDE_WB_H__ */