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

Commit 400129f0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-fixes-for-v4.12' of... 

Merge tag 'exynos-drm-fixes-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

- Fix a regression to description of exynos_drm_crtc
- Remove preclose hook of Exynos
  . This was a exynos change of the patch series[1] merged already.
- Fix one dt broken issue
- Make sure to release bridge_node of Exynos MIPI-DSI driver.

[1] https://lists.freedesktop.org/archives/dri-devel/2017-March/135111.html

* tag 'exynos-drm-fixes-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: clean up description of exynos_drm_crtc
  drm/exynos: dsi: Remove bridge node reference in removal
  drm/exynos: dsi: Fix the parse_dt function
  drm/exynos: Merge pre/postclose hooks
parents 8ef6fcc8 e379cbee

drivers/gpu/drm/exynos/exynos_drm_drv.c

+1 −7
Original line number Diff line number Diff line
@@ -82,14 +82,9 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file) 
	return ret;

}



static void exynos_drm_preclose(struct drm_device *dev,

					struct drm_file *file)

{

	exynos_drm_subdrv_close(dev, file);

}



static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)

{

	exynos_drm_subdrv_close(dev, file);

	kfree(file->driver_priv);

	file->driver_priv = NULL;

}
@@ -145,7 +140,6 @@ static struct drm_driver exynos_drm_driver = { 
	.driver_features	= DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME

				  | DRIVER_ATOMIC | DRIVER_RENDER,

	.open			= exynos_drm_open,

	.preclose		= exynos_drm_preclose,

	.lastclose		= exynos_drm_lastclose,

	.postclose		= exynos_drm_postclose,

	.gem_free_object_unlocked = exynos_drm_gem_free_object,

drivers/gpu/drm/exynos/exynos_drm_drv.h

+1 −4
Original line number Diff line number Diff line
@@ -160,12 +160,9 @@ struct exynos_drm_clk { 
 *	drm framework doesn't support multiple irq yet.

 *	we can refer to the crtc to current hardware interrupt occurred through

 *	this pipe value.

 * @enabled: if the crtc is enabled or not

 * @event: vblank event that is currently queued for flip

 * @wait_update: wait all pending planes updates to finish

 * @pending_update: number of pending plane updates in this crtc

 * @ops: pointer to callbacks for exynos drm specific functionality

 * @ctx: A pointer to the crtc's implementation specific context

 * @pipe_clk: A pointer to the crtc's pipeline clock.

 */

struct exynos_drm_crtc {

	struct drm_crtc			base;

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+9 −17
Original line number Diff line number Diff line
@@ -1633,7 +1633,6 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi) 
{

	struct device *dev = dsi->dev;

	struct device_node *node = dev->of_node;

	struct device_node *ep;

	int ret;



	ret = exynos_dsi_of_read_u32(node, "samsung,pll-clock-frequency",
@@ -1641,32 +1640,21 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi) 
	if (ret < 0)

		return ret;



	ep = of_graph_get_endpoint_by_regs(node, DSI_PORT_OUT, 0);

	if (!ep) {

		dev_err(dev, "no output port with endpoint specified\n");

		return -EINVAL;

	}



	ret = exynos_dsi_of_read_u32(ep, "samsung,burst-clock-frequency",

	ret = exynos_dsi_of_read_u32(node, "samsung,burst-clock-frequency",

				     &dsi->burst_clk_rate);

	if (ret < 0)

		goto end;

		return ret;



	ret = exynos_dsi_of_read_u32(ep, "samsung,esc-clock-frequency",

	ret = exynos_dsi_of_read_u32(node, "samsung,esc-clock-frequency",

				     &dsi->esc_clk_rate);

	if (ret < 0)

		goto end;



	of_node_put(ep);

		return ret;



	dsi->bridge_node = of_graph_get_remote_node(node, DSI_PORT_OUT, 0);

	if (!dsi->bridge_node)

		return -EINVAL;



end:

	of_node_put(ep);



	return ret;

	return 0;

}



static int exynos_dsi_bind(struct device *dev, struct device *master,
@@ -1817,6 +1805,10 @@ static int exynos_dsi_probe(struct platform_device *pdev) 


static int exynos_dsi_remove(struct platform_device *pdev)

{

	struct exynos_dsi *dsi = platform_get_drvdata(pdev);



	of_node_put(dsi->bridge_node);



	pm_runtime_disable(&pdev->dev);



	component_del(&pdev->dev, &exynos_dsi_component_ops);