This patch set adds device tree support for DRM-FIMD for Samsung's Exynos5250. It includes parsing platform data from dts file.
This patchset is based and tested on top of v3.5-rc6
Changes since V1: - Corrected typo errors and changed compatibility string
Leela Krishna Amudala (1): video: drm: exynos: Add device tree support
Prathyush K (1): drm/exynos: Modifying exynos drm fimd to support exynos5
Documentation/devicetree/bindings/fb/drm-fimd.txt | 73 +++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 101 ++++++++++++++++++++- 2 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/fb/drm-fimd.txt
Add device tree based discovery support for DRM-FIMD driver.
Signed-off-by: Leela Krishna Amudala l.krishna@samsung.com --- Documentation/devicetree/bindings/fb/drm-fimd.txt | 73 +++++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 88 ++++++++++++++++++++- 2 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/fb/drm-fimd.txt
diff --git a/Documentation/devicetree/bindings/fb/drm-fimd.txt b/Documentation/devicetree/bindings/fb/drm-fimd.txt new file mode 100644 index 0000000..9a52ddb --- /dev/null +++ b/Documentation/devicetree/bindings/fb/drm-fimd.txt @@ -0,0 +1,73 @@ +* Samsung Display Controller using DRM frame work + +The display controller is used to transfer image data from memory to an +external LCD driver interface. It supports various color formats such as +rgb and yuv. + +Required properties: + - compatible: Should be "samsung,exynos5-drm" for fimd using DRM frame work. + - reg: physical base address of the controller and length of memory + mapped region. + - interrupts: Three interrupts should be specified. The interrupts should be + specified in the following order. + - VSYNC interrupt + - FIFO level interrupt + - FIMD System Interrupt + + - samsung,fimd-display: This property should specify the phandle of the + display device node which holds the video interface timing with the + below mentioned properties. + + - lcd-htiming: Specifies the horizontal timing for the overlay. The + horizontal timing includes four parameters in the following order. + + - horizontal back porch (in number of lcd clocks) + - horizontal front porch (in number of lcd clocks) + - hsync pulse width (in number of lcd clocks) + - Display panels X resolution. + + - lcd-vtiming: Specifies the vertical timing for the overlay. The + vertical timing includes four parameters in the following order. + + - vertical back porch (in number of lcd lines) + - vertical front porch (in number of lcd lines) + - vsync pulse width (in number of lcd clocks) + - Display panels Y resolution. + + + - samsung,default-window: Specifies the default window number of the fimd controller. + + - samsung,fimd-win-bpp: Specifies the bits per pixel. + +Optional properties: + - supports-mipi-panel: Specifies the lcd is mipi panel type + - samsung,fimd-vidout-rgb: Video output format is RGB. + - samsung,fimd-inv-vclk: invert video clock polarity. + - samsung,fimd-frame-rate: Number of video frames per second. + +Example: + + The following is an example for the fimd controller is split into + two portions. The SoC specific portion can be specified in the SoC + specific dts file. The board specific portion can be specified in the + board specific dts file. + + - SoC Specific portion + + lcd_fimd0: lcd_panel0 { + lcd-htiming = <4 4 4 480>; + lcd-vtiming = <4 4 4 320>; + supports-mipi-panel; + }; + + - Board Specific portion + + fimd { + samsung,fimd-display = <&lcd_fimd0>; + samsung,fimd-vidout-rgb; + samsung,fimd-inv-vclk; + samsung,fimd-frame-rate = <60>; + samsung,default-window = <0>; + samsung,fimd-win-bpp = <32>; + }; + diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 29fdbfe..6f06260 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -18,6 +18,7 @@ #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/pm_runtime.h> +#include <linux/of.h>
#include <drm/exynos_drm.h> #include <plat/regs-fb-v4.h> @@ -788,12 +789,82 @@ static int fimd_power_on(struct fimd_context *ctx, bool enable) return 0; }
+#ifdef CONFIG_OF +static struct exynos_drm_fimd_pdata *drm_fimd_dt_parse_pdata(struct device *dev) +{ + struct device_node *np = dev->of_node; + struct device_node *disp_np; + struct exynos_drm_fimd_pdata *pd; + u32 data[4]; + + pd = kzalloc(sizeof(*pd), GFP_KERNEL); + if (!pd) { + dev_err(dev, "memory allocation for pdata failed\n"); + return ERR_PTR(-ENOMEM); + } + + if (of_get_property(np, "samsung,fimd-vidout-rgb", NULL)) + pd->vidcon0 |= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB; + if (of_get_property(np, "samsung,fimd-vidout-tv", NULL)) + pd->vidcon0 |= VIDCON0_VIDOUT_TV; + if (of_get_property(np, "samsung,fimd-inv-hsync", NULL)) + pd->vidcon1 |= VIDCON1_INV_HSYNC; + if (of_get_property(np, "samsung,fimd-inv-vsync", NULL)) + pd->vidcon1 |= VIDCON1_INV_VSYNC; + if (of_get_property(np, "samsung,fimd-inv-vclk", NULL)) + pd->vidcon1 |= VIDCON1_INV_VCLK; + if (of_get_property(np, "samsung,fimd-inv-vden", NULL)) + pd->vidcon1 |= VIDCON1_INV_VDEN; + + disp_np = of_parse_phandle(np, "samsung,fimd-display", 0); + if (!disp_np) { + dev_err(dev, "unable to find display panel info\n"); + return ERR_PTR(-EINVAL); + } + + if (of_property_read_u32_array(disp_np, "lcd-htiming", data, 4)) { + dev_err(dev, "invalid horizontal timing\n"); + return ERR_PTR(-EINVAL); + } + pd->panel.timing.left_margin = data[0]; + pd->panel.timing.right_margin = data[1]; + pd->panel.timing.hsync_len = data[2]; + pd->panel.timing.xres = data[3]; + + if (of_property_read_u32_array(disp_np, "lcd-vtiming", data, 4)) { + dev_err(dev, "invalid vertical timing\n"); + return ERR_PTR(-EINVAL); + } + pd->panel.timing.upper_margin = data[0]; + pd->panel.timing.lower_margin = data[1]; + pd->panel.timing.vsync_len = data[2]; + pd->panel.timing.yres = data[3]; + + of_property_read_u32(np, "samsung,fimd-frame-rate", + &pd->panel.timing.refresh); + + of_property_read_u32(np, "samsung,default-window", &pd->default_win); + + of_property_read_u32(np, "samsung,fimd-win-bpp", &pd->bpp); + + return pd; +} +#else +static int drm_fimd_dt_parse_pdata(struct device *dev, + struct exynos_drm_fimd_pdata **pdata) +{ + return 0; +} +#endif /* CONFIG_OF */ + +static const struct of_device_id drm_fimd_dt_match[]; + static int __devinit fimd_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct fimd_context *ctx; struct exynos_drm_subdrv *subdrv; - struct exynos_drm_fimd_pdata *pdata; + struct exynos_drm_fimd_pdata *pdata = pdev->dev.platform_data; struct exynos_drm_panel_info *panel; struct resource *res; int win; @@ -801,7 +872,11 @@ static int __devinit fimd_probe(struct platform_device *pdev)
DRM_DEBUG_KMS("%s\n", __FILE__);
- pdata = pdev->dev.platform_data; + if (pdev->dev.of_node) { + pdata = drm_fimd_dt_parse_pdata(&pdev->dev); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + } if (!pdata) { dev_err(dev, "no platform data specified\n"); return -EINVAL; @@ -1006,6 +1081,14 @@ static int fimd_runtime_resume(struct device *dev) } #endif
+#ifdef CONFIG_OF +static const struct of_device_id drm_fimd_dt_match[] = { + { .compatible = "samsung,exynos5-drm" }, + {}, +}; +MODULE_DEVICE_TABLE(of, drm_fimd_dt_match); +#endif + static const struct dev_pm_ops fimd_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(fimd_suspend, fimd_resume) SET_RUNTIME_PM_OPS(fimd_runtime_suspend, fimd_runtime_resume, NULL) @@ -1018,5 +1101,6 @@ struct platform_driver fimd_driver = { .name = "exynos4-fb", .owner = THIS_MODULE, .pm = &fimd_pm_ops, + .of_match_table = of_match_ptr(drm_fimd_dt_match), }, };
From: Prathyush K prathyush.k@samsung.com
The name of the exynos drm fimd device is renamed to exynos-drm-fimd and two ids are created from exynos4-fb and exynos5-fb.
Signed-off-by: Prathyush K prathyush.k@samsung.com --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 6f06260..0a28a55 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -1089,6 +1089,16 @@ static const struct of_device_id drm_fimd_dt_match[] = { MODULE_DEVICE_TABLE(of, drm_fimd_dt_match); #endif
+static struct platform_device_id exynos_drm_driver_ids[] = { + { + .name = "exynos4-fb", + }, { + .name = "exynos5-fb", + }, + {}, +}; +MODULE_DEVICE_TABLE(platform, exynos_drm_driver_ids); + static const struct dev_pm_ops fimd_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(fimd_suspend, fimd_resume) SET_RUNTIME_PM_OPS(fimd_runtime_suspend, fimd_runtime_resume, NULL) @@ -1097,8 +1107,9 @@ static const struct dev_pm_ops fimd_pm_ops = { struct platform_driver fimd_driver = { .probe = fimd_probe, .remove = __devexit_p(fimd_remove), + .id_table = exynos_drm_driver_ids, .driver = { - .name = "exynos4-fb", + .name = "exynos-drm-fimd", .owner = THIS_MODULE, .pm = &fimd_pm_ops, .of_match_table = of_match_ptr(drm_fimd_dt_match),
2012/7/11, Leela Krishna Amudala l.krishna@samsung.com:
This patch set adds device tree support for DRM-FIMD for Samsung's Exynos5250. It includes parsing platform data from dts file.
This patchset is based and tested on top of v3.5-rc6
Changes since V1:
- Corrected typo errors and changed compatibility string
Leela Krishna Amudala (1): video: drm: exynos: Add device tree support
Prathyush K (1): drm/exynos: Modifying exynos drm fimd to support exynos5
Documentation/devicetree/bindings/fb/drm-fimd.txt | 73 +++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 101 ++++++++++++++++++++- 2 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/fb/drm-fimd.txt
I'm sorry for being late. I was so busy. your patch set should be tested on our target(based on exynos5) and then it will be reviewed and merged to exynos-drm-next soon if there is no any problem.
Thanks, Inki Dae
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Tue, Jul 17, 2012 at 9:49 AM, InKi Dae daeinki@gmail.com wrote:
2012/7/11, Leela Krishna Amudala l.krishna@samsung.com:
This patch set adds device tree support for DRM-FIMD for Samsung's Exynos5250. It includes parsing platform data from dts file.
This patchset is based and tested on top of v3.5-rc6
Changes since V1: - Corrected typo errors and changed compatibility string
Leela Krishna Amudala (1): video: drm: exynos: Add device tree support
Prathyush K (1): drm/exynos: Modifying exynos drm fimd to support exynos5
Documentation/devicetree/bindings/fb/drm-fimd.txt | 73 +++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 101 ++++++++++++++++++++- 2 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/fb/drm-fimd.txt
I'm sorry for being late. I was so busy. your patch set should be tested on our target(based on exynos5) and then it will be reviewed and merged to exynos-drm-next soon if there is no any problem.
Thanks, Inki Dae
I have tested this patchset over smdk5250 board and seen the boot logo also.
Thanks, Leela Krishna Amudala
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi,
On 07/11/2012 05:44 PM, Leela Krishna Amudala wrote:
This patch set adds device tree support for DRM-FIMD for Samsung's Exynos5250. It includes parsing platform data from dts file.
This patchset is based and tested on top of v3.5-rc6
Changes since V1:
- Corrected typo errors and changed compatibility string
Leela Krishna Amudala (1): video: drm: exynos: Add device tree support
Prathyush K (1): drm/exynos: Modifying exynos drm fimd to support exynos5
This patch is not related with device tree. Please send a patch without dependency with "video: drm: exynos: Add device tree support".
Thanks.
Documentation/devicetree/bindings/fb/drm-fimd.txt | 73 +++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 101 ++++++++++++++++++++- 2 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/fb/drm-fimd.txt
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel@lists.freedesktop.org