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

Commit 4cfde1f2 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Inki Dae
Browse files

drm/exynos/dpi: embed display into private context 



exynos_drm_display is used by internal Exynos DRM framework for
representing encoder:connector pair. As it should be mapped 1:1 to dpi
private context it seems more reasonable to embed it directly in that context.
As a result further code simplification will be possible.
Moreover it will be possible to handle multiple dpi devices in the system.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 63b3be32

drivers/gpu/drm/exynos/exynos_drm_dpi.c

+21 −18
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "exynos_drm_drv.h"

#include "exynos_drm_drv.h"





struct exynos_dpi {

struct exynos_dpi {

	struct exynos_drm_display display;

	struct device *dev;

	struct device *dev;

	struct device_node *panel_node;

	struct device_node *panel_node;
@@ -35,6 +36,11 @@ struct exynos_dpi { 




#define connector_to_dpi(c) container_of(c, struct exynos_dpi, connector)

#define connector_to_dpi(c) container_of(c, struct exynos_dpi, connector)





static inline struct exynos_dpi *display_to_dpi(struct exynos_drm_display *d)

{

	return container_of(d, struct exynos_dpi, display);

}



static enum drm_connector_status

static enum drm_connector_status

exynos_dpi_detect(struct drm_connector *connector, bool force)

exynos_dpi_detect(struct drm_connector *connector, bool force)

{

{
@@ -165,11 +171,6 @@ static struct exynos_drm_display_ops exynos_dpi_display_ops = { 
	.dpms = exynos_dpi_dpms

	.dpms = exynos_dpi_dpms

};

};





static struct exynos_drm_display exynos_dpi_display = {

	.type = EXYNOS_DISPLAY_TYPE_LCD,

	.ops = &exynos_dpi_display_ops,

};



/* of_* functions will be removed after merge of of_graph patches */

/* of_* functions will be removed after merge of of_graph patches */

static struct device_node *

static struct device_node *

of_get_child_by_name_reg(struct device_node *parent, const char *name, u32 reg)

of_get_child_by_name_reg(struct device_node *parent, const char *name, u32 reg)
@@ -299,20 +300,22 @@ struct exynos_drm_display *exynos_dpi_probe(struct device *dev) 
	struct exynos_dpi *ctx;

	struct exynos_dpi *ctx;

	int ret;

	int ret;





	ret = exynos_drm_component_add(dev,

					EXYNOS_DEVICE_TYPE_CONNECTOR,

					exynos_dpi_display.type);

	if (ret)

		return ERR_PTR(ret);



	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);

	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);

	if (!ctx)

	if (!ctx)

		goto err_del_component;

		return ERR_PTR(-ENOMEM);





	ctx->display.type = EXYNOS_DISPLAY_TYPE_LCD;

	ctx->display.ops = &exynos_dpi_display_ops;

	ctx->dev = dev;

	ctx->dev = dev;

	exynos_dpi_display.ctx = ctx;

	ctx->display.ctx = ctx;

	ctx->dpms_mode = DRM_MODE_DPMS_OFF;

	ctx->dpms_mode = DRM_MODE_DPMS_OFF;





	ret = exynos_drm_component_add(dev,

					EXYNOS_DEVICE_TYPE_CONNECTOR,

					ctx->display.type);

	if (ret)

		return ERR_PTR(ret);



	ret = exynos_dpi_parse_dt(ctx);

	ret = exynos_dpi_parse_dt(ctx);

	if (ret < 0) {

	if (ret < 0) {

		devm_kfree(dev, ctx);

		devm_kfree(dev, ctx);
@@ -328,7 +331,7 @@ struct exynos_drm_display *exynos_dpi_probe(struct device *dev) 
		}

		}

	}

	}





	return &exynos_dpi_display;

	return &ctx->display;





err_del_component:

err_del_component:

	exynos_drm_component_del(dev, EXYNOS_DEVICE_TYPE_CONNECTOR);

	exynos_drm_component_del(dev, EXYNOS_DEVICE_TYPE_CONNECTOR);
@@ -336,16 +339,16 @@ struct exynos_drm_display *exynos_dpi_probe(struct device *dev) 
	return NULL;

	return NULL;

}

}





int exynos_dpi_remove(struct device *dev)

int exynos_dpi_remove(struct exynos_drm_display *display)

{

{

	struct exynos_dpi *ctx = exynos_dpi_display.ctx;

	struct exynos_dpi *ctx = display_to_dpi(display);





	exynos_dpi_dpms(&exynos_dpi_display, DRM_MODE_DPMS_OFF);

	exynos_dpi_dpms(&ctx->display, DRM_MODE_DPMS_OFF);





	if (ctx->panel)

	if (ctx->panel)

		drm_panel_detach(ctx->panel);

		drm_panel_detach(ctx->panel);





	exynos_drm_component_del(dev, EXYNOS_DEVICE_TYPE_CONNECTOR);

	exynos_drm_component_del(ctx->dev, EXYNOS_DEVICE_TYPE_CONNECTOR);





	return 0;

	return 0;

}
 
}

drivers/gpu/drm/exynos/exynos_drm_drv.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -304,7 +304,7 @@ static inline void exynos_platform_device_ipp_unregister(void) {} 




#ifdef CONFIG_DRM_EXYNOS_DPI

#ifdef CONFIG_DRM_EXYNOS_DPI

struct exynos_drm_display * exynos_dpi_probe(struct device *dev);

struct exynos_drm_display * exynos_dpi_probe(struct device *dev);

int exynos_dpi_remove(struct device *dev);

int exynos_dpi_remove(struct exynos_drm_display *display);

#else

#else

static inline struct exynos_drm_display *

static inline struct exynos_drm_display *

exynos_dpi_probe(struct device *dev) { return NULL; }

exynos_dpi_probe(struct device *dev) { return NULL; }

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1092,7 +1092,7 @@ static void fimd_unbind(struct device *dev, struct device *master, 
	fimd_dpms(&ctx->manager, DRM_MODE_DPMS_OFF);

	fimd_dpms(&ctx->manager, DRM_MODE_DPMS_OFF);





	if (ctx->display)

	if (ctx->display)

		exynos_dpi_remove(dev);

		exynos_dpi_remove(ctx->display);





	fimd_mgr_remove(&ctx->manager);

	fimd_mgr_remove(&ctx->manager);

}

}