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

Commit 8725a0c5 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/dp: invoke device tree parser on probe"

parents 0bef29f2 d948c05a

drivers/gpu/drm/msm/dp/dp_display.c

+6 −6
Original line number Diff line number Diff line
@@ -363,12 +363,6 @@ static int dp_display_bind(struct device *dev, struct device *master, 
	dp->dp_display.drm_dev = drm;

	priv = drm->dev_private;



	rc = dp->parser->parse(dp->parser);

	if (rc) {

		pr_err("device tree parsing failed\n");

		goto end;

	}



	rc = dp->aux->drm_aux_register(dp->aux);

	if (rc) {

		pr_err("DRM DP AUX register failed\n");
@@ -794,6 +788,12 @@ static int dp_init_sub_modules(struct dp_display_private *dp) 
		goto error_parser;

	}



	rc = dp->parser->parse(dp->parser);

	if (rc) {

		pr_err("device tree parsing failed\n");

		goto error_catalog;

	}



	dp->catalog = dp_catalog_get(dev, &dp->parser->io);

	if (IS_ERR(dp->catalog)) {

		rc = PTR_ERR(dp->catalog);