> -----Original Message----- > From: Vikas Sajjan [mailto:vikas.sajjan@xxxxxxxxxx] > Sent: Friday, February 15, 2013 3:43 PM > To: dri-devel@xxxxxxxxxxxxxxxxxxxxx > Cc: linux-media@xxxxxxxxxxxxxxx; kgene.kim@xxxxxxxxxxx; > inki.dae@xxxxxxxxxxx; l.krishna@xxxxxxxxxxx; patches@xxxxxxxxxx > Subject: [PATCH v6 1/1] video: drm: exynos: Add display-timing node > parsing using video helper function > > Add support for parsing the display-timing node using video helper > function. > > The DT node parsing and pinctrl selection is done only if 'dev.of_node' > exists and the NON-DT logic is still maintained under the 'else' part. > > Signed-off-by: Leela Krishna Amudala <l.krishna@xxxxxxxxxxx> > Signed-off-by: Vikas Sajjan <vikas.sajjan@xxxxxxxxxx> > --- > drivers/gpu/drm/exynos/exynos_drm_fimd.c | 37 > ++++++++++++++++++++++++++---- > 1 file changed, 33 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c > b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > index 9537761..8b2c0ff 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > @@ -19,7 +19,9 @@ > #include <linux/clk.h> > #include <linux/of_device.h> > #include <linux/pm_runtime.h> > +#include <linux/pinctrl/consumer.h> > > +#include <video/of_display_timing.h> > #include <video/samsung_fimd.h> > #include <drm/exynos_drm.h> > > @@ -877,16 +879,43 @@ static int fimd_probe(struct platform_device *pdev) > struct exynos_drm_subdrv *subdrv; > struct exynos_drm_fimd_pdata *pdata; > struct exynos_drm_panel_info *panel; > + struct fb_videomode *fbmode; > + struct pinctrl *pctrl; > struct resource *res; > int win; > int ret = -EINVAL; > > DRM_DEBUG_KMS("%s\n", __FILE__); > > - pdata = pdev->dev.platform_data; > - if (!pdata) { > - dev_err(dev, "no platform data specified\n"); > - return -EINVAL; > + if (pdev->dev.of_node) { > + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); > + if (!pdata) { > + DRM_ERROR("memory allocation for pdata failed\n"); > + return -ENOMEM; > + } > + > + fbmode = &pdata->panel.timing; > + ret = of_get_fb_videomode(dev->of_node, fbmode, > + OF_USE_NATIVE_MODE); > + if (ret) { > + DRM_ERROR("failed: of_get_fb_videomode()\n" > + "with return value: %d\n", ret); > + return ret; > + } > + > + pctrl = devm_pinctrl_get_select_default(dev); Why does it need pinctrl? and even though needed, I think this should be separated into another one. Thanks, Inki Dae > + if (IS_ERR_OR_NULL(pctrl)) { > + DRM_ERROR("failed: > devm_pinctrl_get_select_default()\n" > + "with return value: %d\n", PTR_RET(pctrl)); > + return PTR_RET(pctrl); > + } > + > + } else { > + pdata = pdev->dev.platform_data; > + if (!pdata) { > + DRM_ERROR("no platform data specified\n"); > + return -EINVAL; > + } > } > > panel = &pdata->panel; > -- > 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
