dri-devel February 2020

dri-devel@lists.freedesktop.org

302 participants
679 discussions

[PATCH] drm/shmem: drop pgprot_decrypted()
by Gerd Hoffmann 28 Feb '20

28 Feb '20

Was added by commit 95cf9264d5f3 ("x86, drm, fbdev: Do not specify encrypted memory for video mappings"), then it was kept through various changes. While vram actually needs decrypted mappings this is not correct for shmem gem objects which live in main memory not io memory, so remove the call. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- drivers/gpu/drm/drm_gem_shmem_helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/… [View More]

2 1

[PATCH] ion_system_heap: support X86 archtecture
by jun.zhang＠intel.com 28 Feb '20

28 Feb '20

From: zhang jun <jun.zhang(a)intel.com> we see tons of warning like: [ 45.846872] x86/PAT: NDK MediaCodec_:3753 map pfn RAM range req write-combining for [mem 0x1e7a80000-0x1e7a87fff], got write-back [ 45.848827] x86/PAT: .vorbis.decoder:4088 map pfn RAM range req write-combining for [mem 0x1e7a58000-0x1e7a58fff], got write-back [ 45.848875] x86/PAT: NDK MediaCodec_:3753 map pfn RAM range req write-combining for [mem 0x1e7a48000-0x1e7a4ffff], got write-back [ 45.849403] x86/PAT: .… [View More]vorbis.decoder:4088 map pfn RAM range req write-combining for [mem 0x1e7a70000-0x1e7a70fff], got write-back check the kernel Documentation/x86/pat.txt, it says: A. Exporting pages to users with remap_pfn_range, io_remap_pfn_range, vm_insert_pfn Drivers wanting to export some pages to userspace do it by using mmap interface and a combination of 1) pgprot_noncached() 2) io_remap_pfn_range() or remap_pfn_range() or vm_insert_pfn() With PAT support, a new API pgprot_writecombine is being added. So, drivers can continue to use the above sequence, with either pgprot_noncached() or pgprot_writecombine() in step 1, followed by step 2. In addition, step 2 internally tracks the region as UC or WC in memtype list in order to ensure no conflicting mapping. Note that this set of APIs only works with IO (non RAM) regions. If driver ants to export a RAM region, it has to do set_memory_uc() or set_memory_wc() as step 0 above and also track the usage of those pages and use set_memory_wb() before the page is freed to free pool. the fix follow the pat document, do set_memory_wc() as step 0 and use the set_memory_wb() before the page is freed. Signed-off-by: he, bo <bo.he(a)intel.com> Signed-off-by: zhang jun <jun.zhang(a)intel.com> Signed-off-by: Bai, Jie A <jie.a.bai(a)intel.com> --- drivers/staging/android/ion/ion_system_heap.c | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index b83a1d16bd89..d298b8194820 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -13,6 +13,7 @@ #include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <asm/set_memory.h> #include "ion.h" @@ -134,6 +135,13 @@ static int ion_system_heap_allocate(struct ion_heap *heap, sg = table->sgl; list_for_each_entry_safe(page, tmp_page, &pages, lru) { sg_set_page(sg, page, page_size(page), 0); + +#ifdef CONFIG_X86 + if (!(buffer->flags & ION_FLAG_CACHED)) + set_memory_wc((unsigned long)page_address(sg_page(sg)), + PAGE_ALIGN(sg->length) >> PAGE_SHIFT); +#endif + sg = sg_next(sg); list_del(&page->lru); } @@ -162,8 +170,15 @@ static void ion_system_heap_free(struct ion_buffer *buffer) if (!(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) ion_heap_buffer_zero(buffer); - for_each_sg(table->sgl, sg, table->nents, i) + for_each_sg(table->sgl, sg, table->nents, i) { +#ifdef CONFIG_X86 + if (!(buffer->flags & ION_FLAG_CACHED)) + set_memory_wb((unsigned long)page_address(sg_page(sg)), + PAGE_ALIGN(sg->length) >> PAGE_SHIFT); +#endif + free_buffer_page(sys_heap, buffer, sg_page(sg)); + } sg_free_table(table); kfree(table); } @@ -316,6 +331,12 @@ static int ion_system_contig_heap_allocate(struct ion_heap *heap, buffer->sg_table = table; +#ifdef CONFIG_X86 + if (!(buffer->flags & ION_FLAG_CACHED)) + set_memory_wc((unsigned long)page_address(page), + PAGE_ALIGN(len) >> PAGE_SHIFT); +#endif + return 0; free_table: @@ -334,6 +355,11 @@ static void ion_system_contig_heap_free(struct ion_buffer *buffer) unsigned long pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT; unsigned long i; +#ifdef CONFIG_X86 + if (!(buffer->flags & ION_FLAG_CACHED)) + set_memory_wb((unsigned long)page_address(page), pages); +#endif + for (i = 0; i < pages; i++) __free_page(page + i); sg_free_table(table); -- 2.17.1 [View Less]

5 4

[PATCH] drm/etnaviv: rework perfmon query infrastructure
by Christian Gmeiner 28 Feb '20

28 Feb '20

Report the correct perfmon domains and signals depending on the supported feature flags. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query perf counter") Cc: stable(a)vger.kernel.org Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 57 ++++++++++++++++++++--- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/… [View More]etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c index 8adbf2861bff..7ae8f347ca06 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c @@ -32,6 +32,7 @@ struct etnaviv_pm_domain { }; struct etnaviv_pm_domain_meta { + unsigned int feature; const struct etnaviv_pm_domain *domains; u32 nr_domains; }; @@ -410,36 +411,78 @@ static const struct etnaviv_pm_domain doms_vg[] = { static const struct etnaviv_pm_domain_meta doms_meta[] = { { + .feature = chipFeatures_PIPE_3D, .nr_domains = ARRAY_SIZE(doms_3d), .domains = &doms_3d[0] }, { + .feature = chipFeatures_PIPE_2D, .nr_domains = ARRAY_SIZE(doms_2d), .domains = &doms_2d[0] }, { + .feature = chipFeatures_PIPE_VG, .nr_domains = ARRAY_SIZE(doms_vg), .domains = &doms_vg[0] } }; +static unsigned int num_pm_domains(const struct etnaviv_gpu *gpu) +{ + unsigned int num = 0, i; + + for (i = 0; i < ARRAY_SIZE(doms_meta); i++) { + const struct etnaviv_pm_domain_meta *meta = &doms_meta[i]; + + if (gpu->identity.features & meta->feature) + num += meta->nr_domains; + } + + return num; +} + +static const struct etnaviv_pm_domain *pm_domain(const struct etnaviv_gpu *gpu, + unsigned int index) +{ + const struct etnaviv_pm_domain *domain = NULL; + unsigned int offset = 0, i; + + for (i = 0; i < ARRAY_SIZE(doms_meta); i++) { + const struct etnaviv_pm_domain_meta *meta = &doms_meta[i]; + + if (!(gpu->identity.features & meta->feature)) + continue; + + if (meta->nr_domains < (index - offset)) { + offset += meta->nr_domains; + continue; + } + + domain = meta->domains + (index - offset); + } + + BUG_ON(!domain); + + return domain; +} + int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu, struct drm_etnaviv_pm_domain *domain) { - const struct etnaviv_pm_domain_meta *meta = &doms_meta[domain->pipe]; + const unsigned int nr_domains = num_pm_domains(gpu); const struct etnaviv_pm_domain *dom; - if (domain->iter >= meta->nr_domains) + if (domain->iter >= nr_domains) return -EINVAL; - dom = meta->domains + domain->iter; + dom = pm_domain(gpu, domain->iter); domain->id = domain->iter; domain->nr_signals = dom->nr_signals; strncpy(domain->name, dom->name, sizeof(domain->name)); domain->iter++; - if (domain->iter == meta->nr_domains) + if (domain->iter == nr_domains) domain->iter = 0xff; return 0; @@ -448,14 +491,14 @@ int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu, int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu, struct drm_etnaviv_pm_signal *signal) { - const struct etnaviv_pm_domain_meta *meta = &doms_meta[signal->pipe]; + const unsigned int nr_domains = num_pm_domains(gpu); const struct etnaviv_pm_domain *dom; const struct etnaviv_pm_signal *sig; - if (signal->domain >= meta->nr_domains) + if (signal->domain >= nr_domains) return -EINVAL; - dom = meta->domains + signal->domain; + dom = pm_domain(gpu, signal->domain); if (signal->iter >= dom->nr_signals) return -EINVAL; -- 2.24.1 [View Less]

2 3

[RFC PATCH 0/8] *** Refactor struct virtgpu_object ***
by Gurchetan Singh 28 Feb '20

28 Feb '20

The main motivation behind this is to have eventually have something like this: struct virtio_gpu_shmem { struct drm_gem_shmem_object base; uint32_t hw_res_handle; struct sg_table *pages; (...) }; struct virtio_gpu_vram { struct drm_gem_object base; // or *drm_gem_vram_object uint32_t hw_res_handle; {offset, range}; (...) }; Sending this out to solicit feedback on this … [View More]

2 12

Re: linux-next: Tree for Feb 28 (gpu/drm/i915/display/intel_display.c)
by Randy Dunlap 28 Feb '20

28 Feb '20

On 2/27/20 8:42 PM, Stephen Rothwell wrote: > Hi all, > > Changes since 20200227: > on i386: ../drivers/gpu/drm/i915/display/intel_display.c:252:1: error: 'has_transcoder' defined but not used [-Werror=unused-function] has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder) ^~~~~~~~~~~~~~ Full randconfig file is attached. -- ~Randy Reported-by: Randy Dunlap <rdunlap(a)infradead.org>

2 1

[PATCH] drm/panfrost: Silence warnings during deferred probe
by Marek Szyprowski 28 Feb '20

28 Feb '20

Don't confuse user with meaningless warnings about the failure in getting resources in case of deferred probe. Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index 238fb6d54df4..1c3f2e656b53 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++… [View More] b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -21,7 +21,9 @@ static int panfrost_reset_init(struct panfrost_device *pfdev) pfdev->rstc = devm_reset_control_array_get(pfdev->dev, false, true); if (IS_ERR(pfdev->rstc)) { - dev_err(pfdev->dev, "get reset failed %ld\n", PTR_ERR(pfdev->rstc)); + if (PTR_ERR(pfdev->rstc) != -EPROBE_DEFER) + dev_err(pfdev->dev, "get reset failed %ld\n", + PTR_ERR(pfdev->rstc)); return PTR_ERR(pfdev->rstc); } @@ -44,7 +46,9 @@ static int panfrost_clk_init(struct panfrost_device *pfdev) pfdev->clock = devm_clk_get(pfdev->dev, NULL); if (IS_ERR(pfdev->clock)) { - dev_err(pfdev->dev, "get clock failed %ld\n", PTR_ERR(pfdev->clock)); + if (PTR_ERR(pfdev->clock) != -EPROBE_DEFER) + dev_err(pfdev->dev, "get clock failed %ld\n", + PTR_ERR(pfdev->clock)); return PTR_ERR(pfdev->clock); } @@ -57,8 +61,9 @@ static int panfrost_clk_init(struct panfrost_device *pfdev) pfdev->bus_clock = devm_clk_get_optional(pfdev->dev, "bus"); if (IS_ERR(pfdev->bus_clock)) { - dev_err(pfdev->dev, "get bus_clock failed %ld\n", - PTR_ERR(pfdev->bus_clock)); + if (PTR_ERR(pfdev->bus_clock) != -EPROBE_DEFER) + dev_err(pfdev->dev, "get bus_clock failed %ld\n", + PTR_ERR(pfdev->bus_clock)); return PTR_ERR(pfdev->bus_clock); } @@ -91,9 +96,10 @@ static int panfrost_regulator_init(struct panfrost_device *pfdev) pfdev->regulator = devm_regulator_get(pfdev->dev, "mali"); if (IS_ERR(pfdev->regulator)) { - ret = PTR_ERR(pfdev->regulator); - dev_err(pfdev->dev, "failed to get regulator: %d\n", ret); - return ret; + if (PTR_ERR(pfdev->regulator) != -EPROBE_DEFER) + dev_err(pfdev->dev, "failed to get regulator: %d\n", + PTR_ERR(pfdev->regulator)); + return PTR_ERR(pfdev->regulator); } ret = regulator_enable(pfdev->regulator); @@ -124,19 +130,22 @@ int panfrost_device_init(struct panfrost_device *pfdev) err = panfrost_clk_init(pfdev); if (err) { - dev_err(pfdev->dev, "clk init failed %d\n", err); + if (err != -EPROBE_DEFER) + dev_err(pfdev->dev, "clk init failed %d\n", err); return err; } err = panfrost_regulator_init(pfdev); if (err) { - dev_err(pfdev->dev, "regulator init failed %d\n", err); + if (err != -EPROBE_DEFER) + dev_err(pfdev->dev, "regulator init failed %d\n", err); goto err_out0; } err = panfrost_reset_init(pfdev); if (err) { - dev_err(pfdev->dev, "reset init failed %d\n", err); + if (err != -EPROBE_DEFER) + dev_err(pfdev->dev, "reset init failed %d\n", err); goto err_out1; } -- 2.17.1 [View Less]

1 0

[PATCH v3 0/4] drm: Provide a simple encoder
by Thomas Zimmermann 28 Feb '20

28 Feb '20

Many DRM drivers implement an encoder with an empty implementation. This patchset adds drm_simple_encoder_init(), which can be used by drivers instead. Except for the destroy callback, the simple encoder's implementation is empty. The patchset also converts 4 encoder instances to use the simple-encoder helpers. But there are at least 11 other drivers which can use the helper and I think I did not examine all drivers yet. The patchset was smoke-tested on mgag200 by running the fbdev console … [View More]

2 8

[PATCH] dma-buf: Fix missing excl fence waiting
by Pan, Xinhui 28 Feb '20

28 Feb '20

If shared fence list is not empty, even we want to test all fences, excl fence is ignored. That is abviously wrong, so fix it. Signed-off-by: xinhui pan <xinhui.pan(a)amd.com> --- drivers/dma-buf/dma-resv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 4264e64788c4..44dc64c547c6 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -632,14 +632,14 @@ static inline int … [View More]

3 8

[git pull] drm fixes for 5.6-rc4
by Dave Airlie 28 Feb '20

28 Feb '20

Hey Linus, Just some fixes for this week, amdgpu, radeon and i915. The main i915 one is a regression Gen7 (Ivybridge/Haswell), this moves them back from trying to use the full-ppgtt support to the aliasing version it used to use due to gpu hangs. Otherwise it's pretty quiet. Dave. drm-fixes-2020-02-28: drm fixes for 5.6.0-rc4 amdgpu: - Drop DRIVER_USE_AGP - Fix memory leak in GPU reset - Resume fix for raven radeon: - Drop DRIVER_USE_AGP i915: - downgrade gen7 back to aliasing-ppgtt to … [View More]avoid GPU hangs - shrinker fix - pmu leak and double free fixes - gvt user after free and virtual display reset fixes - randconfig build fix The following changes since commit f8788d86ab28f61f7b46eb6be375f8a726783636: Linux 5.6-rc3 (2020-02-23 16:17:42 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2020-02-28 for you to fetch changes up to f091bf39700dd086ab244c823f389556fed0c513: Merge tag 'drm-intel-fixes-2020-02-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2020-02-28 12:40:49 +1000) ---------------------------------------------------------------- drm fixes for 5.6.0-rc4 amdgpu: - Drop DRIVER_USE_AGP - Fix memory leak in GPU reset - Resume fix for raven radeon: - Drop DRIVER_USE_AGP i915: - downgrade gen7 back to aliasing-ppgtt to avoid GPU hangs - shrinker fix - pmu leak and double free fixes - gvt user after free and virtual display reset fixes - randconfig build fix ---------------------------------------------------------------- Chris Wilson (2): drm/i915/gtt: Downgrade gen7 (ivb, byt, hsw) back to aliasing-ppgtt drm/i915: Avoid recursing onto active vma from the shrinker Daniel Vetter (2): drm/amdgpu: Drop DRIVER_USE_AGP drm/radeon: Inline drm_get_pci_dev Dave Airlie (2): Merge tag 'amd-drm-fixes-5.6-2020-02-26' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2020-02-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Jani Nikula (2): drm/i915: fix header test with GCOV Merge tag 'gvt-fixes-2020-02-26' of https://github.com/intel/gvt-linux into drm-intel-fixes Michał Winiarski (2): drm/i915/pmu: Avoid using globals for CPU hotplug state drm/i915/pmu: Avoid using globals for PMU events Monk Liu (1): drm/amdgpu: fix memory leak during TDR test(v2) Shirish S (1): amdgpu/gmc_v9: save/restore sdpif regs during S3 Tina Zhang (2): drm/i915/gvt: Separate display reset from ALL_ENGINES reset drm/i915/gvt: Fix orphan vgpu dmabuf_objs' lifetime drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 37 +++++++++++++- .../drm/amd/include/asic_reg/dce/dce_12_0_offset.h | 2 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 ++- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 4 +- drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- drivers/gpu/drm/i915/i915_pci.c | 4 +- drivers/gpu/drm/i915/i915_pmu.c | 59 ++++++++++++---------- drivers/gpu/drm/i915/i915_pmu.h | 11 +++- drivers/gpu/drm/radeon/radeon_drv.c | 43 +++++++++++++++- drivers/gpu/drm/radeon/radeon_kms.c | 6 +++ 14 files changed, 138 insertions(+), 43 deletions(-) [View Less]

2 1

[PATCH v10 0/5] mt8183 dpi supports dual edge and pin mode swap
by Jitao Shi 28 Feb '20

28 Feb '20

Changes since v9: - rename pinctrl-names = "gpiomode", "dpimode" to "active", "idle". - fix some typo. Changes since v8: - drop pclk-sample redefine in mediatek,dpi.txt - only get the gpiomode and dpimode when dpi->pinctrl is successful. Changes since v7: - separate dt-bindings to independent patches. - move dpi dual edge to one patch. Changes since v6: - change dual_edge to pclk-sample - remove dpi_pin_mode_swap and Changes since v5: - fine tune the dt-bindings commit message. … [View More]

2 6

← Newer
1
...
22
23
24
25
26
27
28
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2020