Hi,

On 6 March 2013 14:12, Inki Dae inki.dae@samsung.com wrote:

2013/3/1 Vikas Sajjan vikas.sajjan@linaro.org:

...

Add support for parsing the display-timing node using video helper function.

The DT node parsing 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@samsung.com Signed-off-by: Vikas Sajjan vikas.sajjan@linaro.org Acked-by: Joonyoung Shim jy0922.shim@samsung.com

---

drivers/gpu/drm/exynos/exynos_drm_fimd.c | 24 ++++++++++++++++++++---- 1 file changed, 20 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..e323cf9 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -20,6 +20,7 @@ #include <linux/of_device.h> #include <linux/pm_runtime.h>

+#include <video/of_display_timing.h> #include <video/samsung_fimd.h> #include <drm/exynos_drm.h>

@@ -883,10 +884,25 @@ static int fimd_probe(struct platform_device *pdev)

    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;
  

•           }
  

•           ret = of_get_fb_videomode(dev->of_node, &pdata->panel.timing,
  

•                                   OF_USE_NATIVE_MODE);
  

Add "select OF_VIDEOMODE" and "select FB_MODE_HELPERS" to drivers/gpu/drm/exynos/Kconfig. When EXYNOS_DRM_FIMD config is selected, these two configs should also be selected.

Sure. Will add and resend.

Thanks, Inki Dae

...

•           if (ret) {
  

•                   DRM_ERROR("failed: of_get_fb_videomode() : %d\n", ret);
  

•                   return ret;
  

•           }
  

•   } else {
  

•           pdata = pdev->dev.platform_data;
  

•           if (!pdata) {
  

•                   DRM_ERROR("no platform data specified\n");
  

•                   return -EINVAL;
  

•           }
    }
  
    panel = &pdata->panel;
  

-- 1.7.9.5

---

dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel

Hi All,

On Fri, Mar 1, 2013 at 11:04 AM, Vikas Sajjan vikas.sajjan@linaro.org wrote:

Adds support for pinctrl to drm fimd

Signed-off-by: Leela Krishna Amudala l.krishna@samsung.com Signed-off-by: Vikas Sajjan vikas.sajjan@linaro.org

---

drivers/gpu/drm/exynos/exynos_drm_fimd.c | 9 +++++++++ 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index e323cf9..c00aa4a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -19,6 +19,7 @@ #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> @@ -879,6 +880,7 @@ static int fimd_probe(struct platform_device *pdev) struct exynos_drm_fimd_pdata *pdata; struct exynos_drm_panel_info *panel; struct resource *res;

•   struct pinctrl *pctrl;
    int win;
    int ret = -EINVAL;
  
  

@@ -897,6 +899,13 @@ static int fimd_probe(struct platform_device *pdev) DRM_ERROR("failed: of_get_fb_videomode() : %d\n", ret); return ret; }

•           pctrl = devm_pinctrl_get_select_default(dev);
  

This patch is abandoned, as the device core will do this for you as of commit ab78029ecc347debbd737f06688d788bd9d60c1d "drivers/pinctrl: grab default handles from device core"

•           if (IS_ERR(pctrl)) {
  

•                   DRM_ERROR("failed: devm_pinctrl_get_select_default():\n"
  

•                           "%d\n", PTR_RET(pctrl));
  

•                   return PTR_ERR(pctrl);
  

•           }
  

•   } else {
            pdata = pdev->dev.platform_data;
            if (!pdata) {
  

-- 1.7.9.5

-- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html