dri-devel June 2016

dri-devel@lists.freedesktop.org

231 participants
1446 discussions

[PATCH] drm/exynos: fimd: fix trigger mode change regression
by Inki Dae 06 Jun '16

06 Jun '16

This patch fixes a regression that Display panel doesn't work since HW trigger mode was supported. The trigger mode should be changed on PSR(Panel Self Refresh) mode of Panel device according to HW guy's saying. However, with previous HW trigger support, trigger mode could been changed in normal mode of Panel device. So this patch makes sure to change the trigger mode after power off and on again. Later we need to add PSR relevant codes instead. Signed-off-by: Inki Dae <inki.dae(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 3efe1aa..355149f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -203,6 +203,11 @@ struct fimd_context { atomic_t wait_vsync_event; atomic_t win_updated; atomic_t triggering; + /* + * fimd_setup_trigger function will try to change trigger mode + * only in case that this flag is set. + */ + atomic_t deferred_tr_mode; const struct fimd_driver_data *driver_data; struct drm_encoder *encoder; @@ -430,11 +435,37 @@ static void fimd_setup_trigger(struct fimd_context *ctx) val &= ~(TRGMODE_ENABLE); if (trg_type == I80_HW_TRG) { + /* + * change trigger mode after power off and on again. + * deferred_tr_mode will be set when fimd_disable is called. + * + * TODO. Trigger mode should be changed on PSR mode of Panel + * device. So we have to add relevant codes to make sure + * entering into PSR mode later. + */ + if (val & TRGMODE_ENABLE && + !atomic_read(&ctx->deferred_tr_mode)) + return; + if (ctx->driver_data->has_hw_trigger) val |= HWTRGEN_ENABLE | HWTRGMASK_ENABLE; if (ctx->driver_data->has_trigger_per_te) val |= HWTRIGEN_PER_ENABLE; } else { + /* + * change trigger mode after power off and on again. + * deferred_tr_mode will be set when fimd_disable is called. + * + * TODO. Trigger mode should be changed on PSR mode of Panel + * device. So we have to add relevant codes to make sure + * entering into PSR mode later. + */ + if (ctx->driver_data->has_hw_trigger) { + if (val & HWTRGEN_ENABLE && + !atomic_read(&ctx->deferred_tr_mode)) + return; + } + val |= TRGMODE_ENABLE; } @@ -864,6 +895,10 @@ static void fimd_disable(struct exynos_drm_crtc *crtc) writel(0, ctx->regs + VIDCON0); pm_runtime_put_sync(ctx->dev); + + if (ctx->i80_if) + atomic_set(&ctx->deferred_tr_mode, 1); + ctx->suspended = true; } -- 1.9.1

3 2

[PATCH 1/2] drm/dsi: Implement set tear scanline
by Vinay Simha BN 06 Jun '16

06 Jun '16

Provide a small convenience wrapper that transmits ia set_tear_scanline command as suggested by Thierry Reding. Also includes small build fixes from Sumit Semwal. Cc: Archit Taneja <archit.taneja(a)gmail.com> Cc: John Stultz <john.stultz(a)linaro.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Signed-off-by: Vinay Simha BN <simhavcs(a)gmail.com> --- drivers/gpu/drm/drm_mipi_dsi.c | 23 +++++++++++++++++++++++ include/drm/drm_mipi_dsi.h | 2 ++ 2 files changed, 25 insertions(+) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index f5d8083..2f0b85c 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -983,6 +983,29 @@ int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi, EXPORT_SYMBOL(mipi_dsi_dcs_set_tear_on); /** + * mipi_dsi_set_tear_scanline() - turn on the display module's Tearing Effect + * output signal on the TE signal line when display module reaches line N + * defined by STS[n:0]. + * @dsi: DSI peripheral device + * @param1: STS[10:8] + * @param2: STS[7:0] + * Return: 0 on success or a negative error code on failure + */ +int mipi_dsi_set_tear_scanline(struct mipi_dsi_device *dsi, + u8 param1, u8 param2) +{ + u8 payload[3] = { MIPI_DCS_SET_TEAR_SCANLINE, param1, param2}; + ssize_t err; + + err = mipi_dsi_generic_write(dsi, &payload, sizeof(payload)); + if (err < 0) + return err; + + return 0; +} +EXPORT_SYMBOL(mipi_dsi_set_tear_scanline); + +/** * mipi_dsi_dcs_set_pixel_format() - sets the pixel format for the RGB image * data used by the interface * @dsi: DSI peripheral device diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index 7a9840f..2788dbe 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -263,6 +263,8 @@ int mipi_dsi_dcs_set_column_address(struct mipi_dsi_device *dsi, u16 start, u16 end); int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start, u16 end); +int mipi_dsi_set_tear_scanline(struct mipi_dsi_device *dsi, u8 param1, + u8 param2); int mipi_dsi_dcs_set_tear_off(struct mipi_dsi_device *dsi); int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi, enum mipi_dsi_dcs_tear_mode mode); -- 1.9.1

3 5

[PATCH] Documentation: add fence-array to kernel DocBook
by Gustavo Padovan 06 Jun '16

06 Jun '16

From: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> Include fence-array files in the DocBook. Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> --- This should go to drm-misc, as fence-array are only present there at the moment. --- Documentation/DocBook/device-drivers.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index de79efd..5744ec7 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -132,8 +132,10 @@ X!Edrivers/base/interface.c !Edrivers/dma-buf/dma-buf.c !Edrivers/dma-buf/fence.c !Edrivers/dma-buf/seqno-fence.c +!Edrivers/dma-buf/fence-array.c !Iinclude/linux/fence.h !Iinclude/linux/seqno-fence.h +!Iinclude/linux/fence-array.h !Edrivers/dma-buf/reservation.c !Iinclude/linux/reservation.h !Edrivers/dma-buf/sync_file.c -- 2.5.5

2 1

[PATCH v4 0/3] drm: Add various helpers for simple drivers
by Noralf Trønnes 06 Jun '16

06 Jun '16

This patchset adds various helpers that was originally part of the tinydrm patchset. Essentially it adds 2 functions: - drm_fb_cma_create_with_funcs() CMA backed framebuffer supporting a dirty() callback. - drm_simple_display_pipe_init() Plane, crtc and encoder are collapsed into one entity. Changes since v3: - Add patch 'drm/fb-cma-helper: Use const for drm_framebuffer_funcs argument' - drm/fb-cma-helper: Add function drm_fb_cma_create_with_funcs() - funcs argument should be const - drm: Add helper for simple display pipeline - (struct drm_simple_display_pipe *)->funcs should be const Changes since v2: - drm: Add helper for simple display pipeline - Drop Kconfig knob DRM_KMS_HELPER - Expand documentation Changes since v1: - Drop patch: drm/panel: Add helper for simple panel connector - Add fb-helper and fb-cma-helper doc patches - Add drm/atomic: Don't skip drm_bridge_*() calls if !drm_encoder_helper_funcs - Add drm_atomic_helper_best_encoder() - drm/fb-cma-helper: Add function drm_fb_cma_create_with_funcs() - Expand docs - drm: Add helper for simple display pipeline - Add DOC header and add to gpu.tmpl - Fix docs: @funcs is optional, "negative error code", "This hook is optional." - Add checks to drm_simple_kms_plane_atomic_check() Noralf Trønnes (3): drm/fb-cma-helper: Use const for drm_framebuffer_funcs argument drm/fb-cma-helper: Add function drm_fb_cma_create_with_funcs() drm: Add helper for simple display pipeline Documentation/DocBook/gpu.tmpl | 6 + drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_fb_cma_helper.c | 35 ++++-- drivers/gpu/drm/drm_simple_kms_helper.c | 208 ++++++++++++++++++++++++++++++++ include/drm/drm_fb_cma_helper.h | 5 +- include/drm/drm_simple_kms_helper.h | 94 +++++++++++++++ 6 files changed, 340 insertions(+), 10 deletions(-) create mode 100644 drivers/gpu/drm/drm_simple_kms_helper.c create mode 100644 include/drm/drm_simple_kms_helper.h -- 2.8.2

4 19

[PATCH 1/2] drm/rockchip: Use atomic PM helpers
by Tomeu Vizoso 06 Jun '16

06 Jun '16

This driver was still using the old legacy helpers and that caused a few NULL dereferences when trying to call empty callbacks. Signed-off-by: Tomeu Vizoso <tomeu.vizoso(a)collabora.com> Cc: Caesar Wang <wxt(a)rock-chips.com> Cc: Douglas Anderson <dianders(a)chromium.org> Cc: Heiko Stuebner <heiko(a)sntech.de> Cc: Yakir Yang <ykk(a)rock-chips.com> --- Hi, these two patches apply on top of Daniel Vetter's series that add async support to the atomic commit helpers. Thanks, Tomeu --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 84 +++++++++++------------------ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + 2 files changed, 32 insertions(+), 53 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 2251121343e6..36c8b58ca45f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -25,6 +25,7 @@ #include <linux/module.h> #include <linux/of_graph.h> #include <linux/component.h> +#include <linux/console.h> #include "rockchip_drm_drv.h" #include "rockchip_drm_fb.h" @@ -308,25 +309,38 @@ static struct drm_driver rockchip_drm_driver = { }; #ifdef CONFIG_PM_SLEEP -static int rockchip_drm_sys_suspend(struct device *dev) +void rockchip_drm_fb_suspend(struct drm_device *drm) { - struct drm_device *drm = dev_get_drvdata(dev); - struct drm_connector *connector; + struct rockchip_drm_private *priv = drm->dev_private; - if (!drm) - return 0; + console_lock(); + drm_fb_helper_set_suspend(&priv->fbdev_helper, 1); + console_unlock(); +} - drm_modeset_lock_all(drm); - list_for_each_entry(connector, &drm->mode_config.connector_list, head) { - int old_dpms = connector->dpms; +void rockchip_drm_fb_resume(struct drm_device *drm) +{ + struct rockchip_drm_private *priv = drm->dev_private; - if (connector->funcs->dpms) - connector->funcs->dpms(connector, DRM_MODE_DPMS_OFF); + console_lock(); + drm_fb_helper_set_suspend(&priv->fbdev_helper, 0); + console_unlock(); +} - /* Set the old mode back to the connector for resume */ - connector->dpms = old_dpms; +static int rockchip_drm_sys_suspend(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + struct rockchip_drm_private *priv = drm->dev_private; + + drm_kms_helper_poll_disable(drm); + rockchip_drm_fb_suspend(drm); + + priv->state = drm_atomic_helper_suspend(drm); + if (IS_ERR(priv->state)) { + rockchip_drm_fb_resume(drm); + drm_kms_helper_poll_enable(drm); + return PTR_ERR(priv->state); } - drm_modeset_unlock_all(drm); return 0; } @@ -334,47 +348,11 @@ static int rockchip_drm_sys_suspend(struct device *dev) static int rockchip_drm_sys_resume(struct device *dev) { struct drm_device *drm = dev_get_drvdata(dev); - struct drm_connector *connector; - enum drm_connector_status status; - bool changed = false; - - if (!drm) - return 0; - - drm_modeset_lock_all(drm); - list_for_each_entry(connector, &drm->mode_config.connector_list, head) { - int desired_mode = connector->dpms; - - /* - * at suspend time, we save dpms to connector->dpms, - * restore the old_dpms, and at current time, the connector - * dpms status must be DRM_MODE_DPMS_OFF. - */ - connector->dpms = DRM_MODE_DPMS_OFF; - - /* - * If the connector has been disconnected during suspend, - * disconnect it from the encoder and leave it off. We'll notify - * userspace at the end. - */ - if (desired_mode == DRM_MODE_DPMS_ON) { - status = connector->funcs->detect(connector, true); - if (status == connector_status_disconnected) { - connector->encoder = NULL; - connector->status = status; - changed = true; - continue; - } - } - if (connector->funcs->dpms) - connector->funcs->dpms(connector, desired_mode); - } - drm_modeset_unlock_all(drm); - - drm_helper_resume_force_mode(drm); + struct rockchip_drm_private *priv = drm->dev_private; - if (changed) - drm_kms_helper_hotplug_event(drm); + drm_atomic_helper_resume(drm, priv->state); + rockchip_drm_fb_resume(drm); + drm_kms_helper_poll_enable(drm); return 0; } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index 005634484441..ea3932940061 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -60,6 +60,7 @@ struct rockchip_drm_private { struct drm_fb_helper fbdev_helper; struct drm_gem_object *fbdev_bo; const struct rockchip_crtc_funcs *crtc_funcs[ROCKCHIP_MAX_CRTC]; + struct drm_atomic_state *state; }; int rockchip_register_crtc_funcs(struct drm_crtc *crtc, -- 2.5.5

1 1

[PATCH] drm: bridge: analogix/dp: Don't disable interrupts
by Tomeu Vizoso 06 Jun '16

06 Jun '16

Regardless of the status of the bridge, we want to receive HPD events. Only disable it when suspending. Signed-off-by: Tomeu Vizoso <tomeu.vizoso(a)collabora.com> Cc: Caesar Wang <wxt(a)rock-chips.com> Cc: Douglas Anderson <dianders(a)chromium.org> Cc: Heiko Stuebner <heiko(a)sntech.de> Cc: Javier Martinez Canillas <javier(a)osg.samsung.com> Cc: Yakir Yang <ykk(a)rock-chips.com> --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 7699597070a1..f66a53a5c36e 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1049,7 +1049,6 @@ static void analogix_dp_bridge_enable(struct drm_bridge *bridge) phy_power_on(dp->phy); analogix_dp_init_dp(dp); - enable_irq(dp->irq); analogix_dp_commit(dp); dp->dpms_mode = DRM_MODE_DPMS_ON; @@ -1069,7 +1068,6 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge) } } - disable_irq(dp->irq); phy_power_off(dp->phy); if (dp->plat_data->power_off) @@ -1349,7 +1347,6 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, dev_err(&pdev->dev, "failed to request irq\n"); goto err_disable_pm_runtime; } - disable_irq(dp->irq); dp->drm_dev = drm_dev; dp->encoder = dp->plat_data->encoder; @@ -1391,6 +1388,8 @@ int analogix_dp_suspend(struct device *dev) { struct analogix_dp_device *dp = dev_get_drvdata(dev); + disable_irq(dp->irq); + clk_disable_unprepare(dp->clock); if (dp->plat_data->panel) { @@ -1420,6 +1419,8 @@ int analogix_dp_resume(struct device *dev) } } + enable_irq(dp->irq); + return 0; } EXPORT_SYMBOL_GPL(analogix_dp_resume); -- 2.5.5

1 0

[PATCH 0/3] Make ARC PGU usable on sim platforms
by Alexey Brodkin 06 Jun '16

06 Jun '16

Initially ARC PGU required real encoder/trnasmitter to exist. That was fine for real HW such as ARC SDP boards. But on some simulaiton platroms like ARC VDK or nSIM OSCI we have model of the same ARC PGU and ability to output video data in a virtual LCD. To make ARC PGU driver usable in those virtual platforms we need to istantiate virtual encoder instead of a real one. And that all is done in the first patch of the series. Subsequent patches just update configs of both VDK and nSIM OSCI boards with enabling ARC PGU driver and adding required fixups in their DT descriptions. Alexey Brodkin (2): ARCv2: [vdk] Enable ARC PGU on HS38 VDK ARC: [nsimosci] Enable ARC PGU on nSIM OSCI virtual platforms Ruud Derwig (1): drm/arcpgu: Make ARC PGU usable on simulation platforms arch/arc/boot/dts/nsimosci.dts | 14 ++- arch/arc/boot/dts/nsimosci_hs.dts | 14 ++- arch/arc/boot/dts/nsimosci_hs_idu.dts | 14 ++- arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 13 ++- arch/arc/boot/dts/vdk_hs38_smp.dts | 2 +- arch/arc/configs/nsimosci_defconfig | 3 +- arch/arc/configs/nsimosci_hs_defconfig | 3 +- arch/arc/configs/nsimosci_hs_smp_defconfig | 3 +- arch/arc/configs/vdk_hs38_smp_defconfig | 7 +- drivers/gpu/drm/arc/Makefile | 2 +- drivers/gpu/drm/arc/arcpgu.h | 1 + drivers/gpu/drm/arc/arcpgu_drv.c | 15 +-- drivers/gpu/drm/arc/arcpgu_sim.c | 177 +++++++++++++++++++++++++++++ 13 files changed, 238 insertions(+), 30 deletions(-) create mode 100644 drivers/gpu/drm/arc/arcpgu_sim.c -- 2.5.5

2 4

[PATCH 2/2] dt-bindings: Add jdi lt070me05000 panel bindings
by Vinay Simha BN 06 Jun '16

06 Jun '16

Add documentation for lt070me05000 panel Cc: Archit Taneja <archit.taneja(a)gmail.com> Cc: John Stultz <john.stultz(a)linaro.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Signed-off-by: Vinay Simha BN <simhavcs(a)gmail.com> -- v2: * incorporated rob herring and thierry reviews gpio to gpios, gpio to regulator using fixed regulators and pwm backlight is removed, since it is controlled by dcs commands --- .../bindings/display/panel/jdi,lt070me05000.txt | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.txt diff --git a/Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.txt b/Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.txt new file mode 100644 index 0000000..51068ae --- /dev/null +++ b/Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.txt @@ -0,0 +1,58 @@ +JDI model LT070ME05000 1200x1920 7" DSI Panel + +Required properties: +- compatible: should be "jdi,lt070me05000" +- vddp-supply: phandle of the regulator that provides the supply voltage + Power IC supply (3-5V) +- dcdc_en-supply: phandle of the regulator that provides the supply voltage + Power IC supply enable, High active +- vcc-supply: phandle of the regulator that provides the supply voltage + IOVCC , power supply for LCM (1.8V) +- reset-gpios: phandle of gpio for reset line + This should be 8mA, gpio can be configured using mux, pinctrl, pinctrl-names + XRES, Reset, Low active +- enable-gpios: phandle of gpio for enable line + LED_EN, LED backlight enable, High active + +Example: + + vcc_1p8v: regulator-fixed@2 { + compatible = "regulator-fixed"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc_1p8v"; + regulator-type = "voltage"; + startup-delay-us = <0>; + gpio = <&pm8921_gpio 23 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-boot-on; + }; + + tlmm_pinmux: pinctrl@800000 { + + dsi_panel_pinctrl: dsi-panel-pinctrl { + mux { + pins = "gpio54"; + function = "gpio"; + bias-pull-up; + drive-strength = <8>; + }; + }; + }; + + dsi0: qcom,mdss_dsi@4700000 { + panel@0 { + compatible = "jdi,lt070me05000"; + reg = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&dsi_panel_pinctrl>; + + vddp-supply = <&pm8921_l17>; + dcdc_en-supply = <&pm8921_lvs7>; + vcc-supply = <&vcc_1p8v>; + + reset-gpios = <&tlmm_pinmux 54 0>; + enable-gpios = <&pm8921_gpio 36 GPIO_ACTIVE_HIGH>; + }; + }; + -- 1.9.1

2 1

[PATCH] drm: sun4i: fix LPAE warnings
by Andre Przywara 06 Jun '16

06 Jun '16

When the sun4i DRM driver is compiled with LPAE enabled, dma_addr_t turns into a 64-bit type, which causes warnings with some debug printks: ================= In file included from drivers/gpu/drm/sun4i/sun4i_backend.c:13:: drivers/gpu/drm/sun4i/sun4i_backend.c: In function 'sun4i_backend_update_layer_buffer': drivers/gpu/drm/sun4i/sun4i_backend.c:193:19: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] DRM_DEBUG_DRIVER("Using GEM @ 0x%x\n", gem->paddr); ^ include/drm/drmP.h:207:34: note: in definition of macro 'DRM_DEBUG_DRIVER' drm_ut_debug_printk(__func__, fmt, ##args); \ ..... Use the proper printk format specifier [1] for dma_addr_t which takes care of those differences. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> [1] Documentation/printk-formats.txt --- drivers/gpu/drm/sun4i/sun4i_backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c index f7a15c1..2568e7d 100644 --- a/drivers/gpu/drm/sun4i/sun4i_backend.c +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c @@ -190,7 +190,7 @@ int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend, /* Get the physical address of the buffer in memory */ gem = drm_fb_cma_get_gem_obj(fb, 0); - DRM_DEBUG_DRIVER("Using GEM @ 0x%x\n", gem->paddr); + DRM_DEBUG_DRIVER("Using GEM @ 0x%pad\n", &gem->paddr); /* Compute the start of the displayed memory */ bpp = drm_format_plane_cpp(fb->pixel_format, 0); @@ -198,7 +198,7 @@ int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend, paddr += (state->src_x >> 16) * bpp; paddr += (state->src_y >> 16) * fb->pitches[0]; - DRM_DEBUG_DRIVER("Setting buffer address to 0x%x\n", paddr); + DRM_DEBUG_DRIVER("Setting buffer address to 0x%pad\n", &paddr); /* Write the 32 lower bits of the address (in bits) */ lo_paddr = paddr << 3; -- 2.8.2

3 2

[RFC PATCH] drm: msm: Add ASoC generic hdmi audio codec support.
by Srinivas Kandagatla 06 Jun '16

06 Jun '16

This patch adds support to generic audio codec via ASoC hdmi-codec infrastucture which is merged recently. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/hdmi/hdmi.c | 120 +++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/hdmi/hdmi.h | 14 +++++ 3 files changed, 134 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 167a497..7c7a031 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -10,6 +10,7 @@ config DRM_MSM select SHMEM select TMPFS select QCOM_SCM + select SND_SOC_HDMI_CODEC if SND_SOC default y help DRM/KMS driver for MSM/snapdragon. diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 51b9ea5..3281496 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -19,6 +19,7 @@ #include <linux/of_irq.h> #include <linux/of_gpio.h> +#include <sound/hdmi-codec.h> #include "hdmi.h" void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on) @@ -434,6 +435,114 @@ static int msm_hdmi_get_gpio(struct device_node *of_node, const char *name) return gpio; } +/* + * HDMI audio codec callbacks + */ +static int msm_hdmi_audio_hw_params(struct device *dev, + struct hdmi_codec_daifmt *daifmt, + struct hdmi_codec_params *params) +{ + struct hdmi *hdmi = dev_get_drvdata(dev); + unsigned int chan; + unsigned int channel_allocation = 0; + unsigned int rate; + unsigned int level_shift = 0; /* 0dB */ + bool down_mix = false; + + dev_dbg(dev, "%u Hz, %d bit, %d channels\n", params->sample_rate, + params->sample_width, params->cea.channels); + + switch (params->cea.channels) { + case 2: + /* FR and FL speakers */ + channel_allocation = 0; + chan = MSM_HDMI_AUDIO_CHANNEL_2; + break; + case 4: + /* FC, LFE, FR and FL speakers */ + channel_allocation = 0x3; + chan = MSM_HDMI_AUDIO_CHANNEL_4; + break; + case 6: + /* RR, RL, FC, LFE, FR and FL speakers */ + channel_allocation = 0x0B; + chan = MSM_HDMI_AUDIO_CHANNEL_6; + break; + case 8: + /* FRC, FLC, RR, RL, FC, LFE, FR and FL speakers */ + channel_allocation = 0x1F; + chan = MSM_HDMI_AUDIO_CHANNEL_8; + break; + default: + return -EINVAL; + } + + switch (params->sample_rate) { + case 32000: + rate = HDMI_SAMPLE_RATE_32KHZ; + break; + case 44100: + rate = HDMI_SAMPLE_RATE_48KHZ; + break; + case 48000: + rate = HDMI_SAMPLE_RATE_48KHZ; + break; + case 88200: + rate = HDMI_SAMPLE_RATE_88_2KHZ; + break; + case 96000: + rate = HDMI_SAMPLE_RATE_96KHZ; + break; + case 176400: + rate = HDMI_SAMPLE_RATE_176_4KHZ; + break; + case 192000: + rate = HDMI_SAMPLE_RATE_192KHZ; + break; + default: + dev_err(dev, "rate[%d] not supported!\n", + params->sample_rate); + return -EINVAL; + } + + msm_hdmi_audio_set_sample_rate(hdmi, rate); + msm_hdmi_audio_info_setup(hdmi, 1, chan, channel_allocation, + level_shift, down_mix); + + return 0; +} + +static void msm_hdmi_audio_shutdown(struct device *dev) +{ + struct hdmi *hdmi = dev_get_drvdata(dev); + + msm_hdmi_audio_info_setup(hdmi, 0, 0, 0, 0, 0); +} + +static const struct hdmi_codec_ops msm_hdmi_audio_codec_ops = { + .hw_params = msm_hdmi_audio_hw_params, + .audio_shutdown = msm_hdmi_audio_shutdown, +}; + +static struct hdmi_codec_pdata codec_data = { + .ops = &msm_hdmi_audio_codec_ops, + .max_i2s_channels = 8, + .i2s = 1, +}; + +static int msm_hdmi_register_audio_driver(struct hdmi *hdmi, struct device *dev) +{ + hdmi->audio_pdev = platform_device_register_data(dev, + HDMI_CODEC_DRV_NAME, + PLATFORM_DEVID_AUTO, + &codec_data, + sizeof(codec_data)); + if (IS_ERR(hdmi->audio_pdev)) + return PTR_ERR(hdmi->audio_pdev); + + return 0; +} + static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) { struct drm_device *drm = dev_get_drvdata(master); @@ -441,7 +550,7 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) static struct hdmi_platform_config *hdmi_cfg; struct hdmi *hdmi; struct device_node *of_node = dev->of_node; - int i; + int i, err; hdmi_cfg = (struct hdmi_platform_config *) of_device_get_match_data(dev); @@ -468,6 +577,12 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) return PTR_ERR(hdmi); priv->hdmi = hdmi; + err = msm_hdmi_register_audio_driver(hdmi, dev); + if (err) { + DRM_ERROR("Failed to attach an audio codec %d\n", err); + hdmi->audio_pdev = NULL; + } + return 0; } @@ -477,6 +592,9 @@ static void msm_hdmi_unbind(struct device *dev, struct device *master, struct drm_device *drm = dev_get_drvdata(master); struct msm_drm_private *priv = drm->dev_private; if (priv->hdmi) { + if (priv->hdmi->audio_pdev) + platform_device_unregister(priv->hdmi->audio_pdev); + msm_hdmi_destroy(priv->hdmi); priv->hdmi = NULL; } diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h index bc7ba0b..accc9a6 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -50,6 +50,7 @@ struct hdmi_hdcp_ctrl; struct hdmi { struct drm_device *dev; struct platform_device *pdev; + struct platform_device *audio_pdev; const struct hdmi_platform_config *config; @@ -210,6 +211,19 @@ static inline int msm_hdmi_pll_8996_init(struct platform_device *pdev) /* * audio: */ +/* Supported HDMI Audio channels and rates */ +#define MSM_HDMI_AUDIO_CHANNEL_2 0 +#define MSM_HDMI_AUDIO_CHANNEL_4 1 +#define MSM_HDMI_AUDIO_CHANNEL_6 2 +#define MSM_HDMI_AUDIO_CHANNEL_8 3 + +#define HDMI_SAMPLE_RATE_32KHZ 0 +#define HDMI_SAMPLE_RATE_44_1KHZ 1 +#define HDMI_SAMPLE_RATE_48KHZ 2 +#define HDMI_SAMPLE_RATE_88_2KHZ 3 +#define HDMI_SAMPLE_RATE_96KHZ 4 +#define HDMI_SAMPLE_RATE_176_4KHZ 5 +#define HDMI_SAMPLE_RATE_192KHZ 6 int msm_hdmi_audio_update(struct hdmi *hdmi); int msm_hdmi_audio_info_setup(struct hdmi *hdmi, bool enabled, -- 2.8.2

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2016