dri-devel October 2019

dri-devel@lists.freedesktop.org

359 participants
1833 discussions

[PATCH 0/3] drm/tinydrm: Rename to drm/tiny
by Noralf Trønnes 10 Oct '19

10 Oct '19

This is the final polish on tinydrm turning it into _the_ place for tiny DRM drivers. Noralf. Noralf Trønnes (3): drm/tinydrm/Kconfig: Remove menuconfig DRM_TINYDRM drm/tinydrm: Rename folder to tiny drm/gm12u320: Move driver to drm/tiny MAINTAINERS | 14 +++---- drivers/gpu/drm/Kconfig | 4 +- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/gm12u320/Kconfig | 9 ---- drivers/gpu/drm/gm12u320/… [View More]

7 21

[PATCH v2 00/24] drm/msm: Various dpu locking and legacy cleanups
by Sean Paul 10 Oct '19

10 Oct '19

From: Sean Paul <seanpaul(a)chromium.org> This was originally 3 patchsets, but none have gotten full review, so I figured I'd package the v2's all up into one set so it's easier to track. Set 1- https://lists.freedesktop.org/archives/dri-devel/2018-November/196170.html Set 2- https://lists.freedesktop.org/archives/dri-devel/2018-November/196184.html Set 3- https://lists.freedesktop.org/archives/dri-devel/2018-November/196276.html Thanks, Sean Sean Paul (24): drm/msm: dpu: Remove … [View More]dpu_power_handle_get_dbus_name() drm/msm: dpu: Remove unused trace_dpu_perf_update_bus() drm/msm: dpu: Remove dpu_power_client drm/msm: dpu: Don't use power_event for vbif_init_memtypes drm/msm: dpu: Handle crtc pm_runtime_resume() directly drm/msm: dpu: Remove power_handle from core_perf drm/msm: dpu: Include dpu_io_util.h directly in dpu_kms.h drm/msm: dpu: Move DPU_POWER_HANDLE_DBUS_ID to core_perf drm/msm: dpu: Remove dpu_power_handle drm/msm: dpu: Fix typo in dpu_encoder drm/msm: dpu: Add ->enabled to dpu_encoder_virt drm/msm: dpu: Move crtc runtime resume to encoder drm/msm: dpu: Don't drop locks in crtc_vblank_enable drm/msm: dpu: Grab the modeset locks in frame_event drm/msm: dpu: Stop using encoder->crtc pointer drm/msm: dpu: Add modeset lock checks where applicable drm/msm: dpu: Move pm_runtime_(get|put) from vblank_enable drm/msm: dpu: Remove crtc_lock from setup_mixers drm/msm: dpu: Remove vblank_callback from encoder drm/msm: dpu: Use atomic_disable for dpu_crtc_disable drm/msm: dpu: Don't bother checking ->enabled in dpu_crtc_vblank drm/msm: dpu: Separate crtc assignment from vblank enable drm/msm: dpu: Remove vblank_requested flag from dpu_crtc drm/msm: dpu: Remove crtc_lock drivers/gpu/drm/msm/Makefile | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 37 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 22 +- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 216 +++++----------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 15 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 97 ++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 24 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 76 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 6 +- .../gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 240 ------------------ .../gpu/drm/msm/disp/dpu1/dpu_power_handle.h | 217 ---------------- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 43 +--- 12 files changed, 204 insertions(+), 790 deletions(-) delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.h -- Sean Paul, Software Engineer, Google / Chromium OS [View Less]

3 51

[Bug 111796] [CI][SHARDS] igt@gem_eio@in-flight-suspend - crash - Received signal SIGSEGV
by bugzilla-daemon＠freedesktop.org 10 Oct '19

10 Oct '19

1 0

[Bug 111933] driconf-0.9.1-r2 - assert iter or allowNone
by bugzilla-daemon＠freedesktop.org 10 Oct '19

10 Oct '19

https://bugs.freedesktop.org/show_bug.cgi?id=111933 Bug ID: 111933 Summary: driconf-0.9.1-r2 - assert iter or allowNone Product: DRI Version: XOrg git Hardware: Other OS: All Status: NEW Severity: not set Priority: not set Component: General Assignee: dri-devel(a)lists.freedesktop.org Reporter: mmokrejs(a)gmail.com $ rm -rf ~/.driconf $ driconf [click on Reload … [View More]

1 2

[Bug 111932] driconf: TypeError: cannot concatenate 'str' and 'int' objects
by bugzilla-daemon＠freedesktop.org 10 Oct '19

10 Oct '19

https://bugs.freedesktop.org/show_bug.cgi?id=111932 Bug ID: 111932 Summary: driconf: TypeError: cannot concatenate 'str' and 'int' objects Product: DRI Version: XOrg git Hardware: Other OS: All Status: NEW Severity: not set Priority: not set Component: General Assignee: dri-devel(a)lists.freedesktop.org Reporter: mmokrejs(a)gmail.com $ driconf … [View More]--version Screen "0" is not direct rendering capable. MESA-LOADER: failed to open radeon (search paths /usr/lib64/dri) Traceback (most recent call last): File "/usr/lib/python-exec/python2.7/driconf", line 28, in <module> driconf.main() File "/usr/lib/driconf/driconf.py", line 140, in main complexui.start(configList) File "/usr/lib/driconf/driconf_complexui.py", line 1040, in start mainWindow = MainWindow(configList) File "/usr/lib/driconf/driconf_complexui.py", line 830, in __init__ self.configTree = ConfigTreeView (configList) File "/usr/lib/driconf/driconf_complexui.py", line 525, in __init__ self.model = ConfigTreeModel (configList) File "/usr/lib/driconf/driconf_complexui.py", line 262, in __init__ self.addNode (config) File "/usr/lib/driconf/driconf_complexui.py", line 450, in addNode self.initNode (node) File "/usr/lib/driconf/driconf_complexui.py", line 469, in initNode self.initNode (device) File "/usr/lib/driconf/driconf_complexui.py", line 472, in initNode self.initNode (app) File "/usr/lib/driconf/driconf_complexui.py", line 474, in initNode self.validateAppNode (node) File "/usr/lib/driconf/driconf_complexui.py", line 515, in validateAppNode driver = app.device.getDriver(commonui.dpy) File "/usr/lib/driconf/dri.py", line 490, in getDriver driver = GetDriver (self.driver) File "/usr/lib/driconf/dri.py", line 430, in GetDriver driver = DriverInfo (name) File "/usr/lib/driconf/dri.py", line 292, in __init__ driInfo = XDriInfo ("options " + name) File "/usr/lib/driconf/dri.py", line 54, in XDriInfo raise DRIError ("XDriInfo killed by signal " + signal + ".") TypeError: cannot concatenate 'str' and 'int' objects $ equery belongs driconf * Searching for driconf ... x11-misc/driconf-0.9.1-r2 (/usr/share/driconf) x11-misc/driconf-0.9.1-r2 (/usr/lib/python-exec/python2.7/driconf) x11-misc/driconf-0.9.1-r2 (/usr/bin/driconf -> ../lib/python-exec/python-exec2) x11-misc/driconf-0.9.1-r2 (/usr/lib/driconf) $ This is a Gentoo Linux. Actually the '--version' argument does not matter, it crashes even without it. -- You are receiving this mail because: You are the assignee for the bug. [View Less]

1 2

[PATCH v2 0/4] drm/bridge: dw-hdmi: Add support for HDR metadata
by Jonas Karlman 10 Oct '19

10 Oct '19

Add support for HDR metadata using the hdr_output_metadata connector property, configure Dynamic Range and Mastering InfoFrame accordingly. A use_drm_infoframe flag is added to dw_hdmi_plat_data that platform drivers can use to signal when Dynamic Range and Mastering infoframes is supported. This flag is needed because Amlogic GXBB and GXL report same DW-HDMI version, and only GXL support DRM InfoFrame. The first patch add functionality to configure DRM InfoFrame based on the … [View More]

3 4

[PATCH] drm/ttm: fix handling in ttm_bo_add_mem_to_lru
by Christian König 10 Oct '19

10 Oct '19

We should not add the BO to the swap LRU when the new mem is fixed and the TTM object about to be destroyed. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/ttm/ttm_bo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 6394e0c5cc02..c51bb2c9ed4f 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -185,8 +185,9 @@ static void … [View More]

2 1

[PULL] drm-misc-fixes
by Maxime Ripard 10 Oct '19

10 Oct '19

Hi Dave, Daniel, Here's this week drm-misc-fixes PR, dealing mostly with SPI probing related issues. Maxime drm-misc-fixes-2019-10-10: Short summary of fixes pull (less than what git shortlog provides): - SPI Aliases fixes for panels - One fix for the tc358767 bridge dealing with visual artifacts The following changes since commit b6559bf3ac32acfe34e17c73d68581e7f7415785: Merge drm-misc-next-fixes-2019-10-02 into drm-misc-fixes (2019-10-03 10:00:13 +0200) are available in the Git … [View More]

1 0

[PATCH 1/2] drm/nouveau: move io_reserve_lru handling into the driver
by Christian König 10 Oct '19

10 Oct '19

While working on TTM cleanups I've found that the io_reserve_lru used by Nouveau is actually not working at all. In general we should remove driver specific handling from the memory management, so this patch moves the io_reserve_lru handling into Nouveau instead. The patch should be functional correct, but is only compile tested! Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/nouveau/nouveau_bo.c | 106 ++++++++++++++++++++++++++-------- drivers/gpu/… [View More]drm/nouveau/nouveau_bo.h | 3 + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 + drivers/gpu/drm/nouveau/nouveau_ttm.c | 43 +++++++++++++- 4 files changed, 130 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index e918b437af17..9532ad1bd474 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -139,6 +139,7 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) if (unlikely(nvbo->bo.base.filp)) DRM_ERROR("bo %p still attached to GEM object\n", bo); WARN_ON(nvbo->pin_refcnt > 0); + nouveau_bo_del_io_reserve_lru(bo); nv10_bo_put_tile_region(dev, nvbo->tile, NULL); kfree(nvbo); } @@ -297,6 +298,7 @@ nouveau_bo_init(struct nouveau_bo *nvbo, u64 size, int align, u32 flags, nouveau_bo_fixup_align(nvbo, flags, &align, &size); nvbo->bo.mem.num_pages = size >> PAGE_SHIFT; nouveau_bo_placement_set(nvbo, flags, 0); + INIT_LIST_HEAD(&nvbo->io_reserve_lru); ret = ttm_bo_init(nvbo->bo.bdev, &nvbo->bo, size, type, &nvbo->placement, align >> PAGE_SHIFT, false, @@ -566,6 +568,26 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) PAGE_SIZE, DMA_FROM_DEVICE); } +void nouveau_bo_add_io_reserve_lru(struct ttm_buffer_object *bo) +{ + struct nouveau_drm *drm = nouveau_bdev(bo->bdev); + struct nouveau_bo *nvbo = nouveau_bo(bo); + + mutex_lock(&drm->ttm.io_reserve_mutex); + list_move_tail(&nvbo->io_reserve_lru, &drm->ttm.io_reserve_lru); + mutex_unlock(&drm->ttm.io_reserve_mutex); +} + +void nouveau_bo_del_io_reserve_lru(struct ttm_buffer_object *bo) +{ + struct nouveau_drm *drm = nouveau_bdev(bo->bdev); + struct nouveau_bo *nvbo = nouveau_bo(bo); + + mutex_lock(&drm->ttm.io_reserve_mutex); + list_del_init(&nvbo->io_reserve_lru); + mutex_unlock(&drm->ttm.io_reserve_mutex); +} + int nouveau_bo_validate(struct nouveau_bo *nvbo, bool interruptible, bool no_wait_gpu) @@ -674,8 +696,6 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, } man->func = &nouveau_vram_manager; - man->io_reserve_fastpath = false; - man->use_io_reserve_lru = true; } else { man->func = &ttm_bo_manager_func; } @@ -1304,6 +1324,8 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict, if (bo->destroy != nouveau_bo_del_ttm) return; + nouveau_bo_del_io_reserve_lru(bo); + if (mem && new_reg->mem_type != TTM_PL_SYSTEM && mem->mem.page == nvbo->page) { list_for_each_entry(vma, &nvbo->vma_list, head) { @@ -1426,6 +1448,30 @@ nouveau_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp) filp->private_data); } +static void +nouveau_ttm_io_mem_free_locked(struct nouveau_drm *drm, struct ttm_mem_reg *reg) +{ + struct nouveau_mem *mem = nouveau_mem(reg); + + if (!reg->bus.base) + return; /* already freed */ + + if (drm->client.mem->oclass >= NVIF_CLASS_MEM_NV50) { + switch (reg->mem_type) { + case TTM_PL_TT: + if (mem->kind) + nvif_object_unmap_handle(&mem->mem.object); + break; + case TTM_PL_VRAM: + nvif_object_unmap_handle(&mem->mem.object); + break; + default: + break; + } + } + reg->bus.base = 0; +} + static int nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) { @@ -1433,18 +1479,26 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) struct nouveau_drm *drm = nouveau_bdev(bdev); struct nvkm_device *device = nvxx_device(&drm->client.device); struct nouveau_mem *mem = nouveau_mem(reg); + struct nouveau_bo *nvbo; + int ret; + + if (reg->bus.base) + return 0; /* already mapped */ reg->bus.addr = NULL; reg->bus.offset = 0; reg->bus.size = reg->num_pages << PAGE_SHIFT; - reg->bus.base = 0; reg->bus.is_iomem = false; if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) return -EINVAL; + + mutex_lock(&drm->ttm.io_reserve_mutex); +retry: switch (reg->mem_type) { case TTM_PL_SYSTEM: /* System memory */ - return 0; + ret = 0; + goto out; case TTM_PL_TT: #if IS_ENABLED(CONFIG_AGP) if (drm->agp.bridge) { @@ -1468,7 +1522,6 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) } args; u64 handle, length; u32 argc = 0; - int ret; switch (mem->mem.object.oclass) { case NVIF_CLASS_MEM_NV50: @@ -1492,38 +1545,45 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) ret = nvif_object_map_handle(&mem->mem.object, &args, argc, &handle, &length); - if (ret != 1) - return ret ? ret : -EINVAL; + if (ret != 1) { + ret = ret ? ret : -EINVAL; + goto out; + } + ret = 0; reg->bus.base = 0; reg->bus.offset = handle; } break; default: - return -EINVAL; + ret = -EINVAL; } - return 0; + +out: + if (ret == -EAGAIN) { + nvbo = list_first_entry_or_null(&drm->ttm.io_reserve_lru, + typeof(*nvbo), + io_reserve_lru); + if (nvbo) { + list_del_init(&nvbo->io_reserve_lru); + ttm_bo_unmap_virtual(&nvbo->bo); + nouveau_ttm_io_mem_free_locked(drm, &nvbo->bo.mem); + goto retry; + } + + } + mutex_unlock(&drm->ttm.io_reserve_mutex); + return ret; } static void nouveau_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) { struct nouveau_drm *drm = nouveau_bdev(bdev); - struct nouveau_mem *mem = nouveau_mem(reg); - if (drm->client.mem->oclass >= NVIF_CLASS_MEM_NV50) { - switch (reg->mem_type) { - case TTM_PL_TT: - if (mem->kind) - nvif_object_unmap_handle(&mem->mem.object); - break; - case TTM_PL_VRAM: - nvif_object_unmap_handle(&mem->mem.object); - break; - default: - break; - } - } + mutex_lock(&drm->ttm.io_reserve_mutex); + nouveau_ttm_io_mem_free_locked(drm, reg); + mutex_unlock(&drm->ttm.io_reserve_mutex); } static int diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.h b/drivers/gpu/drm/nouveau/nouveau_bo.h index 62930d834fba..b8a17bc19d7b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.h +++ b/drivers/gpu/drm/nouveau/nouveau_bo.h @@ -17,6 +17,7 @@ struct nouveau_bo { bool force_coherent; struct ttm_bo_kmap_obj kmap; struct list_head head; + struct list_head io_reserve_lru; /* protected by ttm_bo_reserve() */ struct drm_file *reserved_by; @@ -92,6 +93,8 @@ int nouveau_bo_validate(struct nouveau_bo *, bool interruptible, bool no_wait_gpu); void nouveau_bo_sync_for_device(struct nouveau_bo *nvbo); void nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo); +void nouveau_bo_add_io_reserve_lru(struct ttm_buffer_object *bo); +void nouveau_bo_del_io_reserve_lru(struct ttm_buffer_object *bo); /* TODO: submit equivalent to TTM generic API upstream? */ static inline void __iomem * diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 70f34cacc552..060e2ab1fd95 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -158,6 +158,8 @@ struct nouveau_drm { int type_vram; int type_host[2]; int type_ncoh[2]; + struct mutex io_reserve_mutex; + struct list_head io_reserve_lru; } ttm; /* GEM interface support */ diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index f0daf958e03a..7f8495066e8b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -162,13 +162,51 @@ const struct ttm_mem_type_manager_func nv04_gart_manager = { .debug = nouveau_manager_debug }; +static vm_fault_t nouveau_ttm_fault(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; + struct ttm_buffer_object *bo = vma->vm_private_data; + pgprot_t prot; + vm_fault_t ret; + + ret = ttm_bo_vm_reserve(bo, vmf); + if (ret) + return ret; + + nouveau_bo_del_io_reserve_lru(bo); + + prot = vm_get_page_prot(vma->vm_flags); + ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT); + if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) + return ret; + + nouveau_bo_add_io_reserve_lru(bo); + + dma_resv_unlock(bo->base.resv); + + return ret; +} + +static struct vm_operations_struct nouveau_ttm_vm_ops = { + .fault = nouveau_ttm_fault, + .open = ttm_bo_vm_open, + .close = ttm_bo_vm_close, + .access = ttm_bo_vm_access +}; + int nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma) { struct drm_file *file_priv = filp->private_data; struct nouveau_drm *drm = nouveau_drm(file_priv->minor->dev); + int ret; - return ttm_bo_mmap(filp, vma, &drm->ttm.bdev); + ret = ttm_bo_mmap(filp, vma, &drm->ttm.bdev); + if (ret) + return ret; + + vma->vm_ops = &nouveau_ttm_vm_ops; + return 0; } static int @@ -272,6 +310,9 @@ nouveau_ttm_init(struct nouveau_drm *drm) return ret; } + mutex_init(&drm->ttm.io_reserve_mutex); + INIT_LIST_HEAD(&drm->ttm.io_reserve_lru); + NV_INFO(drm, "VRAM: %d MiB\n", (u32)(drm->gem.vram_available >> 20)); NV_INFO(drm, "GART: %d MiB\n", (u32)(drm->gem.gart_available >> 20)); return 0; -- 2.14.1 [View Less]

2 4

[PATCH 0/8] drm/print: cleanup and new drm_device based logging
by Jani Nikula 10 Oct '19

10 Oct '19

For starters some fairly benign cleanup, and a proposal for new struct drm_device based drm logging macros analoguous to core kernel struct device based macros. BR, Jani. Jani Nikula (8): drm/i915: use drm_debug_enabled() to check for debug categories drm/nouveau: use drm_debug_enabled() to check for debug categories drm/amdgpu: use drm_debug_enabled() to check for debug categories drm/print: rename drm_debug to __drm_debug to discourage use drm/print: underscore prefix functions … [View More]

2 10

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel October 2019