iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/exynos: fimd: move platform data parsing to separate function

Browse Source 
The patch moves platfrom_data and device tree parsing
to separate function.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Andrzej Hajda 2013-08-21 16:22:03 +02:00 committed by Inki Dae
parent b063f4af84
commit 562ad9f4a3
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ struct fimd_context {
wait_queue_head_t wait_vsync_queue; wait_queue_head_t wait_vsync_queue;
atomic_t wait_vsync_event; atomic_t wait_vsync_event;
struct exynos_drm_panel_info *panel; struct exynos_drm_panel_info panel;
struct fimd_driver_data *driver_data; struct fimd_driver_data *driver_data;
}; };
@ -164,7 +164,7 @@ static void *fimd_get_panel(struct device *dev)
{ {
struct fimd_context *ctx = get_fimd_context(dev); struct fimd_context *ctx = get_fimd_context(dev);
return ctx->panel; return &ctx->panel;
} }
static int fimd_check_mode(struct device *dev, struct drm_display_mode *mode) static int fimd_check_mode(struct device *dev, struct drm_display_mode *mode)
@ -244,7 +244,7 @@ static void fimd_apply(struct device *subdrv_dev)
static void fimd_commit(struct device *dev) static void fimd_commit(struct device *dev)
{ {
struct fimd_context *ctx = get_fimd_context(dev); struct fimd_context *ctx = get_fimd_context(dev);
struct exynos_drm_panel_info *panel = ctx->panel; struct exynos_drm_panel_info *panel = &ctx->panel;
struct videomode *vm = &panel->vm; struct videomode *vm = &panel->vm;
struct fimd_driver_data *driver_data; struct fimd_driver_data *driver_data;
u32 val; u32 val;
@ -755,7 +755,7 @@ static void fimd_subdrv_remove(struct drm_device *drm_dev, struct device *dev)
static int fimd_configure_clocks(struct fimd_context *ctx, struct device *dev) static int fimd_configure_clocks(struct fimd_context *ctx, struct device *dev)
{ {
struct videomode *vm = &ctx->panel->vm; struct videomode *vm = &ctx->panel.vm;
unsigned long clk; unsigned long clk;
ctx->bus_clk = devm_clk_get(dev, "fimd"); ctx->bus_clk = devm_clk_get(dev, "fimd");
@ -892,24 +892,13 @@ static int fimd_activate(struct fimd_context *ctx, bool enable)
return 0; return 0;
} }
static int fimd_probe(struct platform_device *pdev) static int fimd_get_platform_data(struct fimd_context *ctx, struct device *dev)
{ {
struct device *dev = &pdev->dev;
struct fimd_context *ctx;
struct exynos_drm_subdrv *subdrv;
struct exynos_drm_fimd_pdata *pdata;
struct exynos_drm_panel_info *panel;
struct resource *res;
int win;
int ret = -EINVAL;
if (dev->of_node) { if (dev->of_node) {
struct videomode *vm; struct videomode *vm;
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); int ret;
if (!pdata)
return -ENOMEM;
vm = &pdata->panel.vm; vm = &ctx->panel.vm;
ret = of_get_videomode(dev->of_node, vm, OF_USE_NATIVE_MODE); ret = of_get_videomode(dev->of_node, vm, OF_USE_NATIVE_MODE);
if (ret) { if (ret) {
DRM_ERROR("failed: of_get_videomode() : %d\n", ret); DRM_ERROR("failed: of_get_videomode() : %d\n", ret);
@ -917,31 +906,45 @@ static int fimd_probe(struct platform_device *pdev)
} }
if (vm->flags & DISPLAY_FLAGS_VSYNC_LOW) if (vm->flags & DISPLAY_FLAGS_VSYNC_LOW)
pdata->vidcon1 |= VIDCON1_INV_VSYNC; ctx->vidcon1 |= VIDCON1_INV_VSYNC;
if (vm->flags & DISPLAY_FLAGS_HSYNC_LOW) if (vm->flags & DISPLAY_FLAGS_HSYNC_LOW)
pdata->vidcon1 |= VIDCON1_INV_HSYNC; ctx->vidcon1 |= VIDCON1_INV_HSYNC;
if (vm->flags & DISPLAY_FLAGS_DE_LOW) if (vm->flags & DISPLAY_FLAGS_DE_LOW)
pdata->vidcon1 |= VIDCON1_INV_VDEN; ctx->vidcon1 |= VIDCON1_INV_VDEN;
if (vm->flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE) if (vm->flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
pdata->vidcon1 |= VIDCON1_INV_VCLK; ctx->vidcon1 |= VIDCON1_INV_VCLK;
} else { } else {
pdata = dev->platform_data; struct exynos_drm_fimd_pdata *pdata = dev->platform_data;
if (!pdata) { if (!pdata) {
DRM_ERROR("no platform data specified\n"); DRM_ERROR("no platform data specified\n");
return -EINVAL; return -EINVAL;
} }
ctx->vidcon0 = pdata->vidcon0;
ctx->vidcon1 = pdata->vidcon1;
ctx->default_win = pdata->default_win;
ctx->panel = pdata->panel;
} }
panel = &pdata->panel; return 0;
if (!panel) { }
dev_err(dev, "panel is null.\n");
return -EINVAL; static int fimd_probe(struct platform_device *pdev)
} {
struct device *dev = &pdev->dev;
struct fimd_context *ctx;
struct exynos_drm_subdrv *subdrv;
struct resource *res;
int win;
int ret = -EINVAL;
ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
if (!ctx) if (!ctx)
return -ENOMEM; return -ENOMEM;
ret = fimd_get_platform_data(ctx, dev);
if (ret)
return ret;
ret = fimd_configure_clocks(ctx, dev); ret = fimd_configure_clocks(ctx, dev);
if (ret) if (ret)
return ret; return ret;
@ -968,10 +971,6 @@ static int fimd_probe(struct platform_device *pdev)
} }
ctx->driver_data = drm_fimd_get_driver_data(pdev); ctx->driver_data = drm_fimd_get_driver_data(pdev);
ctx->vidcon0 = pdata->vidcon0;
ctx->vidcon1 = pdata->vidcon1;
ctx->default_win = pdata->default_win;
ctx->panel = panel;
DRM_INIT_WAITQUEUE(&ctx->wait_vsync_queue); DRM_INIT_WAITQUEUE(&ctx->wait_vsync_queue);
atomic_set(&ctx->wait_vsync_event, 0); atomic_set(&ctx->wait_vsync_event, 0);