dri-devel August 2019

dri-devel@lists.freedesktop.org

318 participants
2338 discussions

[PATCH 1/5] drm/i915: stop pruning reservation object after wait
by Christian König 06 Aug '19

06 Aug '19

The reservation object should be capable of handling its internal memory management itself. And since we search for a free slot to add the fence from the beginning this is actually a waste of time and only minimal helpful. Drop it to allow removal of the seqno handling in the reservation object. This essentially reverts commit "drm/i915: Remove completed fences after a wait". Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/i915/gem/i915_gem_wait.c | 27 ------------------------ 1 file changed, 27 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c index 26ec6579b7cd..bb64ec6bef8e 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c @@ -35,9 +35,7 @@ i915_gem_object_wait_reservation(struct reservation_object *resv, unsigned int flags, long timeout) { - unsigned int seq = __read_seqcount_begin(&resv->seq); struct dma_fence *excl; - bool prune_fences = false; if (flags & I915_WAIT_ALL) { struct dma_fence **shared; @@ -61,17 +59,6 @@ i915_gem_object_wait_reservation(struct reservation_object *resv, for (; i < count; i++) dma_fence_put(shared[i]); kfree(shared); - - /* - * If both shared fences and an exclusive fence exist, - * then by construction the shared fences must be later - * than the exclusive fence. If we successfully wait for - * all the shared fences, we know that the exclusive fence - * must all be signaled. If all the shared fences are - * signaled, we can prune the array and recover the - * floating references on the fences/requests. - */ - prune_fences = count && timeout >= 0; } else { excl = reservation_object_get_excl_rcu(resv); } @@ -80,20 +67,6 @@ i915_gem_object_wait_reservation(struct reservation_object *resv, timeout = i915_gem_object_wait_fence(excl, flags, timeout); dma_fence_put(excl); - - /* - * Opportunistically prune the fences iff we know they have *all* been - * signaled and that the reservation object has not been changed (i.e. - * no new fences have been added). - */ - if (prune_fences && !__read_seqcount_retry(&resv->seq, seq)) { - if (reservation_object_trylock(resv)) { - if (!__read_seqcount_retry(&resv->seq, seq)) - reservation_object_add_excl_fence(resv, NULL); - reservation_object_unlock(resv); - } - } - return timeout; } -- 2.17.1

3 9

[PATCH 0/3] drm/meson: convert bindings to YAML schemas
by Neil Armstrong 06 Aug '19

06 Aug '19

This patchset converts the existing text bindings to YAML schemas. Those bindings have a lot of texts, thus is interesting to convert. All have been tested using : $ make ARCH=arm64 dtbs_check Issues with the amlogic arm64 DTs has already been identified thanks to the validation scripts. The DT fixes will be pushed once these yaml bindings are acked. Neil Armstrong (3): dt-bindings: display: amlogic,meson-dw-hdmi: convert to yaml dt-bindings: display: amlogic,meson-vpu: convert to yaml MAINTAINERS: Update with Amlogic DRM bindings converted as YAML .../display/amlogic,meson-dw-hdmi.txt | 119 ------------- .../display/amlogic,meson-dw-hdmi.yaml | 160 ++++++++++++++++++ .../bindings/display/amlogic,meson-vpu.txt | 121 ------------- .../bindings/display/amlogic,meson-vpu.yaml | 153 +++++++++++++++++ MAINTAINERS | 4 +- 5 files changed, 315 insertions(+), 242 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml delete mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml -- 2.22.0

2 7

[PATCH] drm/qxl: Use dev_get_drvdata where possible
by Chuhong Yuan 06 Aug '19

06 Aug '19

Instead of using to_pci_dev + pci_get_drvdata, use dev_get_drvdata to make code simpler. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- drivers/gpu/drm/qxl/qxl_drv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index f33e349c4ec5..af1e2b377945 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -206,16 +206,14 @@ static int qxl_pm_resume(struct device *dev) static int qxl_pm_thaw(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct drm_device *drm_dev = pci_get_drvdata(pdev); + struct drm_device *drm_dev = dev_get_drvdata(dev); return qxl_drm_resume(drm_dev, true); } static int qxl_pm_freeze(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct drm_device *drm_dev = pci_get_drvdata(pdev); + struct drm_device *drm_dev = dev_get_drvdata(dev); return qxl_drm_freeze(drm_dev); } -- 2.20.1

2 1

[Bug 109345] drm-next-2018-12-14 -Linux PPC
by bugzilla-daemon＠freedesktop.org 06 Aug '19

06 Aug '19

https://bugs.freedesktop.org/show_bug.cgi?id=109345 Bug ID: 109345 Summary: drm-next-2018-12-14 -Linux PPC Product: DRI Version: XOrg git Hardware: PowerPC OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: DRM/Radeon Assignee: dri-devel(a)lists.freedesktop.org Reporter: acefnq(a)gmail.com Initialization and use of secondary graphics card (Firepro2600) does not work with new kernels using update drm-next-2018-12-14. Situation Amigaone x5000 with Radeon R7 250E in 16x PCIE slot, and Firepro 2260 in 1 x PCIE slot. Previously using the following commands would allow the Firepro 2260 to be used instead of the 250E. "sudo mv '/usr/lib/xorg/modules/libglamoregl.so' '/usr/lib/xorg/modules/libglamoregl.so.bak' sudo mv /etc/X11/xorg.conf /etc/X11/xorg.conf.bak" Since the incorporation of update drm-next-2018-12-14, initialization of the Firepro fails and the 250E is used. If I remove the 250E and place the Firepro 2260 in the 16x PCIE slot it is initialized and works fine. The issue is I need to use the 250E for Amiga 4.1 OS. I have kept various logs but I am not sure this is actually a bug or consistent with what developers wish to happen. -- You are receiving this mail because: You are the assignee for the bug.

1 49

[PATCH] drm/msm: Use struct_size() helper
by Gustavo A. R. Silva 05 Aug '19

05 Aug '19

One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example: struct msm_gem_submit { ... struct { ... } bos[0]; }; Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes. So, replace the following form: sizeof(*submit) + ((u64)nr_bos * sizeof(submit->bos[0])) with: struct_size(submit, bos, nr_bos) This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index 348f8c2be806..7c17c6154058 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -26,8 +26,8 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev, uint32_t nr_cmds) { struct msm_gem_submit *submit; - uint64_t sz = sizeof(*submit) + ((u64)nr_bos * sizeof(submit->bos[0])) + - ((u64)nr_cmds * sizeof(submit->cmd[0])); + uint64_t sz = struct_size(submit, bos, nr_bos) + + ((u64)nr_cmds * sizeof(submit->cmd[0])); if (sz > SIZE_MAX) return NULL; -- 2.22.0

1 0

[PATCH v4 0/6] qcom: add OCMEM support
by Brian Masney 05 Aug '19

05 Aug '19

This patch series adds support for Qualcomm's On Chip MEMory (OCMEM) that is needed in order to support some a3xx and a4xx-based GPUs upstream. This is based on Rob Clark's patch series that he submitted in October 2015 and I am resubmitting updated patches with his permission. See the individual patches for the changelog. This was tested with the GPU on a LG Nexus 5 (hammerhead) phone and this will work on other msm8974-based systems. For a summary of what currently works upstream on the Nexus 5, see my status page at https://masneyb.github.io/nexus-5-upstream/. Brian Masney (4): dt-bindings: soc: qcom: add On Chip MEMory (OCMEM) bindings dt-bindings: display: msm: gmu: add optional ocmem property soc: qcom: add OCMEM driver drm/msm/gpu: add ocmem init/cleanup functions Rob Clark (2): firmware: qcom: scm: add OCMEM lock/unlock interface firmware: qcom: scm: add support to restore secure config to qcm_scm-32 .../devicetree/bindings/display/msm/gmu.txt | 50 ++ .../devicetree/bindings/sram/qcom,ocmem.yaml | 96 ++++ drivers/firmware/qcom_scm-32.c | 52 ++- drivers/firmware/qcom_scm-64.c | 12 + drivers/firmware/qcom_scm.c | 53 +++ drivers/firmware/qcom_scm.h | 9 + drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 28 +- drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 3 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 25 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 3 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 40 ++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 10 + drivers/soc/qcom/Kconfig | 10 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/ocmem.c | 433 ++++++++++++++++++ include/linux/qcom_scm.h | 26 ++ include/soc/qcom/ocmem.h | 62 +++ 18 files changed, 869 insertions(+), 45 deletions(-) create mode 100644 Documentation/devicetree/bindings/sram/qcom,ocmem.yaml create mode 100644 drivers/soc/qcom/ocmem.c create mode 100644 include/soc/qcom/ocmem.h -- 2.21.0

3 8

[PATCH 1/2] drm: add cache support for arm64
by Rob Clark 05 Aug '19

05 Aug '19

From: Rob Clark <robdclark(a)chromium.org> This will let drm/msm stop abusing DMA API for cache ops, at least for arm64. Signed-off-by: Rob Clark <robdclark(a)chromium.org> --- arch/arm64/mm/flush.c | 2 ++ drivers/gpu/drm/drm_cache.c | 20 +++++++++++++++++--- include/drm/drm_cache.h | 4 ++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c index dc19300309d2..f0eb6320c979 100644 --- a/arch/arm64/mm/flush.c +++ b/arch/arm64/mm/flush.c @@ -93,3 +93,5 @@ void arch_invalidate_pmem(void *addr, size_t size) } EXPORT_SYMBOL_GPL(arch_invalidate_pmem); #endif + +EXPORT_SYMBOL_GPL(__flush_dcache_area); diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c index 3bd76e918b5d..90105c637797 100644 --- a/drivers/gpu/drm/drm_cache.c +++ b/drivers/gpu/drm/drm_cache.c @@ -69,6 +69,14 @@ static void drm_cache_flush_clflush(struct page *pages[], } #endif +#if defined(__powerpc__) +static void __flush_dcache_area(void *addr, size_t len) +{ + flush_dcache_range((unsigned long)addr, + (unsigned long)addr + PAGE_SIZE); +} +#endif + /** * drm_clflush_pages - Flush dcache lines of a set of pages. * @pages: List of pages to be flushed. @@ -90,7 +98,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) if (wbinvd_on_all_cpus()) pr_err("Timed out waiting for cache flush\n"); -#elif defined(__powerpc__) +#elif defined(__powerpc__) || defined(CONFIG_ARM64) unsigned long i; for (i = 0; i < num_pages; i++) { struct page *page = pages[i]; @@ -100,8 +108,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) continue; page_virtual = kmap_atomic(page); - flush_dcache_range((unsigned long)page_virtual, - (unsigned long)page_virtual + PAGE_SIZE); + __flush_dcache_area(page_virtual, PAGE_SIZE); kunmap_atomic(page_virtual); } #else @@ -135,6 +142,13 @@ drm_clflush_sg(struct sg_table *st) if (wbinvd_on_all_cpus()) pr_err("Timed out waiting for cache flush\n"); +#elif defined(CONFIG_ARM64) + struct sg_page_iter sg_iter; + + for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) { + struct page *p = sg_page_iter_page(&sg_iter); + drm_clflush_pages(&p, 1); + } #else pr_err("Architecture has no drm_cache.c support\n"); WARN_ON_ONCE(1); diff --git a/include/drm/drm_cache.h b/include/drm/drm_cache.h index 987ff16b9420..f94e7bd3eca4 100644 --- a/include/drm/drm_cache.h +++ b/include/drm/drm_cache.h @@ -40,6 +40,10 @@ void drm_clflush_sg(struct sg_table *st); void drm_clflush_virt_range(void *addr, unsigned long length); bool drm_need_swiotlb(int dma_bits); +#if defined(CONFIG_X86) || defined(__powerpc__) || defined(CONFIG_ARM64) +#define HAS_DRM_CACHE 1 +#endif + static inline bool drm_arch_can_wc_memory(void) { -- 2.21.0

1 1

[PATCH v1 1/1] backlight: drop EARLY_EVENT_BLANK support
by Sam Ravnborg 05 Aug '19

05 Aug '19

There was no users left - so drop the code to support EARLY_FB_BLANK. This patch removes the support in backlight, and drop the notifier in fbmem. That EARLY_FB_BLANK is not used can be verified that no driver set any of: lcd_ops.early_set_power() lcd_ops.r_early_set_power() Noticed while browsing backlight code for other reasons. Signed-off-by: Sam Ravnborg <sam(a)ravnborg.org> Cc: Lee Jones <lee.jones(a)linaro.org> Cc: Daniel Thompson <daniel.thompson(a)linaro.org> Cc: Jingoo Han <jingoohan1(a)gmail.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie(a)samsung.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> Cc: "Michał Mirosław" <mirq-linux(a)rere.qmqm.pl> Cc: Peter Rosin <peda(a)axentia.se> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-fbdev(a)vger.kernel.org --- Build tested with various architectures, configs. Lee, Daniel - OK to commit to drm-misc-next where fbdev stuff is maintained today? Patch needs ack from Bartlomiej first of course. Sam drivers/video/backlight/lcd.c | 8 -------- drivers/video/fbdev/core/fbmem.c | 12 +----------- include/linux/fb.h | 4 ---- include/linux/lcd.h | 10 ---------- 4 files changed, 1 insertion(+), 33 deletions(-) diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c index d6b653aa4ee9..78b033358625 100644 --- a/drivers/video/backlight/lcd.c +++ b/drivers/video/backlight/lcd.c @@ -39,14 +39,6 @@ static int fb_notifier_callback(struct notifier_block *self, if (event == FB_EVENT_BLANK) { if (ld->ops->set_power) ld->ops->set_power(ld, *(int *)evdata->data); - } else if (event == FB_EARLY_EVENT_BLANK) { - if (ld->ops->early_set_power) - ld->ops->early_set_power(ld, - *(int *)evdata->data); - } else if (event == FB_R_EARLY_EVENT_BLANK) { - if (ld->ops->r_early_set_power) - ld->ops->r_early_set_power(ld, - *(int *)evdata->data); } else { if (ld->ops->set_mode) ld->ops->set_mode(ld, evdata->data); diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 00fe0efeaee9..e6a1c805064f 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1058,7 +1058,7 @@ int fb_blank(struct fb_info *info, int blank) { struct fb_event event; - int ret = -EINVAL, early_ret; + int ret = -EINVAL; if (blank > FB_BLANK_POWERDOWN) blank = FB_BLANK_POWERDOWN; @@ -1066,21 +1066,11 @@ fb_blank(struct fb_info *info, int blank) event.info = info; event.data = &blank; - early_ret = fb_notifier_call_chain(FB_EARLY_EVENT_BLANK, &event); - if (info->fbops->fb_blank) ret = info->fbops->fb_blank(blank, info); if (!ret) fb_notifier_call_chain(FB_EVENT_BLANK, &event); - else { - /* - * if fb_blank is failed then revert effects of - * the early blank event. - */ - if (!early_ret) - fb_notifier_call_chain(FB_R_EARLY_EVENT_BLANK, &event); - } return ret; } diff --git a/include/linux/fb.h b/include/linux/fb.h index 50948e519897..756706b666a1 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -135,10 +135,6 @@ struct fb_cursor_user { /* A display blank is requested */ #define FB_EVENT_BLANK 0x09 -/* A hardware display blank early change occurred */ -#define FB_EARLY_EVENT_BLANK 0x10 -/* A hardware display blank revert early change occurred */ -#define FB_R_EARLY_EVENT_BLANK 0x11 struct fb_event { struct fb_info *info; diff --git a/include/linux/lcd.h b/include/linux/lcd.h index 851eee8fff25..238fb1dfed98 100644 --- a/include/linux/lcd.h +++ b/include/linux/lcd.h @@ -41,16 +41,6 @@ struct lcd_ops { /* Get the LCD panel power status (0: full on, 1..3: controller power on, flat panel power off, 4: full off), see FB_BLANK_XXX */ int (*get_power)(struct lcd_device *); - /* - * Enable or disable power to the LCD(0: on; 4: off, see FB_BLANK_XXX) - * and this callback would be called proir to fb driver's callback. - * - * P.S. note that if early_set_power is not NULL then early fb notifier - * would be registered. - */ - int (*early_set_power)(struct lcd_device *, int power); - /* revert the effects of the early blank event. */ - int (*r_early_set_power)(struct lcd_device *, int power); /* Enable or disable power to the LCD (0: on; 4: off, see FB_BLANK_XXX) */ int (*set_power)(struct lcd_device *, int power); /* Get the current contrast setting (0-max_contrast) */ -- 2.20.1

5 10

[PATCH 0/4 v2] PL111 DRM conversion of nspire
by Linus Walleij 05 Aug '19

05 Aug '19

This now works, I think. So this is a cold-coded attempt to move the TI nspire over to using DRM. It is more or less the last user of the old fbdev driver so it is a noble cause and interesting usecase. This can be applied on top of a vanilla Torvalds v5.3-rc1 kernel out since sunday. I do not expect these patches to "just work", I expect them to need some hacking, so someone who is actually working on the hardware will need to step in and fix it up. It does outline the overall idea of how to do this. I found no defconfig for nspire in the kernel so I used ARMv4t multi. Configuring the driver for nspire: - Disable CONFIG_FB_ARMCLCD - Enable CONFIG_DRM_PL111, CONFIG_DRM_PANEL_SIMPLE The ARM patch will be merged separately through ARM SoC. Linus Walleij (4): drm/pl111: Support grayscale drm/panel: simple: Add TI nspire panel bindings drm/panel: simple: Support TI nspire panels ARM: nspire: Move CLCD set-up to device tree .../bindings/display/panel/ti,nspire.yaml | 36 ++++++ arch/arm/boot/dts/nspire-classic.dtsi | 19 ++- arch/arm/boot/dts/nspire-cx.dts | 18 ++- arch/arm/boot/dts/nspire.dtsi | 10 +- arch/arm/mach-nspire/Makefile | 1 - arch/arm/mach-nspire/clcd.c | 114 ------------------ arch/arm/mach-nspire/clcd.h | 10 -- arch/arm/mach-nspire/nspire.c | 25 ---- drivers/gpu/drm/panel/panel-simple.c | 64 ++++++++++ drivers/gpu/drm/pl111/pl111_display.c | 29 ++++- include/linux/amba/clcd-regs.h | 1 + 11 files changed, 171 insertions(+), 156 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/panel/ti,nspire.yaml delete mode 100644 arch/arm/mach-nspire/clcd.c delete mode 100644 arch/arm/mach-nspire/clcd.h -- 2.21.0

3 6

XDC 2019: Schedule published & Workshops CfP reopened!
by Mark Filion 05 Aug '19

05 Aug '19

Hello, The preliminary schedule for XDC 2019 has been published! https://xdc2019.x.org/event/5/timetable/#20191002.detailed XDC 2019 will take place at the Concordia University Conference Centre in Montréal, Canada on October 2-4, 2019. If you haven't already done so, now is the time to book your travel! In addition to publishing the schedule, the CfP for workshops has been reopened. If you ave an idea for a workshop discussion, please sent it in! https://xdc2019.x.org/event/5/abstracts/ We are looking forward to seeing you (and sharing a poutine!) in beautiful Montréal! If you have any questions, please send me an email to mark.filion(a)collabora.com, adding on CC the X.org board (board at foundation.x.org). And don't forget, you can follow us on Twitter for all the latest updates and to stay connected: https://twitter.com/xdc2019 Best, Mark

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2019