proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-11 09:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/exynos/fimd: embed manager into private context

Browse Source 
exynos_drm_manager is used by internal Exynos DRM framework for
representing crtc. As it should be mapped 1:1 to fimd 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 FIMD devices in the system.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Andrzej Hajda 2014-11-17 09:54:18 +01:00 committed by Inki Dae
parent e1819aad14
commit e152dbd77b
1 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/gpu/drm/exynos/exynos_drm_fimd.c
View File

@ -84,8 +84,6 @@
/* FIMD has totally five hardware windows. */ /* FIMD has totally five hardware windows. */
#define WINDOWS_NR 5 #define WINDOWS_NR 5
#define get_fimd_manager(mgr) platform_get_drvdata(to_platform_device(dev))
struct fimd_driver_data { struct fimd_driver_data {
unsigned int timing_base; unsigned int timing_base;
unsigned int lcdblk_offset; unsigned int lcdblk_offset;
@ -159,6 +157,7 @@ struct fimd_win_data {
}; };
struct fimd_context { struct fimd_context {
struct exynos_drm_manager manager;
struct device *dev; struct device *dev;
struct drm_device *drm_dev; struct drm_device *drm_dev;
struct clk *bus_clk; struct clk *bus_clk;
@ -965,8 +964,7 @@ static void fimd_dpms(struct exynos_drm_manager *mgr, int mode)
static void fimd_trigger(struct device *dev) static void fimd_trigger(struct device *dev)
{ {
struct exynos_drm_manager *mgr = get_fimd_manager(dev); struct fimd_context *ctx = dev_get_drvdata(dev);
struct fimd_context *ctx = mgr->ctx;
struct fimd_driver_data *driver_data = ctx->driver_data; struct fimd_driver_data *driver_data = ctx->driver_data;
void *timing_base = ctx->regs + driver_data->timing_base; void *timing_base = ctx->regs + driver_data->timing_base;
u32 reg; u32 reg;
@ -1032,11 +1030,6 @@ static struct exynos_drm_manager_ops fimd_manager_ops = {
.te_handler = fimd_te_handler, .te_handler = fimd_te_handler,
}; };
static struct exynos_drm_manager fimd_manager = {
.type = EXYNOS_DISPLAY_TYPE_LCD,
.ops = &fimd_manager_ops,
};
static irqreturn_t fimd_irq_handler(int irq, void *dev_id) static irqreturn_t fimd_irq_handler(int irq, void *dev_id)
{ {
struct fimd_context *ctx = (struct fimd_context *)dev_id; struct fimd_context *ctx = (struct fimd_context *)dev_id;
@ -1074,11 +1067,11 @@ out:
static int fimd_bind(struct device *dev, struct device *master, void *data) static int fimd_bind(struct device *dev, struct device *master, void *data)
{ {
struct fimd_context *ctx = fimd_manager.ctx; struct fimd_context *ctx = dev_get_drvdata(dev);
struct drm_device *drm_dev = data; struct drm_device *drm_dev = data;
fimd_mgr_initialize(&fimd_manager, drm_dev); fimd_mgr_initialize(&ctx->manager, drm_dev);
exynos_drm_crtc_create(&fimd_manager); exynos_drm_crtc_create(&ctx->manager);
if (ctx->display) if (ctx->display)
exynos_drm_create_enc_conn(drm_dev, ctx->display); exynos_drm_create_enc_conn(drm_dev, ctx->display);
@ -1089,15 +1082,14 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
static void fimd_unbind(struct device *dev, struct device *master, static void fimd_unbind(struct device *dev, struct device *master,
void *data) void *data)
{ {
struct exynos_drm_manager *mgr = dev_get_drvdata(dev); struct fimd_context *ctx = dev_get_drvdata(dev);
struct fimd_context *ctx = fimd_manager.ctx;
fimd_dpms(mgr, 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(dev);
fimd_mgr_remove(mgr); fimd_mgr_remove(&ctx->manager);
} }
static const struct component_ops fimd_component_ops = { static const struct component_ops fimd_component_ops = {
@ -1113,21 +1105,20 @@ static int fimd_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int ret = -EINVAL; int ret = -EINVAL;
ret = exynos_drm_component_add(&pdev->dev, EXYNOS_DEVICE_TYPE_CRTC, if (!dev->of_node)
fimd_manager.type); return -ENODEV;
if (ret)
return ret;
if (!dev->of_node) {
ret = -ENODEV;
goto err_del_component;
}
ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
if (!ctx) { if (!ctx)
ret = -ENOMEM; return -ENOMEM;
goto err_del_component;
} ctx->manager.type = EXYNOS_DISPLAY_TYPE_LCD;
ctx->manager.ops = &fimd_manager_ops;
ret = exynos_drm_component_add(dev, EXYNOS_DEVICE_TYPE_CRTC,
ctx->manager.type);
if (ret)
return ret;
ctx->dev = dev; ctx->dev = dev;
ctx->suspended = true; ctx->suspended = true;
@ -1215,28 +1206,27 @@ static int fimd_probe(struct platform_device *pdev)
init_waitqueue_head(&ctx->wait_vsync_queue); init_waitqueue_head(&ctx->wait_vsync_queue);
atomic_set(&ctx->wait_vsync_event, 0); atomic_set(&ctx->wait_vsync_event, 0);
ctx->manager.ctx = ctx;
platform_set_drvdata(pdev, &fimd_manager); platform_set_drvdata(pdev, ctx);
fimd_manager.ctx = ctx;
ctx->display = exynos_dpi_probe(dev); ctx->display = exynos_dpi_probe(dev);
if (IS_ERR(ctx->display)) if (IS_ERR(ctx->display))
return PTR_ERR(ctx->display); return PTR_ERR(ctx->display);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(dev);
ret = component_add(&pdev->dev, &fimd_component_ops); ret = component_add(dev, &fimd_component_ops);
if (ret) if (ret)
goto err_disable_pm_runtime; goto err_disable_pm_runtime;
return ret; return ret;
err_disable_pm_runtime: err_disable_pm_runtime:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(dev);
err_del_component: err_del_component:
exynos_drm_component_del(&pdev->dev, EXYNOS_DEVICE_TYPE_CRTC); exynos_drm_component_del(dev, EXYNOS_DEVICE_TYPE_CRTC);
return ret; return ret;
} }