dri-devel July 2018

dri-devel@lists.freedesktop.org

277 participants
1883 discussions

[PATCH] drm/vmwgfx: Fix vmw_du_cursor_plane_atomic_check
by Thomas Hellstrom 04 Sep '18

04 Sep '18

Use the correct helper and also return early on helper success rather than on helper failure. Also explicitly return 0 in the case of no fb. Signed-off-by: Thomas Hellstrom <thellstrom(a)vmware.com> Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Reported-by: Daniel Vetter <daniel(a)ffwll.ch> --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 3628a9fe705f..0f7dc9ea2657 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -494,23 +494,23 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane, struct drm_plane_state *new_state) { int ret = 0; + struct drm_crtc_state *crtc_state = NULL; struct vmw_surface *surface = NULL; struct drm_framebuffer *fb = new_state->fb; - struct drm_rect src = drm_plane_state_src(new_state); - struct drm_rect dest = drm_plane_state_dest(new_state); - /* Turning off */ if (!fb) - return ret; + return 0; - ret = drm_plane_helper_check_update(plane, new_state->crtc, fb, - &src, &dest, - DRM_MODE_ROTATE_0, - DRM_PLANE_HELPER_NO_SCALING, - DRM_PLANE_HELPER_NO_SCALING, - true, true, &new_state->visible); - if (!ret) + if (new_state->crtc) + crtc_state = drm_atomic_get_new_crtc_state(new_state->state, + new_state->crtc); + + ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, + DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_HELPER_NO_SCALING, + true, true); + if (ret) return ret; /* A lot of the code assumes this */ -- 2.14.3

3 3

[git pull] drm udl fixes
by Dave Airlie 04 Sep '18

04 Sep '18

Pull request to myself just so it's logged and linked in right place, but this is a set of Mikulas's udl kms patches I've looked over and am happy with. Dave. The following changes since commit acb1872577b346bd15ab3a3f8dff780d6cca4b70: Linux 4.18-rc7 (2018-07-29 14:44:52 -0700) are available in the Git repository at: git://people.freedesktop.org/~airlied/linux drm-udl-next for you to fetch changes up to 90991209837ab619555a46a97a88dead7a960d2d: udl-kms: dont spam the syslog with debug messages (2018-07-31 08:11:12 +1000) ---------------------------------------------------------------- Mikulas Patocka (7): udl-kms: change down_interruptible to down udl-kms: handle allocation failure udl-kms: fix crash due to uninitialized memory udl-kms: avoid division udl-kms: avoid prefetch udl-kms: use spin_lock_irq instead of spin_lock_irqsave udl-kms: dont spam the syslog with debug messages drivers/gpu/drm/udl/udl_drv.h | 2 +- drivers/gpu/drm/udl/udl_fb.c | 23 ++++++++++--------- drivers/gpu/drm/udl/udl_main.c | 45 +++++++++++++++++++------------------ drivers/gpu/drm/udl/udl_modeset.c | 7 +++--- drivers/gpu/drm/udl/udl_transfer.c | 46 +++++++++++++++++--------------------- 5 files changed, 60 insertions(+), 63 deletions(-)

4 9

[Bug 105379] The Witcher: Enhanced Edition under Wine fails to launch
by bugzilla-daemon＠freedesktop.org 03 Sep '18

03 Sep '18

https://bugs.freedesktop.org/show_bug.cgi?id=105379 Bug ID: 105379 Summary: The Witcher: Enhanced Edition under Wine fails to launch Product: Mesa Version: git Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: asheldon55(a)gmail.com QA Contact: dri-devel(a)lists.freedesktop.org Created attachment 137850 --> https://bugs.freedesktop.org/attachment.cgi?id=137850&action=edit Wine log with Mesa git The Witcher run under Wine fails to launch. Essentially, it hangs indefinitely before any video output but the game can be closed with Ctrl-C, and no ill effects are seen otherwise. Reverting commit b650fc09c3a35ca624aad5fe4b5c34867708f116 in Mesa works around the issue. The game also works fine with a Nvidia 980ti and 390.25 binary drivers. Hardware: Radeon RX 550 Software: 4.15.6 kernel [DC=0], Mesa git, Wine 3.3 Commit message: commit b650fc09c3a35ca624aad5fe4b5c34867708f116 Author: Nicolai Hähnle <nicolai.haehnle(a)amd.com> Date: Sun Oct 22 17:38:42 2017 +0200 radeonsi: fix potential use-after-free of debug callbacks Found by inspection. Reviewed-by: Marek Olšák <marek.olsak(a)amd.com> -- You are receiving this mail because: You are the assignee for the bug.

1 7

[Bug 107153] 4.18-rc3 crash on hdmi (0010:dm_update_crtcs_state+0x41e/0x4a0)
by bugzilla-daemon＠freedesktop.org 01 Sep '18

01 Sep '18

https://bugs.freedesktop.org/show_bug.cgi?id=107153 Bug ID: 107153 Summary: 4.18-rc3 crash on hdmi (0010:dm_update_crtcs_state+0x41e/0x4a0) Product: DRI Version: unspecified Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: blocker Priority: medium Component: DRM/AMDgpu Assignee: dri-devel(a)lists.freedesktop.org Reporter: patrik.kullman(a)gmail.com Just installed Ubuntu 18.04 on my Hades Canyon Intel NUC with Vega M graphics. To get it to work I have installed the latest BIOS (44), a 4.18-rc3 kernel from http://kernel.ubuntu.com/~kernel-ppa/mainline/v4.18-rc3/, the Vega M firmware from https://people.freedesktop.org/~agd5f/radeon_ucode/vegam/ and mesa 18.1 from https://launchpad.net/~ubuntu-x-swat/+archive/ubuntu/updates?field.series_f…. Now, when booting it with HDMI connected to an Onkyo TX-NR555 receiver through HDMI, it hangs on boot. If I disconnect the HDMI while booting and reconnect it after boot, I get the following crash: [ 268.434749] [drm] fb mappable at 0x2000A28000 [ 268.434750] [drm] vram apper at 0x2000000000 [ 268.434750] [drm] size 35389440 [ 268.434751] [drm] fb depth is 24 [ 268.434751] [drm] pitch is 16384 [ 268.434811] fbcon: amdgpudrmfb (fb0) is primary device [ 268.643348] Console: switching to colour frame buffer device 512x135 [ 268.659459] amdgpu 0000:01:00.0: fb0: amdgpudrmfb frame buffer device [ 268.676523] ------------[ cut here ]------------ [ 268.676523] kernel BUG at /home/kernel/COD/linux/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4784! [ 268.676527] invalid opcode: 0000 [#1] SMP PTI [ 268.676528] CPU: 6 PID: 898 Comm: Xorg Tainted: G W 4.18.0-041800rc3-generic #201807012030 [ 268.676529] Hardware name: Intel Corporation NUC8i7HVK/NUC8i7HVB, BIOS HNKBLi70.86A.0044.2018.0615.1726 06/15/2018 [ 268.676567] RIP: 0010:dm_update_crtcs_state+0x41e/0x4a0 [amdgpu] [ 268.676567] Code: e9 8f fd ff ff 8b 45 c0 48 8d 65 d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 48 83 bb 08 0d 00 00 00 0f 85 08 ff ff ff e9 fc fe ff ff <0f> 0b b8 ea ff ff ff e9 ca fc ff ff 41 8b 4e 60 48 c7 c2 30 eb 57 [ 268.676579] RSP: 0018:ffffb43642be7a18 EFLAGS: 00010246 [ 268.676580] RAX: ffff9014665e0001 RBX: 0000000000000000 RCX: 00000000000010b8 [ 268.676581] RDX: 00000000000010b7 RSI: ffff90147eda7160 RDI: ffff90146e002f00 [ 268.676581] RBP: ffffb43642be7a78 R08: 0000000000027160 R09: ffffffffc0534386 [ 268.676582] R10: fffffc7211997800 R11: 00000000f0000080 R12: ffff901464f30f80 [ 268.676582] R13: 0000000000000000 R14: ffff901460322800 R15: ffff9014665e0c00 [ 268.676583] FS: 00007fde55c2c600(0000) GS:ffff90147ed80000(0000) knlGS:0000000000000000 [ 268.676583] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 268.676584] CR2: 0000555b891b2670 CR3: 000000046307c005 CR4: 00000000003606e0 [ 268.676584] Call Trace: [ 268.676612] amdgpu_dm_atomic_check+0x18e/0x3d0 [amdgpu] [ 268.676614] ? radix_tree_lookup+0xd/0x10 [ 268.676626] drm_atomic_check_only+0x33b/0x510 [drm] [ 268.676631] drm_atomic_commit+0x18/0x50 [drm] [ 268.676637] drm_atomic_helper_set_config+0x7c/0x90 [drm_kms_helper] [ 268.676642] __drm_mode_set_config_internal+0x6b/0x120 [drm] [ 268.676647] drm_mode_setcrtc+0x4b0/0x6a0 [drm] [ 268.676652] ? drm_mode_getcrtc+0x1a0/0x1a0 [drm] [ 268.676656] drm_ioctl_kernel+0xa4/0xf0 [drm] [ 268.676660] drm_ioctl+0x37b/0x440 [drm] [ 268.676664] ? drm_mode_getcrtc+0x1a0/0x1a0 [drm] [ 268.676680] amdgpu_drm_ioctl+0x4f/0x90 [amdgpu] [ 268.676682] do_vfs_ioctl+0xa8/0x630 [ 268.676683] ? recalc_sigpending+0x1b/0x50 [ 268.676685] ? _copy_from_user+0x3e/0x60 [ 268.676686] ksys_ioctl+0x75/0x80 [ 268.676687] __x64_sys_ioctl+0x1a/0x20 [ 268.676688] do_syscall_64+0x5a/0x120 [ 268.676690] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 268.676690] RIP: 0033:0x7fde530215d7 [ 268.676691] Code: b3 66 90 48 8b 05 b1 48 2d 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 81 48 2d 00 f7 d8 64 89 01 48 [ 268.676703] RSP: 002b:00007ffff62d35d8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 268.676704] RAX: ffffffffffffffda RBX: 00007ffff62d3610 RCX: 00007fde530215d7 [ 268.676704] RDX: 00007ffff62d3610 RSI: 00000000c06864a2 RDI: 000000000000000c [ 268.676705] RBP: 00007ffff62d3610 R08: 0000000000000000 R09: 0000555b891a3690 [ 268.676705] R10: 00007ffff62d36d0 R11: 0000000000000246 R12: 00000000c06864a2 [ 268.676706] R13: 000000000000000c R14: 0000000000000000 R15: 0000555b891a3690 [ 268.676706] Modules linked in: ccm thunderbolt rfcomm cmac bnep arc4 nls_iso8859_1 8250_dw intel_rapl x86_pkg_temp_thermal intel_powerclamp snd_hda_codec_realtek snd_hda_codec_generic coretemp snd_hda_codec_hdmi kvm_intel snd_hda_intel kvm snd_hda_codec irqbypass snd_hda_core morus1280_avx2 morus1280_sse2 morus1280_glue snd_hwdep morus640_sse2 morus640_glue snd_pcm iwlmvm aegis256_aesni aegis128l_aesni mac80211 aegis128_aesni crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc snd_seq_midi snd_seq_midi_event snd_rawmidi aesni_intel aes_x86_64 snd_seq crypto_simd cryptd glue_helper iwlwifi intel_cstate intel_rapl_perf idma64 btusb virt_dma snd_seq_device btrtl snd_timer btbcm btintel bluetooth snd ir_rc6_decoder wmi_bmof intel_wmi_thunderbolt mei_me input_leds cfg80211 serio_raw intel_lpss_pci [ 268.676724] ecdh_generic tps6598x mei intel_lpss intel_pch_thermal soundcore typec rc_rc6_mce ite_cir rc_core acpi_pad mac_hid sch_fq_codel parport_pc ppdev lp parport ip_tables x_tables hid_generic usbhid hid amdkfd amd_iommu_v2 amdgpu chash gpu_sched ttm drm_kms_helper syscopyarea psmouse sysfillrect sysimgblt fb_sys_fops igb e1000e drm sdhci_pci dca cqhci i2c_algo_bit sdhci wmi pinctrl_sunrisepoint video pinctrl_intel [ 268.676737] ---[ end trace e2c9200fd11b91c9 ]--- [ 268.676763] RIP: 0010:dm_update_crtcs_state+0x41e/0x4a0 [amdgpu] [ 268.676763] Code: e9 8f fd ff ff 8b 45 c0 48 8d 65 d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 48 83 bb 08 0d 00 00 00 0f 85 08 ff ff ff e9 fc fe ff ff <0f> 0b b8 ea ff ff ff e9 ca fc ff ff 41 8b 4e 60 48 c7 c2 30 eb 57 [ 268.676777] RSP: 0018:ffffb43642be7a18 EFLAGS: 00010246 [ 268.676778] RAX: ffff9014665e0001 RBX: 0000000000000000 RCX: 00000000000010b8 [ 268.676778] RDX: 00000000000010b7 RSI: ffff90147eda7160 RDI: ffff90146e002f00 [ 268.676779] RBP: ffffb43642be7a78 R08: 0000000000027160 R09: ffffffffc0534386 [ 268.676779] R10: fffffc7211997800 R11: 00000000f0000080 R12: ffff901464f30f80 [ 268.676780] R13: 0000000000000000 R14: ffff901460322800 R15: ffff9014665e0c00 [ 268.676780] FS: 00007fde55c2c600(0000) GS:ffff90147ed80000(0000) knlGS:0000000000000000 [ 268.676781] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 268.676781] CR2: 0000555b891b2670 CR3: 000000046307c005 CR4: 00000000003606e0 I assume that this is what happens and hangs it when the cable is connected on boot as well. -- You are receiving this mail because: You are the assignee for the bug.

1 27

[Bug 100995] System hang using OpenGL 4+ features
by bugzilla-daemon＠freedesktop.org 31 Aug '18

31 Aug '18

https://bugs.freedesktop.org/show_bug.cgi?id=100995 Bug ID: 100995 Summary: System hang using OpenGL 4+ features Product: Mesa Version: 17.0 Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: Paul.Hancock.17041993(a)live.com QA Contact: dri-devel(a)lists.freedesktop.org This is easily reproducible via unigine's heaven benchmark, simply running it with normal tessellation settings results in the screen flashing black a few times and then an eventual system hang before anything even starts to render. A power cycle is the only way out. Simply creating a 4.5 context will not trigger the bug, haven't been able to fully test what causes the hang specifically as accessible tools I've found are not compatible with mesa due to only creating a default context (which is currently 3.0), thus crashing on init. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1689408 -- You are receiving this mail because: You are the assignee for the bug.

1 9

[Bug 99857] Radeon R7 M260/M265 *ERROR* amdgpu asic reset failed - Suspending notebook freezes it
by bugzilla-daemon＠freedesktop.org 31 Aug '18

31 Aug '18

https://bugs.freedesktop.org/show_bug.cgi?id=99857 Bug ID: 99857 Summary: Radeon R7 M260/M265 *ERROR* amdgpu asic reset failed - Suspending notebook freezes it Product: DRI Version: XOrg git Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: DRM/AMDgpu Assignee: dri-devel(a)lists.freedesktop.org Reporter: edersondisouza(a)hotmail.com Created attachment 129735 --> https://bugs.freedesktop.org/attachment.cgi?id=129735&action=edit dmesg Hi, I have a Dell Inspiron with a Radeon R7 M260/M265 [Topaz XT] - as reported by lspci, and I'm having problems after suspending it - by closing the lid and opening it again - notebook freezes, so I need to reboot it. Noticed some AMDGPU related errors on dmesg, which made me suspect of this driver. And in fact, blacklisting it prevented freeze after suspending. Attached is `dmesg`. Please let me know if there's something else I can do to help. Thanks for any help, -- You are receiving this mail because: You are the assignee for the bug.

1 12

[Bug 98981] [IVB] igt/gem_exec_suspend/basic-s3 hangs when used with intel-ci/fast-feedback.testlist
by bugzilla-daemon＠freedesktop.org 31 Aug '18

31 Aug '18

https://bugs.freedesktop.org/show_bug.cgi?id=98981 Bug ID: 98981 Summary: [IVB] igt/gem_exec_suspend/basic-s3 hangs when used with intel-ci/fast-feedback.testlist Product: DRI Version: unspecified Hardware: Other OS: All Status: NEW Severity: normal Priority: medium Component: IGT Assignee: dri-devel(a)lists.freedesktop.org Reporter: dorota.czaplejewicz(a)collabora.co.uk The test igt/gem_exec_suspend/basic-s3 does not wake up from suspend when invoked as part of the testlis tintel-ci/fast-feedback.testlist Manual wake up is needed, afterwards test reports pass. I am in the process of finding the minimal test case. So far, the smallest test set that triggers this: sudo IGT_TEST_ROOT=`pwd`/intel-gpu-tools/tests ./piglit/piglit run igt -o results -l verbose -s --test-list intel-gpu-tools/tests/intel-ci/fast-feedback.testlist -t gem_exec While specifying tests separately, the hangup does not occur: Log of the complete run with a manual wakeup: Time 0:04:10.425812 Stdout IGT-Version: 1.17-g901c2bb (x86_64) (Linux: 4.9.0-rc7-CI-CI_DRM_1849+ x86_64) rtcwake: wakeup from "mem" using /dev/rtc0 at Sat Dec 3 11:19:08 2016 Subtest basic-S3: SUCCESS (18.487s) System: Fedora 24, i7-3770, ASRock H77 Pro4/MVP -- You are receiving this mail because: You are the assignee for the bug.

1 9

[PATCH v6] Add udmabuf misc device
by Gerd Hoffmann 31 Aug '18

31 Aug '18

A driver to let userspace turn memfd regions into dma-bufs. Use case: Allows qemu create dmabufs for the vga framebuffer or virtio-gpu ressources. Then they can be passed around to display those guest things on the host. To spice client for classic full framebuffer display, and hopefully some day to wayland server for seamless guest window display. qemu test branch: https://git.kraxel.org/cgit/qemu/log/?h=sirius/udmabuf Cc: David Airlie <airlied(a)linux.ie> Cc: Tomeu Vizoso <tomeu.vizoso(a)collabora.com> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Daniel Vetter <daniel(a)ffwll.ch> Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- Documentation/ioctl/ioctl-number.txt | 1 + include/uapi/linux/udmabuf.h | 33 +++ drivers/dma-buf/udmabuf.c | 287 ++++++++++++++++++++++ tools/testing/selftests/drivers/dma-buf/udmabuf.c | 96 ++++++++ MAINTAINERS | 8 + drivers/dma-buf/Kconfig | 8 + drivers/dma-buf/Makefile | 1 + tools/testing/selftests/drivers/dma-buf/Makefile | 5 + 8 files changed, 439 insertions(+) create mode 100644 include/uapi/linux/udmabuf.h create mode 100644 drivers/dma-buf/udmabuf.c create mode 100644 tools/testing/selftests/drivers/dma-buf/udmabuf.c create mode 100644 tools/testing/selftests/drivers/dma-buf/Makefile diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 480c8609dc..6636dea476 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -271,6 +271,7 @@ Code Seq#(hex) Include File Comments 't' 90-91 linux/toshiba.h toshiba and toshiba_acpi SMM 'u' 00-1F linux/smb_fs.h gone 'u' 20-3F linux/uvcvideo.h USB video class host driver +'u' 40-4f linux/udmabuf.h userspace dma-buf misc device 'v' 00-1F linux/ext2_fs.h conflict! 'v' 00-1F linux/fs.h conflict! 'v' 00-0F linux/sonypi.h conflict! diff --git a/include/uapi/linux/udmabuf.h b/include/uapi/linux/udmabuf.h new file mode 100644 index 0000000000..46b6532ed8 --- /dev/null +++ b/include/uapi/linux/udmabuf.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI_LINUX_UDMABUF_H +#define _UAPI_LINUX_UDMABUF_H + +#include <linux/types.h> +#include <linux/ioctl.h> + +#define UDMABUF_FLAGS_CLOEXEC 0x01 + +struct udmabuf_create { + __u32 memfd; + __u32 flags; + __u64 offset; + __u64 size; +}; + +struct udmabuf_create_item { + __u32 memfd; + __u32 __pad; + __u64 offset; + __u64 size; +}; + +struct udmabuf_create_list { + __u32 flags; + __u32 count; + struct udmabuf_create_item list[]; +}; + +#define UDMABUF_CREATE _IOW('u', 0x42, struct udmabuf_create) +#define UDMABUF_CREATE_LIST _IOW('u', 0x43, struct udmabuf_create_list) + +#endif /* _UAPI_LINUX_UDMABUF_H */ diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c new file mode 100644 index 0000000000..8e24204526 --- /dev/null +++ b/drivers/dma-buf/udmabuf.c @@ -0,0 +1,287 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/init.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/miscdevice.h> +#include <linux/dma-buf.h> +#include <linux/highmem.h> +#include <linux/cred.h> +#include <linux/shmem_fs.h> +#include <linux/memfd.h> + +#include <uapi/linux/udmabuf.h> + +struct udmabuf { + u32 pagecount; + struct page **pages; +}; + +static int udmabuf_vm_fault(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; + struct udmabuf *ubuf = vma->vm_private_data; + + if (WARN_ON(vmf->pgoff >= ubuf->pagecount)) + return VM_FAULT_SIGBUS; + + vmf->page = ubuf->pages[vmf->pgoff]; + get_page(vmf->page); + return 0; +} + +static const struct vm_operations_struct udmabuf_vm_ops = { + .fault = udmabuf_vm_fault, +}; + +static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma) +{ + struct udmabuf *ubuf = buf->priv; + + if ((vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) == 0) + return -EINVAL; + + vma->vm_ops = &udmabuf_vm_ops; + vma->vm_private_data = ubuf; + return 0; +} + +static struct sg_table *map_udmabuf(struct dma_buf_attachment *at, + enum dma_data_direction direction) +{ + struct udmabuf *ubuf = at->dmabuf->priv; + struct sg_table *sg; + + sg = kzalloc(sizeof(*sg), GFP_KERNEL); + if (!sg) + goto err1; + if (sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount, + 0, ubuf->pagecount << PAGE_SHIFT, + GFP_KERNEL) < 0) + goto err2; + if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) + goto err3; + + return sg; + +err3: + sg_free_table(sg); +err2: + kfree(sg); +err1: + return ERR_PTR(-ENOMEM); +} + +static void unmap_udmabuf(struct dma_buf_attachment *at, + struct sg_table *sg, + enum dma_data_direction direction) +{ + sg_free_table(sg); + kfree(sg); +} + +static void release_udmabuf(struct dma_buf *buf) +{ + struct udmabuf *ubuf = buf->priv; + pgoff_t pg; + + for (pg = 0; pg < ubuf->pagecount; pg++) + put_page(ubuf->pages[pg]); + kfree(ubuf->pages); + kfree(ubuf); +} + +static void *kmap_udmabuf(struct dma_buf *buf, unsigned long page_num) +{ + struct udmabuf *ubuf = buf->priv; + struct page *page = ubuf->pages[page_num]; + + return kmap(page); +} + +static void kunmap_udmabuf(struct dma_buf *buf, unsigned long page_num, + void *vaddr) +{ + kunmap(vaddr); +} + +static struct dma_buf_ops udmabuf_ops = { + .map_dma_buf = map_udmabuf, + .unmap_dma_buf = unmap_udmabuf, + .release = release_udmabuf, + .map = kmap_udmabuf, + .unmap = kunmap_udmabuf, + .mmap = mmap_udmabuf, +}; + +#define SEALS_WANTED (F_SEAL_SHRINK) +#define SEALS_DENIED (F_SEAL_WRITE) + +static long udmabuf_create(struct udmabuf_create_list *head, + struct udmabuf_create_item *list) +{ + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + struct file *memfd = NULL; + struct udmabuf *ubuf; + struct dma_buf *buf; + pgoff_t pgoff, pgcnt, pgidx, pgbuf; + struct page *page; + int seals, ret = -EINVAL; + u32 i, flags; + + ubuf = kzalloc(sizeof(struct udmabuf), GFP_KERNEL); + if (!ubuf) + return -ENOMEM; + + for (i = 0; i < head->count; i++) { + if (!IS_ALIGNED(list[i].offset, PAGE_SIZE)) + goto err_free_ubuf; + if (!IS_ALIGNED(list[i].size, PAGE_SIZE)) + goto err_free_ubuf; + ubuf->pagecount += list[i].size >> PAGE_SHIFT; + } + ubuf->pages = kmalloc_array(ubuf->pagecount, sizeof(struct page *), + GFP_KERNEL); + if (!ubuf->pages) { + ret = -ENOMEM; + goto err_free_ubuf; + } + + pgbuf = 0; + for (i = 0; i < head->count; i++) { + memfd = fget(list[i].memfd); + if (!memfd) + goto err_put_pages; + if (!shmem_mapping(file_inode(memfd)->i_mapping)) + goto err_put_pages; + seals = memfd_fcntl(memfd, F_GET_SEALS, 0); + if (seals == -EINVAL || + (seals & SEALS_WANTED) != SEALS_WANTED || + (seals & SEALS_DENIED) != 0) + goto err_put_pages; + pgoff = list[i].offset >> PAGE_SHIFT; + pgcnt = list[i].size >> PAGE_SHIFT; + for (pgidx = 0; pgidx < pgcnt; pgidx++) { + page = shmem_read_mapping_page( + file_inode(memfd)->i_mapping, pgoff + pgidx); + if (IS_ERR(page)) { + ret = PTR_ERR(page); + goto err_put_pages; + } + ubuf->pages[pgbuf++] = page; + } + fput(memfd); + } + memfd = NULL; + + exp_info.ops = &udmabuf_ops; + exp_info.size = ubuf->pagecount << PAGE_SHIFT; + exp_info.priv = ubuf; + + buf = dma_buf_export(&exp_info); + if (IS_ERR(buf)) { + ret = PTR_ERR(buf); + goto err_put_pages; + } + + flags = 0; + if (head->flags & UDMABUF_FLAGS_CLOEXEC) + flags |= O_CLOEXEC; + return dma_buf_fd(buf, flags); + +err_put_pages: + while (pgbuf > 0) + put_page(ubuf->pages[--pgbuf]); +err_free_ubuf: + fput(memfd); + kfree(ubuf->pages); + kfree(ubuf); + return ret; +} + +static long udmabuf_ioctl_create(struct file *filp, unsigned long arg) +{ + struct udmabuf_create create; + struct udmabuf_create_list head; + struct udmabuf_create_item list; + + if (copy_from_user(&create, (void __user *)arg, + sizeof(struct udmabuf_create))) + return -EFAULT; + + head.flags = create.flags; + head.count = 1; + list.memfd = create.memfd; + list.offset = create.offset; + list.size = create.size; + + return udmabuf_create(&head, &list); +} + +static long udmabuf_ioctl_create_list(struct file *filp, unsigned long arg) +{ + struct udmabuf_create_list head; + struct udmabuf_create_item *list; + int ret = -EINVAL; + u32 lsize; + + if (copy_from_user(&head, (void __user *)arg, sizeof(head))) + return -EFAULT; + if (head.count > 1024) + return -EINVAL; + lsize = sizeof(struct udmabuf_create_item) * head.count; + list = memdup_user((void __user *)(arg + sizeof(head)), lsize); + if (IS_ERR(list)) + return PTR_ERR(list); + + ret = udmabuf_create(&head, list); + kfree(list); + return ret; +} + +static long udmabuf_ioctl(struct file *filp, unsigned int ioctl, + unsigned long arg) +{ + long ret; + + switch (ioctl) { + case UDMABUF_CREATE: + ret = udmabuf_ioctl_create(filp, arg); + break; + case UDMABUF_CREATE_LIST: + ret = udmabuf_ioctl_create_list(filp, arg); + break; + default: + ret = -EINVAL; + break; + } + return ret; +} + +static const struct file_operations udmabuf_fops = { + .owner = THIS_MODULE, + .unlocked_ioctl = udmabuf_ioctl, +}; + +static struct miscdevice udmabuf_misc = { + .minor = MISC_DYNAMIC_MINOR, + .name = "udmabuf", + .fops = &udmabuf_fops, +}; + +static int __init udmabuf_dev_init(void) +{ + return misc_register(&udmabuf_misc); +} + +static void __exit udmabuf_dev_exit(void) +{ + misc_deregister(&udmabuf_misc); +} + +module_init(udmabuf_dev_init) +module_exit(udmabuf_dev_exit) + +MODULE_AUTHOR("Gerd Hoffmann <kraxel(a)redhat.com>"); +MODULE_LICENSE("GPL v2"); diff --git a/tools/testing/selftests/drivers/dma-buf/udmabuf.c b/tools/testing/selftests/drivers/dma-buf/udmabuf.c new file mode 100644 index 0000000000..376b1d6730 --- /dev/null +++ b/tools/testing/selftests/drivers/dma-buf/udmabuf.c @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <malloc.h> + +#include <sys/ioctl.h> +#include <sys/syscall.h> +#include <linux/memfd.h> +#include <linux/udmabuf.h> + +#define TEST_PREFIX "drivers/dma-buf/udmabuf" +#define NUM_PAGES 4 + +static int memfd_create(const char *name, unsigned int flags) +{ + return syscall(__NR_memfd_create, name, flags); +} + +int main(int argc, char *argv[]) +{ + struct udmabuf_create create; + int devfd, memfd, buf, ret; + off_t size; + void *mem; + + devfd = open("/dev/udmabuf", O_RDWR); + if (devfd < 0) { + printf("%s: [skip,no-udmabuf]\n", TEST_PREFIX); + exit(77); + } + + memfd = memfd_create("udmabuf-test", MFD_CLOEXEC); + if (memfd < 0) { + printf("%s: [skip,no-memfd]\n", TEST_PREFIX); + exit(77); + } + + size = getpagesize() * NUM_PAGES; + ret = ftruncate(memfd, size); + if (ret == -1) { + printf("%s: [FAIL,memfd-truncate]\n", TEST_PREFIX); + exit(1); + } + + memset(&create, 0, sizeof(create)); + + /* should fail (offset not page aligned) */ + create.memfd = memfd; + create.offset = getpagesize()/2; + create.size = getpagesize(); + buf = ioctl(devfd, UDMABUF_CREATE, &create); + if (buf >= 0) { + printf("%s: [FAIL,test-1]\n", TEST_PREFIX); + exit(1); + } + + /* should fail (size not multiple of page) */ + create.memfd = memfd; + create.offset = 0; + create.size = getpagesize()/2; + buf = ioctl(devfd, UDMABUF_CREATE, &create); + if (buf >= 0) { + printf("%s: [FAIL,test-2]\n", TEST_PREFIX); + exit(1); + } + + /* should fail (not memfd) */ + create.memfd = 0; /* stdin */ + create.offset = 0; + create.size = size; + buf = ioctl(devfd, UDMABUF_CREATE, &create); + if (buf >= 0) { + printf("%s: [FAIL,test-3]\n", TEST_PREFIX); + exit(1); + } + + /* should work */ + create.memfd = memfd; + create.offset = 0; + create.size = size; + buf = ioctl(devfd, UDMABUF_CREATE, &create); + if (buf < 0) { + printf("%s: [FAIL,test-4]\n", TEST_PREFIX); + exit(1); + } + + fprintf(stderr, "%s: ok\n", TEST_PREFIX); + close(buf); + close(memfd); + close(devfd); + return 0; +} diff --git a/MAINTAINERS b/MAINTAINERS index 07d1576fc7..a8e1bb3bc3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14638,6 +14638,14 @@ S: Maintained F: Documentation/filesystems/udf.txt F: fs/udf/ +UDMABUF DRIVER +M: Gerd Hoffmann <kraxel(a)redhat.com> +L: dri-devel(a)lists.freedesktop.org +S: Maintained +F: drivers/dma-buf/udmabuf.c +F: include/uapi/linux/udmabuf.h +F: tools/testing/selftests/drivers/dma-buf/udmabuf.c + UDRAW TABLET M: Bastien Nocera <hadess(a)hadess.net> L: linux-input(a)vger.kernel.org diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig index ed3b785bae..338129eb12 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -30,4 +30,12 @@ config SW_SYNC WARNING: improper use of this can result in deadlocking kernel drivers from userspace. Intended for test and debug only. +config UDMABUF + bool "userspace dmabuf misc driver" + default n + depends on DMA_SHARED_BUFFER + help + A driver to let userspace turn memfd regions into dma-bufs. + Qemu can use this to create host dmabufs for guest framebuffers. + endmenu diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile index c33bf88631..0913a6ccab 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -1,3 +1,4 @@ obj-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o obj-$(CONFIG_SYNC_FILE) += sync_file.o obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o +obj-$(CONFIG_UDMABUF) += udmabuf.o diff --git a/tools/testing/selftests/drivers/dma-buf/Makefile b/tools/testing/selftests/drivers/dma-buf/Makefile new file mode 100644 index 0000000000..4154c3d7aa --- /dev/null +++ b/tools/testing/selftests/drivers/dma-buf/Makefile @@ -0,0 +1,5 @@ +CFLAGS += -I../../../../../usr/include/ + +TEST_GEN_PROGS := udmabuf + +include ../../lib.mk -- 2.9.3

4 11

[Bug 97003] [d3dadapter+radeonsi] Dragon's Dogma: video memory leak with precompiled shaders
by bugzilla-daemon＠freedesktop.org 31 Aug '18

31 Aug '18

https://bugs.freedesktop.org/show_bug.cgi?id=97003 Bug ID: 97003 Summary: [d3dadapter+radeonsi] Dragon's Dogma: video memory leak with precompiled shaders Product: Mesa Version: git Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: kudahkukarek(a)gmail.com QA Contact: dri-devel(a)lists.freedesktop.org Steps to reproduce: 1. Launch the game 2. Find a new location entrance (e.g. Cassardis gate) 3. Go back and forth between locations a few times, the game will eventually crash with "ERR08 : Memory overrun." (http://i.imgur.com/oPfFvq9.png) Workaround: R600_DEBUG=mono fixes this glxinfo: Extended renderer info (GLX_MESA_query_renderer): Vendor: X.Org (0x1002) Device: AMD PITCAIRN (DRM 2.43.0 / 4.4.0-28-lowlatency, LLVM 3.9.0) (0x6818) Version: 12.1.0 Accelerated: yes Video memory: 2048MB Unified memory: no Preferred profile: core (0x1) Max core profile version: 4.2 Max compat profile version: 3.0 Max GLES1 profile version: 1.1 Max GLES[23] profile version: 3.0 -- You are receiving this mail because: You are the assignee for the bug.

1 9

[Bug 68085] New: Xorg crash in do_winsys_init
by bugzilla-daemon＠freedesktop.org 31 Aug '18

31 Aug '18

https://bugs.freedesktop.org/show_bug.cgi?id=68085 Priority: medium Bug ID: 68085 Assignee: dri-devel(a)lists.freedesktop.org Summary: Xorg crash in do_winsys_init Severity: normal Classification: Unclassified OS: All Reporter: luto(a)mit.edu Hardware: Other Status: NEW Version: git Component: Drivers/DRI/Radeon Product: Mesa Created attachment 84033 --> https://bugs.freedesktop.org/attachment.cgi?id=84033&action=edit Relevant bits of dmesg My box has mgag200 primary and radeon (HD7750) secondary. Xorg crashes on startup in do_winsys_init, which is passed fd = -1. The crash is because drmGetVersion returns NULL. 'rmmod radeon' allows X to start (but without the radeon device). This is Fedora 19, fully up to date. The install disk has the same problem. I'm not sure where fd is supposed to be set to something real, so this bug might be targeting the wrong thing. (gdb) bt full [10/139] #0 do_winsys_init (ws=0x2ff7f20) at radeon_drm_winsys.c:212 gem_info = {gart_size = 0, vram_size = 0, vram_visible = 0} retval = <optimized out> version = <optimized out> #1 radeon_drm_winsys_create (fd=-1) at radeon_drm_winsys.c:617 ws = 0x2ff7f20 #2 0x00007fc2dd8fd359 in create_screen (fd=<optimized out>) at target.c:11 radeon = <optimized out> screen = <optimized out> #3 0x00007fc2ddbc5c32 in dri2_init_screen (sPriv=0x2ff7e00) at dri2.c:888 configs = <optimized out> screen = 0x2ff7e90 pscreen = <optimized out> throttle_ret = 0x0 #4 0x00007fc2dae2e2dd in driCreateNewScreen (scrn=0, extensions=0x7fc2df941b50 <loader_extensions>, driver_configs=0x2f76700, data=0x2f76660) at ../../../../src/mesa/drivers/dri/common/drisw_util.c:70 emptyExtensionList = {0x0} psp = 0x2ff7e00 #5 0x00007fc2df713b91 in __glXDRIscreenProbe (pScreen=0x2f473b0) at glxdriswrast.c:458 driverName = 0x7fc2df72e2a6 "swrast" screen = 0x2f76660 #6 0x00007fc2df71315a in GlxExtensionInit () at glxext.c:355 glxScreen = <optimized out> extEntry = <optimized out> pScreen = 0x2f473b0 i = 0 p = 0x7fc2df941b20 <__glXDRISWRastProvider> stack = <optimized out> glx_provided = 0 #7 0x00000000004ba1a1 in InitExtensions (argc=argc@entry=1, argv=argv@entry=0x7fff9f7860a8) at ../../../mi/miinitext.c:337 i = <optimized out> ext = <optimized out> #8 0x00000000004262e0 in main (argc=1, argv=0x7fff9f7860a8, envp=<optimized out>) at main.c:208 i = <optimized out> alwaysCheckForInput = {0, 1} -- You are receiving this mail because: You are the assignee for the bug.

1 6

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2018