p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/exynos/vidi: 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 vidi
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 vidi 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:22 +01:00 committed by Inki Dae
parent 0d8424f83c
commit 7340426aff
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/exynos/exynos_drm_vidi.c
View File

@ -47,6 +47,7 @@ struct vidi_win_data {
struct vidi_context { struct vidi_context {
struct exynos_drm_manager manager; struct exynos_drm_manager manager;
struct exynos_drm_display display;
struct drm_device *drm_dev; struct drm_device *drm_dev;
struct drm_crtc *crtc; struct drm_crtc *crtc;
struct drm_encoder *encoder; struct drm_encoder *encoder;
@ -554,11 +555,6 @@ static struct exynos_drm_display_ops vidi_display_ops = {
.create_connector = vidi_create_connector, .create_connector = vidi_create_connector,
}; };
static struct exynos_drm_display vidi_display = {
.type = EXYNOS_DISPLAY_TYPE_VIDI,
.ops = &vidi_display_ops,
};
static int vidi_subdrv_probe(struct drm_device *drm_dev, struct device *dev) static int vidi_subdrv_probe(struct drm_device *drm_dev, struct device *dev)
{ {
struct vidi_context *ctx = dev_get_drvdata(dev); struct vidi_context *ctx = dev_get_drvdata(dev);
@ -573,7 +569,7 @@ static int vidi_subdrv_probe(struct drm_device *drm_dev, struct device *dev)
return ret; return ret;
} }
ret = exynos_drm_create_enc_conn(drm_dev, &vidi_display); ret = exynos_drm_create_enc_conn(drm_dev, &ctx->display);
if (ret) { if (ret) {
crtc->funcs->destroy(crtc); crtc->funcs->destroy(crtc);
DRM_ERROR("failed to create encoder and connector.\n"); DRM_ERROR("failed to create encoder and connector.\n");
@ -595,11 +591,13 @@ static int vidi_probe(struct platform_device *pdev)
ctx->manager.type = EXYNOS_DISPLAY_TYPE_VIDI; ctx->manager.type = EXYNOS_DISPLAY_TYPE_VIDI;
ctx->manager.ops = &vidi_manager_ops; ctx->manager.ops = &vidi_manager_ops;
ctx->display.type = EXYNOS_DISPLAY_TYPE_VIDI;
ctx->display.ops = &vidi_display_ops;
ctx->default_win = 0; ctx->default_win = 0;
INIT_WORK(&ctx->work, vidi_fake_vblank_handler); INIT_WORK(&ctx->work, vidi_fake_vblank_handler);
vidi_display.ctx = ctx; ctx->display.ctx = ctx;
mutex_init(&ctx->lock); mutex_init(&ctx->lock);