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

Commit c5c92017 authored by Chandan Uddaraju's avatar Chandan Uddaraju Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm: reorder component add to accommodate continuous splash 



Add connectors before parsing boot displays. This information
is needed to handle continuous splash. Expose new API to
support continuous splash configuration.

Change-Id: If8ad97298822b7ad2c7e7d706331ee4a7e5af347
Signed-off-by: default avatarChandan Uddaraju <chandanu@codeaurora.org>
parent 58df09ae

drivers/gpu/drm/msm/msm_drv.c

+16 −7
Original line number Diff line number Diff line
@@ -691,6 +691,14 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) 


	drm_mode_config_reset(ddev);



	if (kms && kms->funcs && kms->funcs->cont_splash_config) {

		ret = kms->funcs->cont_splash_config(kms);

		if (ret) {

			dev_err(dev, "kms cont_splash config failed.\n");

			goto fail;

		}

	}



#ifdef CONFIG_DRM_FBDEV_EMULATION

	if (fbdev)

		priv->fbdev = msm_fbdev_init(ddev);
@@ -1766,6 +1774,14 @@ static int add_display_components(struct device *dev, 
		struct device_node *np = dev->of_node;

		unsigned int i;



		for (i = 0; ; i++) {

			node = of_parse_phandle(np, "connectors", i);

			if (!node)

				break;



			component_match_add(dev, matchptr, compare_of, node);

		}



		for (i = 0; i < MAX_DSI_ACTIVE_DISPLAY; i++) {

			node = dsi_display_get_boot_display(i);
@@ -1777,13 +1793,6 @@ static int add_display_components(struct device *dev, 
			}

		}



		for (i = 0; ; i++) {

			node = of_parse_phandle(np, "connectors", i);

			if (!node)

				break;



			component_match_add(dev, matchptr, compare_of, node);

		}

		return 0;

	}

drivers/gpu/drm/msm/msm_kms.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ struct msm_kms_funcs { 
	struct msm_gem_address_space *(*get_address_space)(

			struct msm_kms *kms,

			unsigned int domain);

	/* handle continuous splash  */

	int (*cont_splash_config)(struct msm_kms *kms);

};



struct msm_kms {