dri-devel April 2019

dri-devel@lists.freedesktop.org

307 participants
2114 discussions

gpu: drm: ttm: ttm_bo: Need a pair decrement for fence's refcount if ttm_bo_add_move_fence failed?
by 易林 01 Apr '19

01 Apr '19

Hi, all: when analyzing v5.1 source code, I notice that in ttm_bo_add_move_fence, when reservation_object_reserve_shared failed and return ENOMEM, the fence's refcount increased without a pair decrement even after return to ttm_bo_add_move_fence's caller ttm_bo_mem_force_space: static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, struct ttm_mem_type_manager *man, struct ttm_mem_reg *mem) { ...... fence = dma_fence_get(man->move); spin_unlock(&man->move_lock); if (fence) { reservation_object_add_shared_fence(bo->resv, fence); ret = reservation_object_reserve_shared(bo->resv, 1); if (unlikely(ret)) return ret; dma_fence_put(bo->moving); bo->moving = fence; } return 0; } can this lead to the imbalance of the fence's refcount? though the ENOMEN almost won't be trigger. Best Regards Lin Yi

1 0

[PATCH] drm/stm: add sleep power management
by Yannick Fertré 01 Apr '19

01 Apr '19

Implements system sleep power management ops. Signed-off-by: Yannick Fertré <yannick.fertre(a)st.com> --- drivers/gpu/drm/stm/drv.c | 35 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/stm/ltdc.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/stm/ltdc.h | 3 +++ 3 files changed, 62 insertions(+) diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c index 0a7f933..5834ef5 100644 --- a/drivers/gpu/drm/stm/drv.c +++ b/drivers/gpu/drm/stm/drv.c @@ -129,6 +129,40 @@ static void drv_unload(struct drm_device *ddev) drm_mode_config_cleanup(ddev); } +static __maybe_unused int drv_suspend(struct device *dev) +{ + struct drm_device *ddev = dev_get_drvdata(dev); + struct ltdc_device *ldev = ddev->dev_private; + struct drm_atomic_state *state; + + drm_kms_helper_poll_disable(ddev); + state = drm_atomic_helper_suspend(ddev); + if (IS_ERR(state)) { + drm_kms_helper_poll_enable(ddev); + return PTR_ERR(state); + } + ldev->suspend_state = state; + ltdc_suspend(ddev); + + return 0; +} + +static __maybe_unused int drv_resume(struct device *dev) +{ + struct drm_device *ddev = dev_get_drvdata(dev); + struct ltdc_device *ldev = ddev->dev_private; + + ltdc_resume(ddev); + drm_atomic_helper_resume(ddev, ldev->suspend_state); + drm_kms_helper_poll_enable(ddev); + + return 0; +} + +static const struct dev_pm_ops drv_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(drv_suspend, drv_resume) +}; + static int stm_drm_platform_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -186,6 +220,7 @@ static struct platform_driver stm_drm_platform_driver = { .driver = { .name = "stm32-display", .of_match_table = drv_dt_ids, + .pm = &drv_pm_ops, }, }; diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index b1741a9..32fd6a3 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -1062,6 +1062,30 @@ static int ltdc_get_caps(struct drm_device *ddev) return 0; } +void ltdc_suspend(struct drm_device *ddev) +{ + struct ltdc_device *ldev = ddev->dev_private; + + DRM_DEBUG_DRIVER("\n"); + clk_disable_unprepare(ldev->pixel_clk); +} + +int ltdc_resume(struct drm_device *ddev) +{ + struct ltdc_device *ldev = ddev->dev_private; + int ret; + + DRM_DEBUG_DRIVER("\n"); + + ret = clk_prepare_enable(ldev->pixel_clk); + if (ret) { + DRM_ERROR("failed to enable pixel clock (%d)\n", ret); + return ret; + } + + return 0; +} + int ltdc_load(struct drm_device *ddev) { struct platform_device *pdev = to_platform_device(ddev->dev); diff --git a/drivers/gpu/drm/stm/ltdc.h b/drivers/gpu/drm/stm/ltdc.h index e46f477..a1ad0ae 100644 --- a/drivers/gpu/drm/stm/ltdc.h +++ b/drivers/gpu/drm/stm/ltdc.h @@ -36,6 +36,7 @@ struct ltdc_device { u32 error_status; u32 irq_status; struct fps_info plane_fpsi[LTDC_MAX_LAYER]; + struct drm_atomic_state *suspend_state; }; bool ltdc_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, @@ -45,5 +46,7 @@ bool ltdc_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, int ltdc_load(struct drm_device *ddev); void ltdc_unload(struct drm_device *ddev); +void ltdc_suspend(struct drm_device *ddev); +int ltdc_resume(struct drm_device *ddev); #endif -- 2.7.4

3 2

[PATCH] drm/stm: dw_mipi_dsi-stm: add sleep power management
by Yannick Fertré 01 Apr '19

01 Apr '19

Implements system sleep power management ops. Signed-off-by: Yannick Fertré <yannick.fertre(a)st.com> --- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c index a672b59..1bef73e 100644 --- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c @@ -356,12 +356,40 @@ static int dw_mipi_dsi_stm_remove(struct platform_device *pdev) return 0; } +static int __maybe_unused dw_mipi_dsi_stm_suspend(struct device *dev) +{ + struct dw_mipi_dsi_stm *dsi = dw_mipi_dsi_stm_plat_data.priv_data; + + DRM_DEBUG_DRIVER("\n"); + + clk_disable_unprepare(dsi->pllref_clk); + + return 0; +} + +static int __maybe_unused dw_mipi_dsi_stm_resume(struct device *dev) +{ + struct dw_mipi_dsi_stm *dsi = dw_mipi_dsi_stm_plat_data.priv_data; + + DRM_DEBUG_DRIVER("\n"); + + clk_prepare_enable(dsi->pllref_clk); + + return 0; +} + +static const struct dev_pm_ops dw_mipi_dsi_stm_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(dw_mipi_dsi_stm_suspend, + dw_mipi_dsi_stm_resume) +}; + static struct platform_driver dw_mipi_dsi_stm_driver = { .probe = dw_mipi_dsi_stm_probe, .remove = dw_mipi_dsi_stm_remove, .driver = { .of_match_table = dw_mipi_dsi_stm_dt_ids, .name = "stm32-display-dsi", + .pm = &dw_mipi_dsi_stm_pm_ops, }, }; -- 2.7.4

3 2

[RFC][PATCH 0/6 v3] DMA-BUF Heaps (destaging ION)
by John Stultz 01 Apr '19

01 Apr '19

Here is another RFC of the dma-buf heaps patchset Andrew and I have been working on which tries to destage a fair chunk of ION functionality. The patchset implements per-heap devices which can be opened directly and then an ioctl is used to allocate a dmabuf from the heap. The interface is similar, but much simpler then IONs, only providing an ALLOC ioctl. Also, I've provided simple system and cma heaps. The system heap in particular is missing the page-pool optimizations ION had, but works well enough to validate the interface. I've booted and tested these patches with AOSP on the HiKey960 using the kernel tree here: https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/dma-bu… And the userspace changes here: https://android-review.googlesource.com/c/device/linaro/hikey/+/909436 Compared to ION, this patchset is missing the system-contig, carveout and chunk heaps, as I don't have a device that uses those, so I'm unable to do much useful validation there. Additionally we have no upstream users of chunk or carveout, and the system-contig has been deprecated in the common/andoid-* kernels, so this should be ok. I've also removed the stats accounting for now, since it should be implemented by the heaps themselves. New in v3: * Proper /dev/heap/* names on both Android and classic Linux environments * Major rework of the helper code from Andrew * Dummy test device added to test importing * *Lots* of cleanups suggested by many (thank you for all the input)! Outstanding concerns: * Potential need for private flags in interface for secure heaps. Need to better understand secure heap usage. * Making sure the performance issues from potentially unnecessary cache-management operations can be resolved properly for system and cma heaps (outstanding issue from ION). Eventual TODOS: * Sanity filtering for heap names * Reimplement performance optimizations for system heap * Add stats accounting to system/cma heaps * Make the kselftest more useful * Add other heaps folks see as useful (would love to get some help from actual carveout/chunk users)! That said, the main user-interface is shaping up and I wanted to get some input on the device model (particularly from GreKH) and any other API/ABI specific input. thanks -john Cc: Laura Abbott <labbott(a)redhat.com> Cc: Benjamin Gaignard <benjamin.gaignard(a)linaro.org> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: Liam Mark <lmark(a)codeaurora.org> Cc: Pratik Patel <pratikp(a)codeaurora.org> Cc: Brian Starkey <Brian.Starkey(a)arm.com> Cc: Vincent Donnefort <Vincent.Donnefort(a)arm.com> Cc: Sudipto Paul <Sudipto.Paul(a)arm.com> Cc: Andrew F. Davis <afd(a)ti.com> Cc: Xu YiPing <xuyiping(a)hisilicon.com> Cc: "Chenfeng (puck)" <puck.chen(a)hisilicon.com> Cc: butao <butao(a)hisilicon.com> Cc: "Xiaqing (A)" <saberlily.xia(a)hisilicon.com> Cc: Yudongbin <yudongbin(a)hisilicon.com> Cc: Christoph Hellwig <hch(a)infradead.org> Cc: Chenbo Feng <fengc(a)google.com> Cc: Alistair Strachan <astrachan(a)google.com> Cc: dri-devel(a)lists.freedesktop.org Andrew F. Davis (2): dma-buf: Add dma-buf heaps framework dma-buf: Add Dummy Importer Test Device John Stultz (4): dma-buf: heaps: Add heap helpers dma-buf: heaps: Add system heap to dmabuf heaps dma-buf: heaps: Add CMA heap to dmabuf heapss kselftests: Add dma-heap test MAINTAINERS | 18 ++ drivers/dma-buf/Kconfig | 16 ++ drivers/dma-buf/Makefile | 3 + drivers/dma-buf/dma-buf-testdev.c | 239 +++++++++++++++++++ drivers/dma-buf/dma-heap.c | 234 ++++++++++++++++++ drivers/dma-buf/heaps/Kconfig | 14 ++ drivers/dma-buf/heaps/Makefile | 4 + drivers/dma-buf/heaps/cma_heap.c | 170 ++++++++++++++ drivers/dma-buf/heaps/heap-helpers.c | 261 +++++++++++++++++++++ drivers/dma-buf/heaps/heap-helpers.h | 55 +++++ drivers/dma-buf/heaps/system_heap.c | 120 ++++++++++ include/linux/dma-heap.h | 58 +++++ include/uapi/linux/dma-buf-testdev.h | 37 +++ include/uapi/linux/dma-heap.h | 52 ++++ tools/testing/selftests/dmabuf-heaps/Makefile | 11 + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 169 +++++++++++++ 16 files changed, 1461 insertions(+) create mode 100644 drivers/dma-buf/dma-buf-testdev.c create mode 100644 drivers/dma-buf/dma-heap.c create mode 100644 drivers/dma-buf/heaps/Kconfig create mode 100644 drivers/dma-buf/heaps/Makefile create mode 100644 drivers/dma-buf/heaps/cma_heap.c create mode 100644 drivers/dma-buf/heaps/heap-helpers.c create mode 100644 drivers/dma-buf/heaps/heap-helpers.h create mode 100644 drivers/dma-buf/heaps/system_heap.c create mode 100644 include/linux/dma-heap.h create mode 100644 include/uapi/linux/dma-buf-testdev.h create mode 100644 include/uapi/linux/dma-heap.h create mode 100644 tools/testing/selftests/dmabuf-heaps/Makefile create mode 100644 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c -- 2.7.4

4 15

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2019