* [RESENT PATCH] drm/panel: support Innolux P097PFG panel
@ 2017-11-30 6:14 Lin Huang
2017-12-01 2:28 ` Brian Norris
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Lin Huang @ 2017-11-30 6:14 UTC (permalink / raw)
To: thierry.reding, zyw, seanpaul
Cc: nickey.yang, briannorris, airlied, dri-devel, linux-kernel,
Lin Huang
Support Innolux P097PFG 9.7" 1536x2048 TFT LCD panel,
it refactor Innolux P079ZCA panel driver, let it support
multi panel, and add support P097PFG panel in this driver.
Signed-off-by: Lin Huang <hl@rock-chips.com>
---
drivers/gpu/drm/panel/panel-innolux-p079zca.c | 178 ++++++++++++++++++++------
1 file changed, 136 insertions(+), 42 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
index 6ba9344..a40798f 100644
--- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
+++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
@@ -20,12 +20,32 @@
#include <video/mipi_display.h>
+struct panel_desc {
+ const struct drm_display_mode *modes;
+ unsigned int bpc;
+ struct {
+ unsigned int width;
+ unsigned int height;
+ } size;
+};
+
+struct panel_desc_dsi {
+ struct panel_desc desc;
+
+ unsigned long flags;
+ enum mipi_dsi_pixel_format format;
+ unsigned int lanes;
+};
+
struct innolux_panel {
struct drm_panel base;
struct mipi_dsi_device *link;
+ const struct panel_desc_dsi *dsi_desc;
struct backlight_device *backlight;
- struct regulator *supply;
+ struct regulator *vddi;
+ struct regulator *avdd;
+ struct regulator *avee;
struct gpio_desc *enable_gpio;
bool prepared;
@@ -78,9 +98,9 @@ static int innolux_panel_unprepare(struct drm_panel *panel)
/* T8: 80ms - 1000ms */
msleep(80);
- err = regulator_disable(innolux->supply);
- if (err < 0)
- return err;
+ regulator_disable(innolux->avee);
+ regulator_disable(innolux->avdd);
+ regulator_disable(innolux->vddi);
innolux->prepared = false;
@@ -97,10 +117,18 @@ static int innolux_panel_prepare(struct drm_panel *panel)
gpiod_set_value_cansleep(innolux->enable_gpio, 0);
- err = regulator_enable(innolux->supply);
+ err = regulator_enable(innolux->vddi);
if (err < 0)
return err;
+ err = regulator_enable(innolux->avdd);
+ if (err < 0)
+ goto disable_vddi;
+
+ err = regulator_enable(innolux->avee);
+ if (err < 0)
+ goto disable_avdd;
+
/* T2: 15ms - 1000ms */
usleep_range(15000, 16000);
@@ -134,12 +162,13 @@ static int innolux_panel_prepare(struct drm_panel *panel)
return 0;
poweroff:
- regulator_err = regulator_disable(innolux->supply);
- if (regulator_err)
- DRM_DEV_ERROR(panel->dev, "failed to disable regulator: %d\n",
- regulator_err);
-
gpiod_set_value_cansleep(innolux->enable_gpio, 0);
+ regulator_disable(innolux->avee);
+disable_avdd:
+ regulator_disable(innolux->avdd);
+disable_vddi:
+ regulator_disable(innolux->vddi);
+
return err;
}
@@ -164,7 +193,7 @@ static int innolux_panel_enable(struct drm_panel *panel)
return 0;
}
-static const struct drm_display_mode default_mode = {
+static const struct drm_display_mode innolux_p079zca_mode = {
.clock = 56900,
.hdisplay = 768,
.hsync_start = 768 + 40,
@@ -177,15 +206,59 @@ static const struct drm_display_mode default_mode = {
.vrefresh = 60,
};
+static const struct panel_desc_dsi innolux_p079zca_panel_desc = {
+ .desc = {
+ .modes = &innolux_p079zca_mode,
+ .bpc = 8,
+ .size = {
+ .width = 120,
+ .height = 160,
+ },
+ },
+ .flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
+ MIPI_DSI_MODE_LPM,
+ .format = MIPI_DSI_FMT_RGB888,
+ .lanes = 4,
+};
+
+static const struct drm_display_mode innolux_p097pfg_mode = {
+ .clock = 220000,
+ .hdisplay = 1536,
+ .hsync_start = 1536 + 100,
+ .hsync_end = 1536 + 100 + 24,
+ .htotal = 1536 + 100 + 24 + 100,
+ .vdisplay = 2048,
+ .vsync_start = 2048 + 18,
+ .vsync_end = 2048 + 18 + 2,
+ .vtotal = 2048 + 18 + 2 + 18,
+ .vrefresh = 60,
+};
+
+static const struct panel_desc_dsi innolux_p097pfg_panel_desc = {
+ .desc = {
+ .modes = &innolux_p097pfg_mode,
+ .bpc = 8,
+ .size = {
+ .width = 147,
+ .height = 196,
+ },
+ },
+ .flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
+ MIPI_DSI_MODE_LPM,
+ .format = MIPI_DSI_FMT_RGB888,
+ .lanes = 8,
+};
+
static int innolux_panel_get_modes(struct drm_panel *panel)
{
struct drm_display_mode *mode;
+ struct innolux_panel *innolux = to_innolux_panel(panel);
+ const struct drm_display_mode *m = innolux->dsi_desc->desc.modes;
- mode = drm_mode_duplicate(panel->drm, &default_mode);
+ mode = drm_mode_duplicate(panel->drm, m);
if (!mode) {
DRM_DEV_ERROR(panel->drm->dev, "failed to add mode %ux%ux@%u\n",
- default_mode.hdisplay, default_mode.vdisplay,
- default_mode.vrefresh);
+ m->hdisplay, m->vdisplay, m->vrefresh);
return -ENOMEM;
}
@@ -193,9 +266,11 @@ static int innolux_panel_get_modes(struct drm_panel *panel)
drm_mode_probed_add(panel->connector, mode);
- panel->connector->display_info.width_mm = 120;
- panel->connector->display_info.height_mm = 160;
- panel->connector->display_info.bpc = 8;
+ panel->connector->display_info.width_mm =
+ innolux->dsi_desc->desc.size.width;
+ panel->connector->display_info.height_mm =
+ innolux->dsi_desc->desc.size.height;
+ panel->connector->display_info.bpc = innolux->dsi_desc->desc.bpc;
return 1;
}
@@ -209,20 +284,39 @@ static const struct drm_panel_funcs innolux_panel_funcs = {
};
static const struct of_device_id innolux_of_match[] = {
- { .compatible = "innolux,p079zca", },
- { }
+ { .compatible = "innolux,p079zca",
+ .data = &innolux_p079zca_panel_desc
+ },
+ { .compatible = "innolux,p097pfg",
+ .data = &innolux_p097pfg_panel_desc
+ }
};
MODULE_DEVICE_TABLE(of, innolux_of_match);
-static int innolux_panel_add(struct innolux_panel *innolux)
+static int innolux_panel_add(struct mipi_dsi_device *dsi,
+ const struct panel_desc_dsi *desc)
{
- struct device *dev = &innolux->link->dev;
+ struct innolux_panel *innolux;
+ struct device *dev = &dsi->dev;
struct device_node *np;
int err;
- innolux->supply = devm_regulator_get(dev, "power");
- if (IS_ERR(innolux->supply))
- return PTR_ERR(innolux->supply);
+ innolux = devm_kzalloc(dev, sizeof(*innolux), GFP_KERNEL);
+ if (!innolux)
+ return -ENOMEM;
+
+ innolux->dsi_desc = desc;
+ innolux->vddi = devm_regulator_get_optional(dev, "power");
+ if (IS_ERR(innolux->vddi))
+ return PTR_ERR(innolux->vddi);
+
+ innolux->avdd = devm_regulator_get(dev, "ppvarp");
+ if (IS_ERR(innolux->avdd))
+ return PTR_ERR(innolux->avdd);
+
+ innolux->avee = devm_regulator_get(dev, "ppvarn");
+ if (IS_ERR(innolux->avee))
+ return PTR_ERR(innolux->avee);
innolux->enable_gpio = devm_gpiod_get_optional(dev, "enable",
GPIOD_OUT_HIGH);
@@ -243,14 +337,16 @@ static int innolux_panel_add(struct innolux_panel *innolux)
drm_panel_init(&innolux->base);
innolux->base.funcs = &innolux_panel_funcs;
- innolux->base.dev = &innolux->link->dev;
+ innolux->base.dev = dev;
err = drm_panel_add(&innolux->base);
if (err < 0)
goto put_backlight;
- return 0;
+ dev_set_drvdata(dev, innolux);
+ innolux->link = dsi;
+ return 0;
put_backlight:
put_device(&innolux->backlight->dev);
@@ -267,28 +363,25 @@ static void innolux_panel_del(struct innolux_panel *innolux)
static int innolux_panel_probe(struct mipi_dsi_device *dsi)
{
- struct innolux_panel *innolux;
- int err;
-
- dsi->lanes = 4;
- dsi->format = MIPI_DSI_FMT_RGB888;
- dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
- MIPI_DSI_MODE_LPM;
- innolux = devm_kzalloc(&dsi->dev, sizeof(*innolux), GFP_KERNEL);
- if (!innolux)
- return -ENOMEM;
+ const struct panel_desc_dsi *dsi_desc;
+ const struct of_device_id *id;
+ int err;
- mipi_dsi_set_drvdata(dsi, innolux);
+ id = of_match_node(innolux_of_match, dsi->dev.of_node);
+ if (!id)
+ return -ENODEV;
- innolux->link = dsi;
+ dsi_desc = id->data;
+ dsi->mode_flags = dsi_desc->flags;
+ dsi->format = dsi_desc->format;
+ dsi->lanes = dsi_desc->lanes;
- err = innolux_panel_add(innolux);
+ err = innolux_panel_add(dsi, dsi_desc);
if (err < 0)
return err;
- err = mipi_dsi_attach(dsi);
- return err;
+ return mipi_dsi_attach(dsi);
}
static int innolux_panel_remove(struct mipi_dsi_device *dsi)
@@ -326,7 +419,7 @@ static void innolux_panel_shutdown(struct mipi_dsi_device *dsi)
static struct mipi_dsi_driver innolux_panel_driver = {
.driver = {
- .name = "panel-innolux-p079zca",
+ .name = "panel-innolux-dsi",
.of_match_table = innolux_of_match,
},
.probe = innolux_panel_probe,
@@ -336,5 +429,6 @@ static struct mipi_dsi_driver innolux_panel_driver = {
module_mipi_dsi_driver(innolux_panel_driver);
MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");
+MODULE_AUTHOR("Lin Huang <hl@rock-chips.com>");
MODULE_DESCRIPTION("Innolux P079ZCA panel driver");
MODULE_LICENSE("GPL v2");
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RESENT PATCH] drm/panel: support Innolux P097PFG panel
2017-11-30 6:14 [RESENT PATCH] drm/panel: support Innolux P097PFG panel Lin Huang
@ 2017-12-01 2:28 ` Brian Norris
2017-12-01 2:54 ` Brian Norris
2017-12-04 13:37 ` Lothar Waßmann
2 siblings, 0 replies; 5+ messages in thread
From: Brian Norris @ 2017-12-01 2:28 UTC (permalink / raw)
To: Lin Huang
Cc: thierry.reding, zyw, seanpaul, nickey.yang, airlied, dri-devel,
linux-kernel, Derek Basehore
+ Derek
On Thu, Nov 30, 2017 at 02:14:40PM +0800, Lin Huang wrote:
> Support Innolux P097PFG 9.7" 1536x2048 TFT LCD panel,
> it refactor Innolux P079ZCA panel driver, let it support
> multi panel, and add support P097PFG panel in this driver.
>
> Signed-off-by: Lin Huang <hl@rock-chips.com>
>
> ---
> drivers/gpu/drm/panel/panel-innolux-p079zca.c | 178 ++++++++++++++++++++------
> 1 file changed, 136 insertions(+), 42 deletions(-)
You'll want to add this to the device tree bindings.
Brian
>
> diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
> index 6ba9344..a40798f 100644
> --- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
> +++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
> @@ -20,12 +20,32 @@
>
> #include <video/mipi_display.h>
>
> +struct panel_desc {
> + const struct drm_display_mode *modes;
> + unsigned int bpc;
> + struct {
> + unsigned int width;
> + unsigned int height;
> + } size;
> +};
> +
> +struct panel_desc_dsi {
> + struct panel_desc desc;
> +
> + unsigned long flags;
> + enum mipi_dsi_pixel_format format;
> + unsigned int lanes;
> +};
> +
> struct innolux_panel {
> struct drm_panel base;
> struct mipi_dsi_device *link;
> + const struct panel_desc_dsi *dsi_desc;
>
> struct backlight_device *backlight;
> - struct regulator *supply;
> + struct regulator *vddi;
> + struct regulator *avdd;
> + struct regulator *avee;
> struct gpio_desc *enable_gpio;
>
> bool prepared;
> @@ -78,9 +98,9 @@ static int innolux_panel_unprepare(struct drm_panel *panel)
> /* T8: 80ms - 1000ms */
> msleep(80);
>
> - err = regulator_disable(innolux->supply);
> - if (err < 0)
> - return err;
> + regulator_disable(innolux->avee);
> + regulator_disable(innolux->avdd);
> + regulator_disable(innolux->vddi);
>
> innolux->prepared = false;
>
> @@ -97,10 +117,18 @@ static int innolux_panel_prepare(struct drm_panel *panel)
>
> gpiod_set_value_cansleep(innolux->enable_gpio, 0);
>
> - err = regulator_enable(innolux->supply);
> + err = regulator_enable(innolux->vddi);
> if (err < 0)
> return err;
>
> + err = regulator_enable(innolux->avdd);
> + if (err < 0)
> + goto disable_vddi;
> +
> + err = regulator_enable(innolux->avee);
> + if (err < 0)
> + goto disable_avdd;
> +
> /* T2: 15ms - 1000ms */
> usleep_range(15000, 16000);
>
> @@ -134,12 +162,13 @@ static int innolux_panel_prepare(struct drm_panel *panel)
> return 0;
>
> poweroff:
> - regulator_err = regulator_disable(innolux->supply);
> - if (regulator_err)
> - DRM_DEV_ERROR(panel->dev, "failed to disable regulator: %d\n",
> - regulator_err);
> -
> gpiod_set_value_cansleep(innolux->enable_gpio, 0);
> + regulator_disable(innolux->avee);
> +disable_avdd:
> + regulator_disable(innolux->avdd);
> +disable_vddi:
> + regulator_disable(innolux->vddi);
> +
> return err;
> }
>
> @@ -164,7 +193,7 @@ static int innolux_panel_enable(struct drm_panel *panel)
> return 0;
> }
>
> -static const struct drm_display_mode default_mode = {
> +static const struct drm_display_mode innolux_p079zca_mode = {
> .clock = 56900,
> .hdisplay = 768,
> .hsync_start = 768 + 40,
> @@ -177,15 +206,59 @@ static const struct drm_display_mode default_mode = {
> .vrefresh = 60,
> };
>
> +static const struct panel_desc_dsi innolux_p079zca_panel_desc = {
> + .desc = {
> + .modes = &innolux_p079zca_mode,
> + .bpc = 8,
> + .size = {
> + .width = 120,
> + .height = 160,
> + },
> + },
> + .flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
> + MIPI_DSI_MODE_LPM,
> + .format = MIPI_DSI_FMT_RGB888,
> + .lanes = 4,
> +};
> +
> +static const struct drm_display_mode innolux_p097pfg_mode = {
> + .clock = 220000,
> + .hdisplay = 1536,
> + .hsync_start = 1536 + 100,
> + .hsync_end = 1536 + 100 + 24,
> + .htotal = 1536 + 100 + 24 + 100,
> + .vdisplay = 2048,
> + .vsync_start = 2048 + 18,
> + .vsync_end = 2048 + 18 + 2,
> + .vtotal = 2048 + 18 + 2 + 18,
> + .vrefresh = 60,
> +};
> +
> +static const struct panel_desc_dsi innolux_p097pfg_panel_desc = {
> + .desc = {
> + .modes = &innolux_p097pfg_mode,
> + .bpc = 8,
> + .size = {
> + .width = 147,
> + .height = 196,
> + },
> + },
> + .flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
> + MIPI_DSI_MODE_LPM,
> + .format = MIPI_DSI_FMT_RGB888,
> + .lanes = 8,
> +};
> +
> static int innolux_panel_get_modes(struct drm_panel *panel)
> {
> struct drm_display_mode *mode;
> + struct innolux_panel *innolux = to_innolux_panel(panel);
> + const struct drm_display_mode *m = innolux->dsi_desc->desc.modes;
>
> - mode = drm_mode_duplicate(panel->drm, &default_mode);
> + mode = drm_mode_duplicate(panel->drm, m);
> if (!mode) {
> DRM_DEV_ERROR(panel->drm->dev, "failed to add mode %ux%ux@%u\n",
> - default_mode.hdisplay, default_mode.vdisplay,
> - default_mode.vrefresh);
> + m->hdisplay, m->vdisplay, m->vrefresh);
> return -ENOMEM;
> }
>
> @@ -193,9 +266,11 @@ static int innolux_panel_get_modes(struct drm_panel *panel)
>
> drm_mode_probed_add(panel->connector, mode);
>
> - panel->connector->display_info.width_mm = 120;
> - panel->connector->display_info.height_mm = 160;
> - panel->connector->display_info.bpc = 8;
> + panel->connector->display_info.width_mm =
> + innolux->dsi_desc->desc.size.width;
> + panel->connector->display_info.height_mm =
> + innolux->dsi_desc->desc.size.height;
> + panel->connector->display_info.bpc = innolux->dsi_desc->desc.bpc;
>
> return 1;
> }
> @@ -209,20 +284,39 @@ static const struct drm_panel_funcs innolux_panel_funcs = {
> };
>
> static const struct of_device_id innolux_of_match[] = {
> - { .compatible = "innolux,p079zca", },
> - { }
> + { .compatible = "innolux,p079zca",
> + .data = &innolux_p079zca_panel_desc
> + },
> + { .compatible = "innolux,p097pfg",
> + .data = &innolux_p097pfg_panel_desc
> + }
> };
> MODULE_DEVICE_TABLE(of, innolux_of_match);
>
> -static int innolux_panel_add(struct innolux_panel *innolux)
> +static int innolux_panel_add(struct mipi_dsi_device *dsi,
> + const struct panel_desc_dsi *desc)
> {
> - struct device *dev = &innolux->link->dev;
> + struct innolux_panel *innolux;
> + struct device *dev = &dsi->dev;
> struct device_node *np;
> int err;
>
> - innolux->supply = devm_regulator_get(dev, "power");
> - if (IS_ERR(innolux->supply))
> - return PTR_ERR(innolux->supply);
> + innolux = devm_kzalloc(dev, sizeof(*innolux), GFP_KERNEL);
> + if (!innolux)
> + return -ENOMEM;
> +
> + innolux->dsi_desc = desc;
> + innolux->vddi = devm_regulator_get_optional(dev, "power");
> + if (IS_ERR(innolux->vddi))
> + return PTR_ERR(innolux->vddi);
> +
> + innolux->avdd = devm_regulator_get(dev, "ppvarp");
> + if (IS_ERR(innolux->avdd))
> + return PTR_ERR(innolux->avdd);
> +
> + innolux->avee = devm_regulator_get(dev, "ppvarn");
> + if (IS_ERR(innolux->avee))
> + return PTR_ERR(innolux->avee);
>
> innolux->enable_gpio = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_HIGH);
> @@ -243,14 +337,16 @@ static int innolux_panel_add(struct innolux_panel *innolux)
>
> drm_panel_init(&innolux->base);
> innolux->base.funcs = &innolux_panel_funcs;
> - innolux->base.dev = &innolux->link->dev;
> + innolux->base.dev = dev;
>
> err = drm_panel_add(&innolux->base);
> if (err < 0)
> goto put_backlight;
>
> - return 0;
> + dev_set_drvdata(dev, innolux);
> + innolux->link = dsi;
>
> + return 0;
> put_backlight:
> put_device(&innolux->backlight->dev);
>
> @@ -267,28 +363,25 @@ static void innolux_panel_del(struct innolux_panel *innolux)
>
> static int innolux_panel_probe(struct mipi_dsi_device *dsi)
> {
> - struct innolux_panel *innolux;
> - int err;
> -
> - dsi->lanes = 4;
> - dsi->format = MIPI_DSI_FMT_RGB888;
> - dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
> - MIPI_DSI_MODE_LPM;
>
> - innolux = devm_kzalloc(&dsi->dev, sizeof(*innolux), GFP_KERNEL);
> - if (!innolux)
> - return -ENOMEM;
> + const struct panel_desc_dsi *dsi_desc;
> + const struct of_device_id *id;
> + int err;
>
> - mipi_dsi_set_drvdata(dsi, innolux);
> + id = of_match_node(innolux_of_match, dsi->dev.of_node);
> + if (!id)
> + return -ENODEV;
>
> - innolux->link = dsi;
> + dsi_desc = id->data;
> + dsi->mode_flags = dsi_desc->flags;
> + dsi->format = dsi_desc->format;
> + dsi->lanes = dsi_desc->lanes;
>
> - err = innolux_panel_add(innolux);
> + err = innolux_panel_add(dsi, dsi_desc);
> if (err < 0)
> return err;
>
> - err = mipi_dsi_attach(dsi);
> - return err;
> + return mipi_dsi_attach(dsi);
> }
>
> static int innolux_panel_remove(struct mipi_dsi_device *dsi)
> @@ -326,7 +419,7 @@ static void innolux_panel_shutdown(struct mipi_dsi_device *dsi)
>
> static struct mipi_dsi_driver innolux_panel_driver = {
> .driver = {
> - .name = "panel-innolux-p079zca",
> + .name = "panel-innolux-dsi",
> .of_match_table = innolux_of_match,
> },
> .probe = innolux_panel_probe,
> @@ -336,5 +429,6 @@ static struct mipi_dsi_driver innolux_panel_driver = {
> module_mipi_dsi_driver(innolux_panel_driver);
>
> MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");
> +MODULE_AUTHOR("Lin Huang <hl@rock-chips.com>");
> MODULE_DESCRIPTION("Innolux P079ZCA panel driver");
> MODULE_LICENSE("GPL v2");
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RESENT PATCH] drm/panel: support Innolux P097PFG panel
2017-11-30 6:14 [RESENT PATCH] drm/panel: support Innolux P097PFG panel Lin Huang
2017-12-01 2:28 ` Brian Norris
@ 2017-12-01 2:54 ` Brian Norris
2017-12-01 3:06 ` hl
2017-12-04 13:37 ` Lothar Waßmann
2 siblings, 1 reply; 5+ messages in thread
From: Brian Norris @ 2017-12-01 2:54 UTC (permalink / raw)
To: Lin Huang
Cc: thierry.reding, zyw, seanpaul, nickey.yang, airlied, dri-devel,
linux-kernel, Derek Basehore
One more comment:
On Thu, Nov 30, 2017 at 02:14:40PM +0800, Lin Huang wrote:
> Support Innolux P097PFG 9.7" 1536x2048 TFT LCD panel,
> it refactor Innolux P079ZCA panel driver, let it support
> multi panel, and add support P097PFG panel in this driver.
>
> Signed-off-by: Lin Huang <hl@rock-chips.com>
>
> ---
> drivers/gpu/drm/panel/panel-innolux-p079zca.c | 178 ++++++++++++++++++++------
> 1 file changed, 136 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
> index 6ba9344..a40798f 100644
> --- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
> +++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
...
> @@ -209,20 +284,39 @@ static const struct drm_panel_funcs innolux_panel_funcs = {
> };
>
> static const struct of_device_id innolux_of_match[] = {
> - { .compatible = "innolux,p079zca", },
> - { }
> + { .compatible = "innolux,p079zca",
> + .data = &innolux_p079zca_panel_desc
> + },
> + { .compatible = "innolux,p097pfg",
> + .data = &innolux_p097pfg_panel_desc
> + }
> };
> MODULE_DEVICE_TABLE(of, innolux_of_match);
>
> -static int innolux_panel_add(struct innolux_panel *innolux)
> +static int innolux_panel_add(struct mipi_dsi_device *dsi,
> + const struct panel_desc_dsi *desc)
> {
> - struct device *dev = &innolux->link->dev;
> + struct innolux_panel *innolux;
> + struct device *dev = &dsi->dev;
> struct device_node *np;
> int err;
>
> - innolux->supply = devm_regulator_get(dev, "power");
> - if (IS_ERR(innolux->supply))
> - return PTR_ERR(innolux->supply);
> + innolux = devm_kzalloc(dev, sizeof(*innolux), GFP_KERNEL);
> + if (!innolux)
> + return -ENOMEM;
> +
> + innolux->dsi_desc = desc;
> + innolux->vddi = devm_regulator_get_optional(dev, "power");
> + if (IS_ERR(innolux->vddi))
> + return PTR_ERR(innolux->vddi);
> +
> + innolux->avdd = devm_regulator_get(dev, "ppvarp");
This name ("ppvarp" and the "ppvarn" below) are names from our board
schematics, not from the panel datasheet. I would think these should be
"vdd" and "vee", like your variable names.
Brian
> + if (IS_ERR(innolux->avdd))
> + return PTR_ERR(innolux->avdd);
> +
> + innolux->avee = devm_regulator_get(dev, "ppvarn");
> + if (IS_ERR(innolux->avee))
> + return PTR_ERR(innolux->avee);
>
> innolux->enable_gpio = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_HIGH);
...
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RESENT PATCH] drm/panel: support Innolux P097PFG panel
2017-12-01 2:54 ` Brian Norris
@ 2017-12-01 3:06 ` hl
0 siblings, 0 replies; 5+ messages in thread
From: hl @ 2017-12-01 3:06 UTC (permalink / raw)
To: Brian Norris
Cc: thierry.reding, zyw, seanpaul, nickey.yang, airlied, dri-devel,
linux-kernel, Derek Basehore
Hi
On Friday, December 01, 2017 10:54 AM, Brian Norris wrote:
> One more comment:
>
> On Thu, Nov 30, 2017 at 02:14:40PM +0800, Lin Huang wrote:
>> Support Innolux P097PFG 9.7" 1536x2048 TFT LCD panel,
>> it refactor Innolux P079ZCA panel driver, let it support
>> multi panel, and add support P097PFG panel in this driver.
>>
>> Signed-off-by: Lin Huang <hl@rock-chips.com>
>>
>> ---
>> drivers/gpu/drm/panel/panel-innolux-p079zca.c | 178 ++++++++++++++++++++------
>> 1 file changed, 136 insertions(+), 42 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
>> index 6ba9344..a40798f 100644
>> --- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
>> +++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
> ...
>
>> @@ -209,20 +284,39 @@ static const struct drm_panel_funcs innolux_panel_funcs = {
>> };
>>
>> static const struct of_device_id innolux_of_match[] = {
>> - { .compatible = "innolux,p079zca", },
>> - { }
>> + { .compatible = "innolux,p079zca",
>> + .data = &innolux_p079zca_panel_desc
>> + },
>> + { .compatible = "innolux,p097pfg",
>> + .data = &innolux_p097pfg_panel_desc
>> + }
>> };
>> MODULE_DEVICE_TABLE(of, innolux_of_match);
>>
>> -static int innolux_panel_add(struct innolux_panel *innolux)
>> +static int innolux_panel_add(struct mipi_dsi_device *dsi,
>> + const struct panel_desc_dsi *desc)
>> {
>> - struct device *dev = &innolux->link->dev;
>> + struct innolux_panel *innolux;
>> + struct device *dev = &dsi->dev;
>> struct device_node *np;
>> int err;
>>
>> - innolux->supply = devm_regulator_get(dev, "power");
>> - if (IS_ERR(innolux->supply))
>> - return PTR_ERR(innolux->supply);
>> + innolux = devm_kzalloc(dev, sizeof(*innolux), GFP_KERNEL);
>> + if (!innolux)
>> + return -ENOMEM;
>> +
>> + innolux->dsi_desc = desc;
>> + innolux->vddi = devm_regulator_get_optional(dev, "power");
>> + if (IS_ERR(innolux->vddi))
>> + return PTR_ERR(innolux->vddi);
>> +
>> + innolux->avdd = devm_regulator_get(dev, "ppvarp");
> This name ("ppvarp" and the "ppvarn" below) are names from our board
> schematics, not from the panel datasheet. I would think these should be
> "vdd" and "vee", like your variable names.
Okay, will fix it next version.
>
> Brian
>
>> + if (IS_ERR(innolux->avdd))
>> + return PTR_ERR(innolux->avdd);
>> +
>> + innolux->avee = devm_regulator_get(dev, "ppvarn");
>> + if (IS_ERR(innolux->avee))
>> + return PTR_ERR(innolux->avee);
>>
>> innolux->enable_gpio = devm_gpiod_get_optional(dev, "enable",
>> GPIOD_OUT_HIGH);
> ...
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RESENT PATCH] drm/panel: support Innolux P097PFG panel
2017-11-30 6:14 [RESENT PATCH] drm/panel: support Innolux P097PFG panel Lin Huang
2017-12-01 2:28 ` Brian Norris
2017-12-01 2:54 ` Brian Norris
@ 2017-12-04 13:37 ` Lothar Waßmann
2 siblings, 0 replies; 5+ messages in thread
From: Lothar Waßmann @ 2017-12-04 13:37 UTC (permalink / raw)
To: Lin Huang
Cc: thierry.reding, zyw, seanpaul, airlied, briannorris, linux-kernel,
dri-devel, nickey.yang
Hi,
On Thu, 30 Nov 2017 14:14:40 +0800 Lin Huang wrote:
> Support Innolux P097PFG 9.7" 1536x2048 TFT LCD panel,
> it refactor Innolux P079ZCA panel driver, let it support
> multi panel, and add support P097PFG panel in this driver.
>
> Signed-off-by: Lin Huang <hl@rock-chips.com>
>
> ---
> drivers/gpu/drm/panel/panel-innolux-p079zca.c | 178 ++++++++++++++++++++------
> 1 file changed, 136 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
> index 6ba9344..a40798f 100644
> --- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
> +++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
[...]
> @@ -209,20 +284,39 @@ static const struct drm_panel_funcs innolux_panel_funcs = {
> };
>
> static const struct of_device_id innolux_of_match[] = {
> - { .compatible = "innolux,p079zca", },
> - { }
> + { .compatible = "innolux,p079zca",
> + .data = &innolux_p079zca_panel_desc
> + },
> + { .compatible = "innolux,p097pfg",
> + .data = &innolux_p097pfg_panel_desc
> + }
> };
>
This hunk deletes the empty entry which is required as an end of list
marker!
Lothar Waßmann
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-04 13:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-30 6:14 [RESENT PATCH] drm/panel: support Innolux P097PFG panel Lin Huang
2017-12-01 2:28 ` Brian Norris
2017-12-01 2:54 ` Brian Norris
2017-12-01 3:06 ` hl
2017-12-04 13:37 ` Lothar Waßmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox