| Message ID | 1347451727-13386-4-git-send-email-rahul.sharma@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, Rahul. On 09/12/2012 09:08 PM, Rahul Sharma wrote: > exynos-drm-hdmi need context pointers from hdmi and mixer. These > pointers were expected from the plf data. Cleaned this dependency What does plf data mean? > by exporting i/f which are called by hdmi, mixer driver probes > for setting their context. It is reasonable to me. This can remove struct exynos_drm_common_hdmi_pd. Thanks. > Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> > --- > drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 47 +++++++++++++++-------------- > drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 2 + > drivers/gpu/drm/exynos/exynos_hdmi.c | 3 ++ > drivers/gpu/drm/exynos/exynos_mixer.c | 3 ++ > 4 files changed, 32 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c > index 0584132..4c8d933 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c > @@ -29,6 +29,11 @@ > #define get_ctx_from_subdrv(subdrv) container_of(subdrv,\ > struct drm_hdmi_context, subdrv); > > +/* Common hdmi subdrv needs to access the hdmi and mixer though context. > +* These should be initialied by the repective drivers */ > +static struct exynos_drm_hdmi_context *hdmi_ctx; > +static struct exynos_drm_hdmi_context *mixer_ctx; > + > /* these callback points shoud be set by specific drivers. */ > static struct exynos_hdmi_ops *hdmi_ops; > static struct exynos_mixer_ops *mixer_ops; > @@ -41,6 +46,18 @@ struct drm_hdmi_context { > bool enabled[MIXER_WIN_NR]; > }; > > +void exynos_hdmi_drv_attach(struct exynos_drm_hdmi_context *ctx) > +{ > + if (ctx) > + hdmi_ctx = ctx; > +} > + > +void exynos_mixer_drv_attach(struct exynos_drm_hdmi_context *ctx) > +{ > + if (ctx) > + mixer_ctx = ctx; > +} > + > void exynos_hdmi_ops_register(struct exynos_hdmi_ops *ops) > { > DRM_DEBUG_KMS("%s\n", __FILE__); > @@ -303,46 +320,30 @@ static int hdmi_subdrv_probe(struct drm_device *drm_dev, > { > struct exynos_drm_subdrv *subdrv = to_subdrv(dev); > struct drm_hdmi_context *ctx; > - struct platform_device *pdev = to_platform_device(dev); > - struct exynos_drm_common_hdmi_pd *pd; > > DRM_DEBUG_KMS("%s\n", __FILE__); > > - pd = pdev->dev.platform_data; > - > - if (!pd) { > - DRM_DEBUG_KMS("platform data is null.\n"); > - return -EFAULT; > - } > - > - if (!pd->hdmi_dev) { > + if (!hdmi_ctx) { > DRM_DEBUG_KMS("hdmi device is null.\n"); > return -EFAULT; > } > > - if (!pd->mixer_dev) { > + if (!mixer_ctx) { > DRM_DEBUG_KMS("mixer device is null.\n"); > return -EFAULT; > } > > ctx = get_ctx_from_subdrv(subdrv); > > - ctx->hdmi_ctx = (struct exynos_drm_hdmi_context *) > - to_context(pd->hdmi_dev); > - if (!ctx->hdmi_ctx) { > - DRM_DEBUG_KMS("hdmi context is null.\n"); > + if (!ctx) { > + DRM_DEBUG_KMS("context is null.\n"); > return -EFAULT; > } > > - ctx->hdmi_ctx->drm_dev = drm_dev; > - > - ctx->mixer_ctx = (struct exynos_drm_hdmi_context *) > - to_context(pd->mixer_dev); > - if (!ctx->mixer_ctx) { > - DRM_DEBUG_KMS("mixer context is null.\n"); > - return -EFAULT; > - } > + ctx->hdmi_ctx = hdmi_ctx; > + ctx->mixer_ctx = mixer_ctx; > > + ctx->hdmi_ctx->drm_dev = drm_dev; > ctx->mixer_ctx->drm_dev = drm_dev; > > return 0; > diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h > index d9f9e9f..2da5ffd 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h > +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h > @@ -73,6 +73,8 @@ struct exynos_mixer_ops { > void (*win_disable)(void *ctx, int zpos); > }; > > +void exynos_hdmi_drv_attach(struct exynos_drm_hdmi_context *ctx); > +void exynos_mixer_drv_attach(struct exynos_drm_hdmi_context *ctx); > void exynos_hdmi_ops_register(struct exynos_hdmi_ops *ops); > void exynos_mixer_ops_register(struct exynos_mixer_ops *ops); > #endif > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c > index 5236256..82ee810 100644 > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c > @@ -2599,6 +2599,9 @@ static int __devinit hdmi_probe(struct platform_device *pdev) > > drm_hdmi_ctx = platform_get_drvdata(pdev); > > + /* Attach HDMI Driver to common hdmi. */ > + exynos_hdmi_drv_attach(drm_hdmi_ctx); > + > /* register specific callbacks to common hdmi. */ > exynos_hdmi_ops_register(&hdmi_ops); > > diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c > index 7d04a40..f9e26f2 100644 > --- a/drivers/gpu/drm/exynos/exynos_mixer.c > +++ b/drivers/gpu/drm/exynos/exynos_mixer.c > @@ -1165,6 +1165,9 @@ static int __devinit mixer_probe(struct platform_device *pdev) > if (ret) > goto fail; > > + /* attach mixer driver to common hdmi. */ > + exynos_mixer_drv_attach(drm_hdmi_ctx); > + > /* register specific callback point to common hdmi. */ > exynos_mixer_ops_register(&mixer_ops); >
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c index 0584132..4c8d933 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c @@ -29,6 +29,11 @@ #define get_ctx_from_subdrv(subdrv) container_of(subdrv,\ struct drm_hdmi_context, subdrv); +/* Common hdmi subdrv needs to access the hdmi and mixer though context. +* These should be initialied by the repective drivers */ +static struct exynos_drm_hdmi_context *hdmi_ctx; +static struct exynos_drm_hdmi_context *mixer_ctx; + /* these callback points shoud be set by specific drivers. */ static struct exynos_hdmi_ops *hdmi_ops; static struct exynos_mixer_ops *mixer_ops; @@ -41,6 +46,18 @@ struct drm_hdmi_context { bool enabled[MIXER_WIN_NR]; }; +void exynos_hdmi_drv_attach(struct exynos_drm_hdmi_context *ctx) +{ + if (ctx) + hdmi_ctx = ctx; +} + +void exynos_mixer_drv_attach(struct exynos_drm_hdmi_context *ctx) +{ + if (ctx) + mixer_ctx = ctx; +} + void exynos_hdmi_ops_register(struct exynos_hdmi_ops *ops) { DRM_DEBUG_KMS("%s\n", __FILE__); @@ -303,46 +320,30 @@ static int hdmi_subdrv_probe(struct drm_device *drm_dev, { struct exynos_drm_subdrv *subdrv = to_subdrv(dev); struct drm_hdmi_context *ctx; - struct platform_device *pdev = to_platform_device(dev); - struct exynos_drm_common_hdmi_pd *pd; DRM_DEBUG_KMS("%s\n", __FILE__); - pd = pdev->dev.platform_data; - - if (!pd) { - DRM_DEBUG_KMS("platform data is null.\n"); - return -EFAULT; - } - - if (!pd->hdmi_dev) { + if (!hdmi_ctx) { DRM_DEBUG_KMS("hdmi device is null.\n"); return -EFAULT; } - if (!pd->mixer_dev) { + if (!mixer_ctx) { DRM_DEBUG_KMS("mixer device is null.\n"); return -EFAULT; } ctx = get_ctx_from_subdrv(subdrv); - ctx->hdmi_ctx = (struct exynos_drm_hdmi_context *) - to_context(pd->hdmi_dev); - if (!ctx->hdmi_ctx) { - DRM_DEBUG_KMS("hdmi context is null.\n"); + if (!ctx) { + DRM_DEBUG_KMS("context is null.\n"); return -EFAULT; } - ctx->hdmi_ctx->drm_dev = drm_dev; - - ctx->mixer_ctx = (struct exynos_drm_hdmi_context *) - to_context(pd->mixer_dev); - if (!ctx->mixer_ctx) { - DRM_DEBUG_KMS("mixer context is null.\n"); - return -EFAULT; - } + ctx->hdmi_ctx = hdmi_ctx; + ctx->mixer_ctx = mixer_ctx; + ctx->hdmi_ctx->drm_dev = drm_dev; ctx->mixer_ctx->drm_dev = drm_dev; return 0; diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h index d9f9e9f..2da5ffd 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h @@ -73,6 +73,8 @@ struct exynos_mixer_ops { void (*win_disable)(void *ctx, int zpos); }; +void exynos_hdmi_drv_attach(struct exynos_drm_hdmi_context *ctx); +void exynos_mixer_drv_attach(struct exynos_drm_hdmi_context *ctx); void exynos_hdmi_ops_register(struct exynos_hdmi_ops *ops); void exynos_mixer_ops_register(struct exynos_mixer_ops *ops); #endif diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 5236256..82ee810 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -2599,6 +2599,9 @@ static int __devinit hdmi_probe(struct platform_device *pdev) drm_hdmi_ctx = platform_get_drvdata(pdev); + /* Attach HDMI Driver to common hdmi. */ + exynos_hdmi_drv_attach(drm_hdmi_ctx); + /* register specific callbacks to common hdmi. */ exynos_hdmi_ops_register(&hdmi_ops); diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 7d04a40..f9e26f2 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1165,6 +1165,9 @@ static int __devinit mixer_probe(struct platform_device *pdev) if (ret) goto fail; + /* attach mixer driver to common hdmi. */ + exynos_mixer_drv_attach(drm_hdmi_ctx); + /* register specific callback point to common hdmi. */ exynos_mixer_ops_register(&mixer_ops);
exynos-drm-hdmi need context pointers from hdmi and mixer. These pointers were expected from the plf data. Cleaned this dependency by exporting i/f which are called by hdmi, mixer driver probes for setting their context. Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 47 +++++++++++++++-------------- drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 2 + drivers/gpu/drm/exynos/exynos_hdmi.c | 3 ++ drivers/gpu/drm/exynos/exynos_mixer.c | 3 ++ 4 files changed, 32 insertions(+), 23 deletions(-)