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

Commit 07c8fedd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-fixes' of... 

Merge branch 'exynos-drm-fixes' of git://git.kernel.org:/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

  Just regression fixes.
   - Fix build warning and error without PM configuration
   - Fix no display issue on Snow board reported by Michal Suchanek,
     http://www.spinics.net/lists/dri-devel/msg99473.html

* 'exynos-drm-fixes' of git://git.kernel.org:/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: dp: Fix panel and bridge lookup logic
  drm: exynos: make PM functions as __maybe_unused
  drm/exynos: fix building without CONFIG_PM_SLEEP
parents c6b431cc 37e11062

drivers/gpu/drm/exynos/exynos_dp_core.c

+25 −30
Original line number Diff line number Diff line
@@ -1392,7 +1392,7 @@ static const struct component_ops exynos_dp_ops = { 
static int exynos_dp_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *panel_node = NULL, *bridge_node, *endpoint = NULL;

	struct device_node *np = NULL, *endpoint = NULL;

	struct exynos_dp_device *dp;

	int ret;
@@ -1404,41 +1404,36 @@ static int exynos_dp_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, dp);



	/* This is for the backward compatibility. */

	panel_node = of_parse_phandle(dev->of_node, "panel", 0);

	if (panel_node) {

		dp->panel = of_drm_find_panel(panel_node);

		of_node_put(panel_node);

	np = of_parse_phandle(dev->of_node, "panel", 0);

	if (np) {

		dp->panel = of_drm_find_panel(np);

		of_node_put(np);

		if (!dp->panel)

			return -EPROBE_DEFER;

	} else {

		goto out;

	}



	endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);

	if (endpoint) {

			panel_node = of_graph_get_remote_port_parent(endpoint);

			if (panel_node) {

				dp->panel = of_drm_find_panel(panel_node);

				of_node_put(panel_node);

				if (!dp->panel)

		np = of_graph_get_remote_port_parent(endpoint);

		if (np) {

			/* The remote port can be either a panel or a bridge */

			dp->panel = of_drm_find_panel(np);

			if (!dp->panel) {

				dp->ptn_bridge = of_drm_find_bridge(np);

				if (!dp->ptn_bridge) {

					of_node_put(np);

					return -EPROBE_DEFER;

			} else {

				DRM_ERROR("no port node for panel device.\n");

				return -EINVAL;

				}

			}

			of_node_put(np);

		} else {

			DRM_ERROR("no remote endpoint device node found.\n");

			return -EINVAL;

		}



	if (endpoint)

		goto out;



	endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);

	if (endpoint) {

		bridge_node = of_graph_get_remote_port_parent(endpoint);

		if (bridge_node) {

			dp->ptn_bridge = of_drm_find_bridge(bridge_node);

			of_node_put(bridge_node);

			if (!dp->ptn_bridge)

				return -EPROBE_DEFER;

		} else

			return -EPROBE_DEFER;

	} else {

		DRM_ERROR("no port endpoint subnode found.\n");

		return -EINVAL;

	}



out:

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+2 −4
Original line number Diff line number Diff line
@@ -1906,8 +1906,7 @@ static int exynos_dsi_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static int exynos_dsi_suspend(struct device *dev)

static int __maybe_unused exynos_dsi_suspend(struct device *dev)

{

	struct drm_encoder *encoder = dev_get_drvdata(dev);

	struct exynos_dsi *dsi = encoder_to_dsi(encoder);
@@ -1938,7 +1937,7 @@ static int exynos_dsi_suspend(struct device *dev) 
	return 0;

}



static int exynos_dsi_resume(struct device *dev)

static int __maybe_unused exynos_dsi_resume(struct device *dev)

{

	struct drm_encoder *encoder = dev_get_drvdata(dev);

	struct exynos_dsi *dsi = encoder_to_dsi(encoder);
@@ -1972,7 +1971,6 @@ static int exynos_dsi_resume(struct device *dev) 


	return ret;

}

#endif



static const struct dev_pm_ops exynos_dsi_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos_dsi_suspend, exynos_dsi_resume, NULL)

drivers/gpu/drm/exynos/exynos_mixer.c

+2 −4
Original line number Diff line number Diff line
@@ -1289,8 +1289,7 @@ static int mixer_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int exynos_mixer_suspend(struct device *dev)

static int __maybe_unused exynos_mixer_suspend(struct device *dev)

{

	struct mixer_context *ctx = dev_get_drvdata(dev);

	struct mixer_resources *res = &ctx->mixer_res;
@@ -1306,7 +1305,7 @@ static int exynos_mixer_suspend(struct device *dev) 
	return 0;

}



static int exynos_mixer_resume(struct device *dev)

static int __maybe_unused exynos_mixer_resume(struct device *dev)

{

	struct mixer_context *ctx = dev_get_drvdata(dev);

	struct mixer_resources *res = &ctx->mixer_res;
@@ -1342,7 +1341,6 @@ static int exynos_mixer_resume(struct device *dev) 


	return 0;

}

#endif



static const struct dev_pm_ops exynos_mixer_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos_mixer_suspend, exynos_mixer_resume, NULL)