dri-devel December 2017

dri-devel@lists.freedesktop.org

236 participants
1514 discussions

[PATCH] documentation/gpu/i915: fix docs build error after file rename
by Randy Dunlap 04 Dec '17

04 Dec '17

From: Randy Dunlap <rdunlap(a)infradead.org> Fix documentation build errors after intel_guc_loader.c was renamed to intel_guc_fw.c. Error: Cannot open file ../drivers/gpu/drm/i915/intel_guc_loader.c WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -function GuC-specific firmware loader ../drivers/gpu/drm/i915/intel_guc_loader.c' failed with return code 1 Error: Cannot open file ../drivers/gpu/drm/i915/intel_guc_loader.c Error: Cannot open file ../drivers/gpu/drm/i915/intel_guc_loader.c WARNING: kernel-doc '../scripts/kernel-doc -rst -enable-lineno -internal ../drivers/gpu/drm/i915/intel_guc_loader.c' failed with return code 2 Fixes: e8668bbcb0f9 ("drm/i915/guc: Rename intel_guc_loader.c to intel_guc_fw.c") Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Michal Wajdeczko <michal.wajdeczko(a)intel.com> --- Documentation/gpu/i915.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- lnx-415-rc2.orig/Documentation/gpu/i915.rst +++ lnx-415-rc2/Documentation/gpu/i915.rst @@ -341,10 +341,10 @@ GuC GuC-specific firmware loader ---------------------------- -.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c +.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c :doc: GuC-specific firmware loader -.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c +.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c :internal: GuC-based command submission

2 1

[PATCH v1 0/2] DRM driver for ILI9225 display panels
by David Lechner 04 Dec '17

04 Dec '17

This is a new driver for ILI9225 based display panels. There are a couple of things that stand out: 1. Despite my best efforts, I could not find a name for this display[1], so I have made up a generic name for it. If someone recognizes this and has a name for it, please speak up. The best documentation I could find was here[2]. 2. There is quite a bit of one-off code copied from mipi-dbi.c. Based on the feedback from a previous patch series, I'm guessing that we don't want to modify mipi-dbi.c to accommodate the ILI9225 controller because the ILI9225 controller does not use standard MIPI commands. ILI9225 has it's own non-standard command set, but other than that, it pretty much matches the generic mipi-dbi driver in all regards. Code that could be easily shared: a. ili9225_buf_copy() is exactly the same as mipi_dbi_buf_copy() - ili9225_buf_copy() is used in ili9225_fb_dirty() - mipi_dbi_buf_copy() is static in mipi-dbi.c b. ili9225_spi_cmd_max_speed() is exactly the same as mipi_dbi_spi_cmd_max_speed() - ili9225_spi_cmd_max_speed() is used in ili9225_command() below, so would not need to be copied if mipi_dbi_typec3_command() could be shared - mipi_dbi_spi_cmd_max_speed() is static in mipi-dbi.c c. ili9225_command() is nearly the same as mipi_dbi_typec3_command() - a few unused lines were removed so I didn't have to copy even more code, but these would not be an issue if code was shared - cmd == ILI9225_WRITE_DATA_TO_GRAM instead of cmd == MIPI_DCS_WRITE_MEMORY_START d. ili9225_spi_init() is nearly the same as mipi_dbi_spi_init() - a few unused lines were removed so I didn't have to copy even more code, but these would not be an issue if code was shared - mipi->command = ili9225_command instead of mipi->command = mipi_dbi_typec3_command - this function would not need to be copied if mipi_dbi_typec3_command() was modified to work with the ILI9225 command set too e. ili9225_init() is nearly the same as mipi_dbi_init() - only difference is ili9225_fb_funcs instead of mipi_dbi_fb_funcs 3. I haven't tried it, but I believe that it is possible to implement DRM_FORMAT_RGB888 directly instead of simulating DRM_FORMAT_XRGB8888. I don't know if there would be any real benefit to doing this. I am not familiar enough with userspace programs/libraries to know if this mode is universally used. And, it will only physically be 18-bit color instead of 24-bit but will increase the amount of data transferred by 50% (3 bytes per pixel instead of 2). Implementing this would have a side effect of making the one-off shared code (described above) more than one-off though. [1]: https://github.com/Nkawu/TFT_22_ILI9225 [2]: http://www.hotmcu.com/22-176x220-tft-lcd-with-spi-interface-p-316.html David Lechner (2): dt-bindings: Add binding for Ilitek ILI9225 display panels drm/tinydrm: add driver for ILI9225 panels .../devicetree/bindings/display/ilitek,ili9225.txt | 25 + MAINTAINERS | 6 + drivers/gpu/drm/tinydrm/Kconfig | 10 + drivers/gpu/drm/tinydrm/Makefile | 1 + drivers/gpu/drm/tinydrm/ili9225.c | 547 +++++++++++++++++++++ 5 files changed, 589 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9225.txt create mode 100644 drivers/gpu/drm/tinydrm/ili9225.c -- 2.7.4

5 8

[PATCH v3 1/3] drm/panel: refactor INNOLUX P079ZCA panel driver
by Lin Huang 04 Dec '17

04 Dec '17

Refactor Innolux P079ZCA panel driver, let it support multi panel. Signed-off-by: Lin Huang <hl(a)rock-chips.com> --- Changes in v2: - Change regulator property name to meet the panel datasheet Changes in v3: - this patch only refactor P079ZCA panel to support multi panel, support P097PFG panel in another patch drivers/gpu/drm/panel/panel-innolux-p079zca.c | 147 ++++++++++++++++++-------- 1 file changed, 105 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..1597744 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,31 @@ 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 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 +238,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 +256,36 @@ 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 + }, }; 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(dev, "power"); + if (IS_ERR(innolux->vddi)) + return PTR_ERR(innolux->vddi); + + innolux->avdd = devm_regulator_get(dev, "avdd"); + if (IS_ERR(innolux->avdd)) + return PTR_ERR(innolux->avdd); + + innolux->avee = devm_regulator_get(dev, "avee"); + if (IS_ERR(innolux->avee)) + return PTR_ERR(innolux->avee); innolux->enable_gpio = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_HIGH); @@ -243,14 +306,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 +332,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 +388,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 +398,6 @@ static struct mipi_dsi_driver innolux_panel_driver = { module_mipi_dsi_driver(innolux_panel_driver); MODULE_AUTHOR("Chris Zhong <zyw(a)rock-chips.com>"); +MODULE_AUTHOR("Lin Huang <hl(a)rock-chips.com>"); MODULE_DESCRIPTION("Innolux P079ZCA panel driver"); MODULE_LICENSE("GPL v2"); -- 2.7.4

1 2

[Bug 104043] TV out garbled with linux > 3.2 (RV516)
by bugzilla-daemon＠freedesktop.org 04 Dec '17

04 Dec '17

1 0

linux-next: Signed-off-by missing for commits in the drm tree
by Stephen Rothwell 04 Dec '17

04 Dec '17

Hi all, There is a series of commits 54cff6479fd8 - c1802534e5a6 (not all in that range) that are missing a Signed-off-by from their committer. -- Cheers, Stephen Rothwell

2 1

[PATCH] drm/panel: support Innolux P097PFG panel
by Lin Huang 04 Dec '17

04 Dec '17

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. Change-Id: If342e58a3de2861219b0b1313f402b6cb41ffa29 Signed-off-by: Lin Huang <hl(a)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(a)rock-chips.com>"); +MODULE_AUTHOR("Lin Huang <hl(a)rock-chips.com>"); MODULE_DESCRIPTION("Innolux P079ZCA panel driver"); MODULE_LICENSE("GPL v2"); -- 2.7.4

3 2

linux-next: build warning after merge of the drm tree
by Stephen Rothwell 04 Dec '17

04 Dec '17

Hi all, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) produced this warning: drivers/gpu/drm/i915/gvt/cmd_parser.c: In function 'perform_bb_shadow': drivers/gpu/drm/i915/gvt/cmd_parser.c:1647:8: warning: unused variable 'dst' [-Wunused-variable] void *dst = NULL; ^ Introduced by commit 93588e545a4f ("Merge tag 'drm-intel-next-2017-11-17-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next") this merge reintroduced the variable declaration removed by commit f52c380a48f5 ("drm/i915/gvt: Refine shadow batch buffer") -- Cheers, Stephen Rothwell

2 1

[PATCH] omapfb/dss: Delete an error message for a failed memory allocation in three functions
by SF Markus Elfring 03 Dec '17

03 Dec '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 26 Nov 2017 19:46:09 +0100 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4 +--- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 4 +--- drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c index 7a75dfda9845..10164a3bae4a 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c @@ -3982,10 +3982,8 @@ static int dispc_init_features(struct platform_device *pdev) struct dispc_features *dst; dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL); - if (!dst) { - dev_err(&pdev->dev, "Failed to allocate DISPC Features\n"); + if (!dst) return -ENOMEM; - } switch (omapdss_get_version()) { case OMAPDSS_VER_OMAP24xx: diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c index 48c6500c24e1..a5de13777e2b 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c @@ -893,10 +893,8 @@ static int dss_init_features(struct platform_device *pdev) struct dss_features *dst; dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL); - if (!dst) { - dev_err(&pdev->dev, "Failed to allocate local DSS Features\n"); + if (!dst) return -ENOMEM; - } switch (omapdss_get_version()) { case OMAPDSS_VER_OMAP24xx: diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c index 9a13c35fd6d8..d25eea10c665 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c @@ -195,10 +195,8 @@ static int hdmi_phy_init_features(struct platform_device *pdev) const struct hdmi_phy_features *src; dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL); - if (!dst) { - dev_err(&pdev->dev, "Failed to allocate HDMI PHY Features\n"); + if (!dst) return -ENOMEM; - } switch (omapdss_get_version()) { case OMAPDSS_VER_OMAP4430_ES1: -- 2.15.0

6 30

Re: [RFC] Rebasing the IDR
by Daniel Vetter 03 Dec '17

03 Dec '17

Adding dri-devel, I think a pile of those are in drm. On Thu, Nov 30, 2017 at 6:36 PM, Matthew Wilcox <willy(a)infradead.org> wrote: > About 40 of the approximately 180 users of the IDR in the kernel are > "1-based" instead of "0-based". That is, they never want to have ID 0 > allocated; they want to see IDs allocated between 1 and N. Usually, that's > expressed like this: > > /* Get the user-visible handle using idr. */ > ret = idr_alloc(&file_priv->object_idr, obj, 1, 0, GFP_KERNEL); > > The current implementation of this grieves me. You see, we mark each > node of the radix tree according to whether it has any free entries > or not, and entry 0 is always free! If we've already allocated 10,000 > entries from this IDR, and see this call, we'll walk all the way down > the left side of the tree looking for entry 1, get to the bottom, > see that entries 1-63 are allocated, then walk up to the next level, > see that 64-4095 are allocated, walk up to the next level, see that > 8192-12287 has a free entry, and then start walking down again. > > It'd be somewhere around two to three times quicker to know not to > look down the left hand side of the tree, see that 1-8191 are used and > start looking in the range 8192-12287. I considered a function like > idr_reserve(idr, N) to reserve the first N entries (we have at least one > consumer in the tree that is 2-based, not 1-based), but that struck me > as inelegant. We also have the cool optimisation that if there's only > one element in the radix tree at offset 0, then we don't even need > to allocate a node to store it, we just store it right in the head. > And that optimisation was never available to the 1-based users. > > I've come up with this solution instead, idr_base. It's free in terms > of memory consumption on 64-bit as it fits in the gap at the end of the > struct idr. Essentially, we just subtract off idr_base when looking > up the ID, and add it back on when reporting the ID. We need to do some > saturating arithmetic in idr_get_next(), because starting a walk at 4 > billion or negative 8 quintillion doesn't work out terribly well. > > It does require the user to call idr_init_base() instead of idr_init(). > That should be a relatively small conversion effort. Opinions? Feedback? > Better test cases for the test-suite (ahem)? Just quick context on why we do this: We need to marshal/demarshal NULL in a ton of our ioctls, mapping that to 0 is natural. And yes I very much like this, and totally fine with trading an idr_init_base when we can nuke the explicit index ranges at every alloc side instead. So if you give me an idr_alloc function that doesn't take a range as icing, that would be great. Cheers, Daniel > > diff --git a/include/linux/idr.h b/include/linux/idr.h > index 91d27a9bcdf4..a657b1f925f8 100644 > --- a/include/linux/idr.h > +++ b/include/linux/idr.h > @@ -18,6 +18,7 @@ > > struct idr { > struct radix_tree_root idr_rt; > + unsigned int idr_base; > unsigned int idr_next; > }; > > @@ -30,9 +31,10 @@ struct idr { > /* Set the IDR flag and the IDR_FREE tag */ > #define IDR_RT_MARKER ((__force gfp_t)(3 << __GFP_BITS_SHIFT)) > > -#define IDR_INIT \ > -{ \ > - .idr_rt = RADIX_TREE_INIT(IDR_RT_MARKER) \ > +#define IDR_INIT { \ > + .idr_rt = RADIX_TREE_INIT(IDR_RT_MARKER), \ > + .idr_base = 0, \ > + .idr_next = 0, \ > } > #define DEFINE_IDR(name) struct idr name = IDR_INIT > > @@ -123,12 +125,20 @@ static inline int __must_check idr_alloc_u32(struct idr *idr, void *ptr, > > static inline void *idr_remove(struct idr *idr, unsigned long id) > { > - return radix_tree_delete_item(&idr->idr_rt, id, NULL); > + return radix_tree_delete_item(&idr->idr_rt, id - idr->idr_base, NULL); > } > > static inline void idr_init(struct idr *idr) > { > INIT_RADIX_TREE(&idr->idr_rt, IDR_RT_MARKER); > + idr->idr_base = 0; > + idr->idr_next = 0; > +} > + > +static inline void idr_init_base(struct idr *idr, int base) > +{ > + INIT_RADIX_TREE(&idr->idr_rt, IDR_RT_MARKER); > + idr->idr_base = base; > idr->idr_next = 0; > } > > @@ -163,7 +173,7 @@ static inline void idr_preload_end(void) > */ > static inline void *idr_find(const struct idr *idr, unsigned long id) > { > - return radix_tree_lookup(&idr->idr_rt, id); > + return radix_tree_lookup(&idr->idr_rt, id - idr->idr_base); > } > > /** > diff --git a/lib/idr.c b/lib/idr.c > index 1aaeb5a8c426..a1d3531bd62f 100644 > --- a/lib/idr.c > +++ b/lib/idr.c > @@ -33,21 +33,22 @@ int idr_alloc_ul(struct idr *idr, void *ptr, unsigned long *nextid, > { > struct radix_tree_iter iter; > void __rcu **slot; > + int base = idr->idr_base; > > if (WARN_ON_ONCE(radix_tree_is_internal_node(ptr))) > return -EINVAL; > if (WARN_ON_ONCE(!(idr->idr_rt.gfp_mask & ROOT_IS_IDR))) > idr->idr_rt.gfp_mask |= IDR_RT_MARKER; > > - radix_tree_iter_init(&iter, *nextid); > - slot = idr_get_free(&idr->idr_rt, &iter, gfp, max); > + radix_tree_iter_init(&iter, *nextid - base); > + slot = idr_get_free(&idr->idr_rt, &iter, gfp, max - base); > if (IS_ERR(slot)) > return PTR_ERR(slot); > > radix_tree_iter_replace(&idr->idr_rt, &iter, slot, ptr); > radix_tree_iter_tag_clear(&idr->idr_rt, &iter, IDR_FREE); > > - *nextid = iter.index; > + *nextid = iter.index + base; > return 0; > } > EXPORT_SYMBOL_GPL(idr_alloc_ul); > @@ -143,13 +144,14 @@ int idr_for_each(const struct idr *idr, > { > struct radix_tree_iter iter; > void __rcu **slot; > + int base = idr->idr_base; > > radix_tree_for_each_slot(slot, &idr->idr_rt, &iter, 0) { > int ret; > > if (WARN_ON_ONCE(iter.index > INT_MAX)) > break; > - ret = fn(iter.index, rcu_dereference_raw(*slot), data); > + ret = fn(iter.index + base, rcu_dereference_raw(*slot), data); > if (ret) > return ret; > } > @@ -172,15 +174,19 @@ void *idr_get_next(struct idr *idr, int *nextid) > { > struct radix_tree_iter iter; > void __rcu **slot; > + int base = idr->idr_base; > + int id = *nextid; > > - slot = radix_tree_iter_find(&idr->idr_rt, &iter, *nextid); > + id = (id < base) ? 0 : id - base; > + slot = radix_tree_iter_find(&idr->idr_rt, &iter, id); > if (!slot) > return NULL; > + id = iter.index + base; > > - if (WARN_ON_ONCE(iter.index > INT_MAX)) > + if (WARN_ON_ONCE(id > INT_MAX)) > return NULL; > > - *nextid = iter.index; > + *nextid = id; > return rcu_dereference_raw(*slot); > } > EXPORT_SYMBOL(idr_get_next); > @@ -199,12 +205,15 @@ void *idr_get_next_ul(struct idr *idr, unsigned long *nextid) > { > struct radix_tree_iter iter; > void __rcu **slot; > + unsigned long base = idr->idr_base; > + unsigned long id = *nextid; > > - slot = radix_tree_iter_find(&idr->idr_rt, &iter, *nextid); > + id = (id < base) ? 0 : id - base; > + slot = radix_tree_iter_find(&idr->idr_rt, &iter, id); > if (!slot) > return NULL; > > - *nextid = iter.index; > + *nextid = iter.index + base; > return rcu_dereference_raw(*slot); > } > EXPORT_SYMBOL(idr_get_next_ul); > @@ -231,6 +240,7 @@ void *idr_replace(struct idr *idr, void *ptr, unsigned long id) > > if (WARN_ON_ONCE(radix_tree_is_internal_node(ptr))) > return ERR_PTR(-EINVAL); > + id -= idr->idr_base; > > entry = __radix_tree_lookup(&idr->idr_rt, id, &node, &slot); > if (!slot || radix_tree_tag_get(&idr->idr_rt, id, IDR_FREE)) > diff --git a/tools/testing/radix-tree/idr-test.c b/tools/testing/radix-tree/idr-test.c > index 36437ade429c..44ef9eba5a7a 100644 > --- a/tools/testing/radix-tree/idr-test.c > +++ b/tools/testing/radix-tree/idr-test.c > @@ -153,11 +153,12 @@ void idr_nowait_test(void) > idr_destroy(&idr); > } > > -void idr_get_next_test(void) > +void idr_get_next_test(int base) > { > unsigned long i; > int nextid; > DEFINE_IDR(idr); > + idr_init_base(&idr, base); > > int indices[] = {4, 7, 9, 15, 65, 128, 1000, 99999, 0}; > > @@ -244,7 +245,9 @@ void idr_checks(void) > idr_alloc_test(); > idr_null_test(); > idr_nowait_test(); > - idr_get_next_test(); > + idr_get_next_test(0); > + idr_get_next_test(1); > + idr_get_next_test(4); > } > > /* -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

2 2

[PATCH v2 00/18] drm/sun4i: Add A83t LVDS support
by Maxime Ripard 02 Dec '17

02 Dec '17

Hi, Here is an attempt at supporting the LVDS output in our DRM driver. This has been tested on the A83T (with DE2), but since everything is basically in the TCON, it should also be usable on the older SoCs with minor modifications. This was the occasion to refactor a bunch of things. The most notable ones would be the documentation, and split of the UI layers in the mixer code, and the switch to kfifo for our endpoint parsing code in the driver that fixes an issue introduced by the switch to BFS. Let me know what you think, Maxime Changes from v1: - Added a fix for the error path handling in the TCON - Enable the TCON by default - Removed the patch that changes the channels offset but kept most of the modifications as a cleanup - Deal with the LVDS clock being able to have another PLL parent on some SoCs - Renamed the TCON compatible to TCON-TV, following the convention used on newer SoCs - Removed the hardcoded timings - Moved LVDS enable quirks to a separate function - Used clock indices define in the DT - Removed the hardcoded clock rate in the DT and moved it to the driver - Changed sun8i_mixer_planes to sun8i_mixer_ui_planes to be consistent - Added the various tags collected - Rebased on top of 4.15 Maxime Ripard (18): dt-bindings: panel: lvds: Document power-supply property drm/panel: lvds: Add support for the power-supply property dt-bindings: display: sun4i-drm: Add LVDS properties drm/sun4i: Fix error path handling drm/sun4i: Force the mixer rate at 150MHz drm/sun4i: Rename layers to UI planes drm/sun4i: sun8i: Rework the UI channels code drm/sun4i: Reorder and document DE2 mixer registers drm/sun4i: Create minimal multipliers and dividers drm/sun4i: Add LVDS support drm/sun4i: Add A83T support drm/sun4i: Add A83T support ARM: dts: sun8i: a83t: Add display pipeline ARM: dts: sun8i: a83t: Enable the PWM ARM: dts: sun8i: a83t: Add LVDS pins group ARM: dts: sun8i: a83t: Add the PWM pin group ARM: dts: sun8i: a711: Reinstate the PMIC compatible ARM: dts: sun8i: a711: Enable the LCD Documentation/devicetree/bindings/display/panel/panel-common.txt | 6 ++- Documentation/devicetree/bindings/display/panel/panel-lvds.txt | 1 +- Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt | 11 +++- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 62 ++++++++++++++++++- arch/arm/boot/dts/sun8i-a83t.dtsi | 99 +++++++++++++++++++++++++++++- drivers/gpu/drm/panel/panel-lvds.c | 23 +++++++- drivers/gpu/drm/sun4i/Makefile | 3 +- drivers/gpu/drm/sun4i/sun4i_dotclock.c | 10 ++- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/sun4i/sun4i_lvds.c | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/sun4i/sun4i_lvds.h | 18 +++++- drivers/gpu/drm/sun4i/sun4i_tcon.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/sun4i/sun4i_tcon.h | 31 +++++++++- drivers/gpu/drm/sun4i/sun8i_layer.c | 134 +--------------------------------------- drivers/gpu/drm/sun4i/sun8i_layer.h | 36 +---------- drivers/gpu/drm/sun4i/sun8i_mixer.c | 86 ++++++++++++++----------- drivers/gpu/drm/sun4i/sun8i_mixer.h | 101 ++++++++++++++++------------- drivers/gpu/drm/sun4i/sun8i_ui.c | 136 ++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/sun4i/sun8i_ui.h | 37 +++++++++++- 19 files changed, 968 insertions(+), 258 deletions(-) create mode 100644 drivers/gpu/drm/sun4i/sun4i_lvds.c create mode 100644 drivers/gpu/drm/sun4i/sun4i_lvds.h delete mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.c delete mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.h create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui.c create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui.h base-commit: 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 -- git-series 0.9.1

5 38

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel December 2017