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

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

Merge "drm/msm: remove mdp node entry"

parents 6b2b4466 a9a4456a

drivers/gpu/drm/msm/msm_drv.c

+1 −10
Original line number Diff line number Diff line
@@ -251,17 +251,12 @@ static int msm_unload(struct drm_device *dev) 
}



#define KMS_MDP4 0

#define KMS_MDP5 1

#define KMS_SDE  2

#define KMS_SDE  1



static int get_mdp_ver(struct platform_device *pdev)

{

#ifdef CONFIG_OF

	static const struct of_device_id match_types[] = { {

		.compatible = "qcom,mdss_mdp",

		.data	= (void	*)KMS_MDP5,

	},

	{

		.compatible = "qcom,sde-kms",

		.data	= (void	*)KMS_SDE,

		/* end node */
@@ -432,9 +427,6 @@ static int msm_load(struct drm_device *dev, unsigned long flags) 
	case KMS_MDP4:

		kms = mdp4_kms_init(dev);

		break;

	case KMS_MDP5:

		kms = mdp5_kms_init(dev);

		break;

	case KMS_SDE:

		kms = sde_kms_init(dev);

		break;
@@ -1948,7 +1940,6 @@ static const struct platform_device_id msm_id[] = { 


static const struct of_device_id dt_match[] = {

	{ .compatible = "qcom,mdp" },      /* mdp4 */

	{ .compatible = "qcom,mdss_mdp" }, /* mdp5 */

	{ .compatible = "qcom,sde-kms" },  /* sde  */

	{}

};