dri-devel April 2020

dri-devel@lists.freedesktop.org

353 participants
944 discussions

[ANNOUNCE] libdrm 2.4.101
by Timo Aaltonen 03 Apr '20

03 Apr '20

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Alex Deucher (2): amdgpu: add new marketing names from 19.30 amdgpu: add new marketing names from 19.50 Chunming Zhou (2): sync up drm.h libdrm: wrap new flexible syncobj query interface v2 Daniel Stone (2): Add drmModeGetFB2 Add DRM_MODE_CONNECTOR_WRITEBACK to xf86drmMode.h Devarsh Thakkar (2): modetest: Add support for setting mode having floating vertical refresh rate modetest: Use floating … [View More]vrefresh while dumping mode Eric Engestrom (25): Revert "Revert "libdrm: remove autotools support"" gitlab-ci: pre-build containers to improve CI run time and reliability freedreno: drop leftover symbol from the export list meson: import Mesa's symbols check script amdgpu: convert to new symbols check etnaviv: convert to new symbols check exynos: convert to new symbols check freedreno: convert to new symbols check intel: convert to new symbols check libkms: convert to new symbols check nouveau: convert to new symbols check omap: convert to new symbols check radeon: convert to new symbols check tegra: convert to new symbols check meson: drop old symbols check environment gitlab-ci: drop arch build down to daily builds gitlab-ci: set up cross build infra gitlab-ci: add x86 (32 bits) build gitlab-ci: add aarch64 & armhf builds gitlab-ci: add PowerPC build gitlab-ci: rename build folder to simply `build` add a minimal .gitignore back meson: add symbols check for core libdrm meson: always define whether headers exist tests: drop redundant and slow `random` test Ezequiel Garcia (1): modetest: Fix segmentation fault Flora Cui (5): tests/amdgpu: update draw test for gfx9 tests/amdgpu: add dispatch hang test tests/amdgpu: add bad slow dispatch test tests/amdgpu: add gfx ring draw hang test tests/amdgpu: add gfx ring bad slow draw test Huang Rui (4): amdgpu: use alloca for dependencies and sem_dependencies amdgpu: use amdgpu_cs_submit_raw2 in amdgpu_cs_submit amdgpu: remove the un-used chunk_array amdgpu: clean up the cs structure variable Imre Deak (1): intel: drm_intel_bo_gem_create_from_* on platforms w/o HW tiling John Stultz (1): libdrm: modetest: Allow selecting modes by index José Roberto de Souza (1): intel: sync i915_pciids.h with kernel Juston Li (1): include/drm: sync up drm.h Lauren Post (1): Add ARM support into xf86drm.h Luben Tuikov (7): tests/amdgpu: Fix various warnings tests/amdgpu: Fix unused function warning (v2) tests/amdgpu: Fix buffer overflow (v3) tests/amdgpu: Proper format for "-l" tests/amdgpu: Fix various warnings (v2) tests/amdgpu: Fix unused function warning (v2) tests/amdgpu: Fix buffer overflow (v3) Marek Olšák (3): Revert "tests/amdgpu: Fix buffer overflow (v3)" Revert "tests/amdgpu: Fix unused function warning (v2)" Revert "tests/amdgpu: Fix various warnings" Michel Dänzer (1): tests: Only copy con->modes[0] if it exists Peter Seiderer (1): meson.build: fix intel atomics detection Pierre-Eric Pelloux-Prayer (2): gitlab-ci: update to current ci-templates master amdgpu: increase cpu_map_count storage size Ross Burton (1): tests/nouveau/threaded: adapt ioctl signature Scott Anderson (1): meson: Replace 'config.h' with config_file Simon Ser (1): Fix missing stdlib includes in xf86drmMode.h Swathi Dhanavanthri (1): intel: sync i915_pciids.h with kernel Thomas Petazzoni (1): xf86atomic: require CAS support in libatomic_ops Timo Aaltonen (1): Bump version to 2.4.101 Vasyl Vavrychuk (2): xf86drm: generalize the device subsystem type parsing code xf86drm: fix subsystem type lookup for virtio mmio-based devices Yifan Zhang (1): tests/amdgpu: fix a amdgpu_test hang issue on some platforms. changzhu (1): tests/amdgpu: enable dispatch/draw tests for Renoir xinxu(a)loongson.cn (1): tests/amdgpu/basic_tests.c: change BUFFER_SIZE used in Userptr Test adjust to PAGE_SIZE git tag: libdrm-2.4.101 https://dri.freedesktop.org/libdrm/libdrm-2.4.101.tar.xz SHA256: ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7 libdrm-2.4.101.tar.xz SHA512: 658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c libdrm-2.4.101.tar.xz PGP: https://dri.freedesktop.org/libdrm/libdrm-2.4.101.tar.xz.sig -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEdS3ifE3rFwGbS2Yjy3AxZaiJhNwFAl6HM9MACgkQy3AxZaiJ hNxYZw//YlJmyhT5L/pjESVOiFU7EB8eSE8diYsjmAqay3xqR8Xeizs5YAAwWLMy 35EKNwnamupSW7VRcGffI4RnQ8h2atANMHaeEqu18smV7FywGiQH9vnxTK7BCG4/ 77kWgotprJ0kJW6/Y6I+zx/1FSMieE3RRoVeSgHhz4XtcCPnAkGCDrIltZcF8kcm 9gbnhHd+JICOS8PYOEc2CRDFxKOt4AtSmSCrzWDiqVxCtrqeqWzpCP9OGRCc1a6d xxHmTwdeVctCXChxbKCbYD+PAUZrLZe+VeWE4UqM9uJEeufi/5tkIhkh8R2ZAE6+ fuHG2CBwHvZyrJ91VfiFmwM2UylKYhZQWpYYfriGDB8xBn5vuhueIByf9q3KxStF 1glhhO1/zGP5SQQGvc55xtyIpnrz8e6w5GdD2mXrgVTSL4Qhfi/53V4e/j5gOkjm ekQvFH8SdsVzy0gLUrtx1f6umqnWOWjOaMK7QiUbVJYZmr2BB6YdMjcQl9KJUFN/ OcUqrHjSK3LDUozongr60US6JKFHQYBURa82Wp0KHyfXmeFYS3XhnAMw2D8iWxmr 5WHmBS2xgCD7O8U4Ct0tP1sZLE3Z7Hxv5vsYx6CzgfpKFFrCmj2Bx7MRRUxkFFiM WMh0l8wXDwD8gJ/PqnITqK9HPZRjyD+4hROnqLvt18jqD4ydJb0= =g/sg -----END PGP SIGNATURE----- [View Less]

1 0

[PATCH 1/5] drm/virtio: random virtgpu_drv.h cleanups
by Gurchetan Singh 03 Apr '20

03 Apr '20

- Static-ify virtio_gpu_gem_create - Delete unused prototypes - Point to current implementation files Signed-off-by: Gurchetan Singh <gurchetansingh(a)chromium.org> Reviewed-by: Chia-I Wu <olvaffe(a)gmail.com> --- drivers/gpu/drm/virtio/virtgpu_drv.h | 26 +++++++++----------------- drivers/gpu/drm/virtio/virtgpu_gem.c | 10 +++++----- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index … [View More]824f9f15926cf..79ad176aca5a8 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -218,26 +218,18 @@ struct virtio_gpu_fpriv { struct mutex context_lock; }; -/* virtio_ioctl.c */ +/* virtgpu_ioctl.c */ #define DRM_VIRTIO_NUM_IOCTLS 10 extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS]; -/* virtio_kms.c */ +/* virtgpu_kms.c */ int virtio_gpu_init(struct drm_device *dev); void virtio_gpu_deinit(struct drm_device *dev); void virtio_gpu_release(struct drm_device *dev); int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file); void virtio_gpu_driver_postclose(struct drm_device *dev, struct drm_file *file); -/* virtio_gem.c */ -void virtio_gpu_gem_free_object(struct drm_gem_object *gem_obj); -int virtio_gpu_gem_init(struct virtio_gpu_device *vgdev); -void virtio_gpu_gem_fini(struct virtio_gpu_device *vgdev); -int virtio_gpu_gem_create(struct drm_file *file, - struct drm_device *dev, - struct virtio_gpu_object_params *params, - struct drm_gem_object **obj_p, - uint32_t *handle_p); +/* virtgpu_gem.c */ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, struct drm_file *file); void virtio_gpu_gem_object_close(struct drm_gem_object *obj, @@ -263,7 +255,7 @@ void virtio_gpu_array_put_free_delayed(struct virtio_gpu_device *vgdev, struct virtio_gpu_object_array *objs); void virtio_gpu_array_put_free_work(struct work_struct *work); -/* virtio vg */ +/* virtgpu_vq.c */ int virtio_gpu_alloc_vbufs(struct virtio_gpu_device *vgdev); void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev); void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev, @@ -343,17 +335,17 @@ void virtio_gpu_dequeue_fence_func(struct work_struct *work); void virtio_gpu_notify(struct virtio_gpu_device *vgdev); -/* virtio_gpu_display.c */ +/* virtgpu_display.c */ void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); -/* virtio_gpu_plane.c */ +/* virtgpu_plane.c */ uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc); struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev, enum drm_plane_type type, int index); -/* virtio_gpu_fence.c */ +/* virtgpu_fence.c */ struct virtio_gpu_fence *virtio_gpu_fence_alloc( struct virtio_gpu_device *vgdev); void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, @@ -362,7 +354,7 @@ void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev, u64 last_seq); -/* virtio_gpu_object */ +/* virtgpu_object.c */ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo); struct drm_gem_object *virtio_gpu_create_object(struct drm_device *dev, size_t size); @@ -378,7 +370,7 @@ struct drm_gem_object *virtgpu_gem_prime_import_sg_table( struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt); -/* virgl debugfs */ +/* virtgpu_debugfs.c */ void virtio_gpu_debugfs_init(struct drm_minor *minor); #endif diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 0d6152c99a271..90c0a8ea1708c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -28,11 +28,11 @@ #include "virtgpu_drv.h" -int virtio_gpu_gem_create(struct drm_file *file, - struct drm_device *dev, - struct virtio_gpu_object_params *params, - struct drm_gem_object **obj_p, - uint32_t *handle_p) +static int virtio_gpu_gem_create(struct drm_file *file, + struct drm_device *dev, + struct virtio_gpu_object_params *params, + struct drm_gem_object **obj_p, + uint32_t *handle_p) { struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_object *obj; -- 2.24.1 [View Less]

2 5

[PATCH v4.19.y, v4.14.y, v4.9.y] drm/etnaviv: Backport fix for mmu flushing
by Robert Beckett 03 Apr '20

03 Apr '20

commit 4900dda90af2cb13bc1d4c12ce94b98acc8fe64e upstream Due to async need_flush updating via other buffer mapping, checking gpu->need_flush in 3 places within etnaviv_buffer_queue can cause GPU hangs. This occurs due to need_flush being false for the first 2 checks in that function, so that the extra dword does not get accounted for, but by the time we come to check for the third time, gpu->mmu->need_flish is true, which outputs the flush instruction. This causes the prefetch during … [View More]the final link to be off by 1. This causes GPU hangs. It causes the ring to contain patterns like this: 0x40000005, /* LINK (8) PREFETCH=0x5,OP=LINK */ 0x70040010, /* ADDRESS *0x70040010 */ 0x40000002, /* LINK (8) PREFETCH=0x2,OP=LINK */ 0x70040000, /* ADDRESS *0x70040000 */ 0x08010e04, /* LOAD_STATE (1) Base: 0x03810 Size: 1 Fixp: 0 */ 0x0000001f, /* GL.FLUSH_MMU := FLUSH_FEMMU=1,FLUSH_UNK1=1,FLUSH_UNK2=1,FLUSH_PEMMU=1,FLUSH_UNK4=1 */ 0x08010e03, /* LOAD_STATE (1) Base: 0x0380C Size: 1 Fixp: 0 */ 0x00000000, /* GL.FLUSH_CACHE := DEPTH=0,COLOR=0,TEXTURE=0,PE2D=0,TEXTUREVS=0,SHADER_L1=0,SHADER_L2=0,UNK10=0,UNK11=0,DESCRIPTOR_UNK12=0,DESCRIPTOR_UNK13=0 */ 0x08010e02, /* LOAD_STATE (1) Base: 0x03808 Size: 1 Fixp: 0 */ 0x00000701, /* GL.SEMAPHORE_TOKEN := FROM=FE,TO=PE,UNK28=0x0 */ 0x48000000, /* STALL (9) OP=STALL */ 0x00000701, /* TOKEN FROM=FE,TO=PE,UNK28=0x0 */ 0x08010e00, /* LOAD_STATE (1) Base: 0x03800 Size: 1 Fixp: 0 */ 0x00000000, /* GL.PIPE_SELECT := PIPE=PIPE_3D */ 0x40000035, /* LINK (8) PREFETCH=0x35,OP=LINK */ 0x70041000, /* ADDRESS *0x70041000 */ Here we see a link with prefetch of 5 dwords starting with the 3rd instruction. It only loads the 5 dwords up and including the final LOAD_STATE. It needs to include the final LINK instruction. This was seen on imx6q, and the fix is confirmed to stop the GPU hangs. The commit referenced inadvertently fixed this issue by checking gpu->mmu->need_flush once at the start of the function. Given that this commit is independant, and useful for all version, it seems sensible to backport it to the stable branches. [View Less]

3 5

[PATCH v4 0/3] drm: LogiCVC display controller support
by Paul Kocialkowski 03 Apr '20

03 Apr '20

This series introduces support for the LogiCVC display controller. The controller is a bit unusual since it is usually loaded as programmable logic on Xilinx FPGAs or Zynq-7000 SoCs. More details are presented on the main commit for the driver. More information about the controller is available on the dedicated web page: https://www.logicbricks.com/Products/logiCVC-ML.aspx Changes since v3: - Rebased on latest drm-misc; - Improved event lock wrapping; - Added collect tag; - Added color-key … [View More]support patch (not for merge, for reference only). Changes since v2: - Fixed and slightly improved dt schema. Changes since v1: - Switched dt bindings documentation to dt schema; - Described more possible dt parameters; - Added support for the lvds-3bit interface; - Added support for grabbing syscon regmap from parent node; - Removed layers count property and count layers child nodes instead. Cheers! Paul Kocialkowski (3): dt-bindings: display: Document the Xylon LogiCVC display controller drm: Add support for the LogiCVC display controller WIP: drm/logicvc: Add plane colorkey support .../display/xylon,logicvc-display.yaml | 313 ++++++++ drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/logicvc/Kconfig | 8 + drivers/gpu/drm/logicvc/Makefile | 4 + drivers/gpu/drm/logicvc/logicvc_crtc.c | 271 +++++++ drivers/gpu/drm/logicvc/logicvc_crtc.h | 25 + drivers/gpu/drm/logicvc/logicvc_drm.c | 467 +++++++++++ drivers/gpu/drm/logicvc/logicvc_drm.h | 63 ++ drivers/gpu/drm/logicvc/logicvc_interface.c | 235 ++++++ drivers/gpu/drm/logicvc/logicvc_interface.h | 32 + drivers/gpu/drm/logicvc/logicvc_layer.c | 733 ++++++++++++++++++ drivers/gpu/drm/logicvc/logicvc_layer.h | 72 ++ drivers/gpu/drm/logicvc/logicvc_mode.c | 103 +++ drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + drivers/gpu/drm/logicvc/logicvc_of.c | 205 +++++ drivers/gpu/drm/logicvc/logicvc_of.h | 28 + drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ 18 files changed, 2665 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/xylon,logicvc-display.yaml create mode 100644 drivers/gpu/drm/logicvc/Kconfig create mode 100644 drivers/gpu/drm/logicvc/Makefile create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h -- 2.24.0 [View Less]

3 6

Re: INFO: trying to register non-static key in try_to_wake_up
by Dmitry Vyukov 03 Apr '20

03 Apr '20

On Tue, Mar 31, 2020 at 11:57 AM Peter Zijlstra <peterz(a)infradead.org> wrote: > > On Mon, Mar 30, 2020 at 10:01:12PM -0700, syzbot wrote: > > Hello, > > > > syzbot found the following crash on: > > > > HEAD commit: 9420e8ad Merge tag 'for-linus' of git://git.kernel.org/pub.. > > git tree: upstream > > console output: https://syzkaller.appspot.com/x/log.txt?x=1206ed4be00000 > > kernel config: https://syzkaller.appspot.com/x/… [View More].config?x=27392dd2975fd692 > > dashboard link: https://syzkaller.appspot.com/bug?extid=e84d7ebd1361da13c356 > > compiler: gcc (GCC) 9.0.0 20181231 (experimental) > > > > Unfortunately, I don't have any reproducer for this crash yet. > > > > IMPORTANT: if you fix the bug, please add the following tag to the commit: > > Reported-by: syzbot+e84d7ebd1361da13c356(a)syzkaller.appspotmail.com > > > > INFO: trying to register non-static key. > > the code is fine but needs lockdep annotation. > > turning off the locking correctness validator. > > CPU: 1 PID: 1014 Comm: syz-executor.0 Not tainted 5.6.0-rc7-syzkaller #0 > > Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 > > Call Trace: > > <IRQ> > > __dump_stack lib/dump_stack.c:77 [inline] > > dump_stack+0x188/0x20d lib/dump_stack.c:118 > > assign_lock_key kernel/locking/lockdep.c:880 [inline] > > register_lock_class+0x14c4/0x1540 kernel/locking/lockdep.c:1189 > > __lock_acquire+0xfc/0x3ca0 kernel/locking/lockdep.c:3836 > > lock_acquire+0x197/0x420 kernel/locking/lockdep.c:4484 > > __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] > > _raw_spin_lock_irqsave+0x8c/0xbf kernel/locking/spinlock.c:159 > > try_to_wake_up+0x9f/0x17c0 kernel/sched/core.c:2547 > > That's p->pi_lock, which gets initialized in rt_mutex_init_task() in > copy_process(). This should be impossible. Very odd. The stack mentions fbdev, which is a red flag at the moment. There are a dozen of bad bugs in fbdev and around. Just few days ago Andy pointed to another "impossible" crash "general protection fault in do_syscall_64" which is related to dri: https://syzkaller.appspot.com/bug?id=0ec7b2602b1ff40f0d34f38baa4ba1640727c3… https://groups.google.com/forum/#!msg/syzkaller-bugs/ePqhfYx0-8M/Q_Urt97iAA… There are probably more random manifestations of these bugs already, and I guess we will be getting more. +fbdev maintainers > > wake_up_worker kernel/workqueue.c:836 [inline] > > insert_work+0x2ad/0x3a0 kernel/workqueue.c:1337 > > __queue_work+0x50d/0x1280 kernel/workqueue.c:1488 > > call_timer_fn+0x195/0x760 kernel/time/timer.c:1404 > > expire_timers kernel/time/timer.c:1444 [inline] > > __run_timers kernel/time/timer.c:1773 [inline] > > __run_timers kernel/time/timer.c:1740 [inline] > > run_timer_softirq+0x412/0x1600 kernel/time/timer.c:1786 > > __do_softirq+0x26c/0x99d kernel/softirq.c:292 > > invoke_softirq kernel/softirq.c:373 [inline] > > irq_exit+0x192/0x1d0 kernel/softirq.c:413 > > exiting_irq arch/x86/include/asm/apic.h:546 [inline] > > smp_apic_timer_interrupt+0x19e/0x600 arch/x86/kernel/apic/apic.c:1146 > > apic_timer_interrupt+0xf/0x20 arch/x86/entry/entry_64.S:829 > > </IRQ> > > -- > You received this message because you are subscribed to the Google Groups "syzkaller-bugs" group. > To unsubscribe from this group and stop receiving emails from it, send an email to syzkaller-bugs+unsubscribe(a)googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/syzkaller-bugs/20200331095737.GO20730%40h…. [View Less]

3 7

[PATCH 1/6] dma-buf: add peer2peer flag
by Christian König 03 Apr '20

03 Apr '20

Add a peer2peer flag noting that the importer can deal with device resources which are not backed by pages. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/dma-buf/dma-buf.c | 2 ++ include/linux/dma-buf.h | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index ccc9eda1bc28..570c923023e6 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -690,6 +690,8 @@ … [View More]

4 10

[PATCH] drm/hisilicon: Add the load and unload for hibmc_driver
by Tian Tao 03 Apr '20

03 Apr '20

using the load and unload function provided by drm framework instead of doing the same work in the hibmc_pci_probe and do some code cleanup. Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com> Signed-off-by: Gong junjie <gongjunjie2(a)huawei.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 62 +++++++++---------------- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 + 2 files changed, 24 insertions(+), 40 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/… [View More]hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index 79a180a..51f1c70 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -23,7 +23,7 @@ #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> - +#include <drm/drm_pci.h> #include "hibmc_drm_drv.h" #include "hibmc_drm_regs.h" @@ -49,6 +49,8 @@ static irqreturn_t hibmc_drm_interrupt(int irq, void *arg) static struct drm_driver hibmc_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, + .load = hibmc_load, + .unload = hibmc_unload, .fops = &hibmc_fops, .name = "hibmc", .date = "20160828", @@ -232,6 +234,21 @@ static int hibmc_hw_map(struct hibmc_drm_private *priv) return 0; } +static void hibmc_hw_unmap(struct hibmc_drm_private *priv) +{ + struct drm_device *dev = priv->dev; + + if (priv->mmio) { + devm_iounmap(dev->dev, priv->mmio); + priv->mmio = NULL; + } + + if (priv->fb_map) { + devm_iounmap(dev->dev, priv->fb_map); + priv->fb_map = NULL; + } +} + static int hibmc_hw_init(struct hibmc_drm_private *priv) { int ret; @@ -245,7 +262,7 @@ static int hibmc_hw_init(struct hibmc_drm_private *priv) return 0; } -static int hibmc_unload(struct drm_device *dev) +void hibmc_unload(struct drm_device *dev) { struct hibmc_drm_private *priv = dev->dev_private; @@ -258,11 +275,12 @@ static int hibmc_unload(struct drm_device *dev) hibmc_kms_fini(priv); hibmc_mm_fini(priv); + hibmc_hw_unmap(priv); dev->dev_private = NULL; return 0; } -static int hibmc_load(struct drm_device *dev) +int hibmc_load(struct drm_device *dev, unsigned long flags) { struct hibmc_drm_private *priv; int ret; @@ -332,43 +350,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev, if (ret) return ret; - dev = drm_dev_alloc(&hibmc_driver, &pdev->dev); - if (IS_ERR(dev)) { - DRM_ERROR("failed to allocate drm_device\n"); - return PTR_ERR(dev); - } - - dev->pdev = pdev; - pci_set_drvdata(pdev, dev); - - ret = pci_enable_device(pdev); - if (ret) { - DRM_ERROR("failed to enable pci device: %d\n", ret); - goto err_free; - } - - ret = hibmc_load(dev); - if (ret) { - DRM_ERROR("failed to load hibmc: %d\n", ret); - goto err_disable; - } - - ret = drm_dev_register(dev, 0); - if (ret) { - DRM_ERROR("failed to register drv for userspace access: %d\n", - ret); - goto err_unload; - } - return 0; - -err_unload: - hibmc_unload(dev); -err_disable: - pci_disable_device(pdev); -err_free: - drm_dev_put(dev); - - return ret; + return drm_get_pci_dev(pdev, ent, &hibmc_driver); } static void hibmc_pci_remove(struct pci_dev *pdev) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 50a0c1f..4e89cd7 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -37,6 +37,8 @@ void hibmc_set_power_mode(struct hibmc_drm_private *priv, void hibmc_set_current_gate(struct hibmc_drm_private *priv, unsigned int gate); +int hibmc_load(struct drm_device *dev, unsigned long flags); +void hibmc_unload(struct drm_device *dev); int hibmc_de_init(struct hibmc_drm_private *priv); int hibmc_vdac_init(struct hibmc_drm_private *priv); -- 2.7.4 [View Less]

5 14

[PATCH v2] staging: android: ion: Align with parenthesis
by John B. Wyatt IV 03 Apr '20

03 Apr '20

Align two different lines of arguments with the parenthesis of their respected function definitions. Fix style warnings of matching alignment. Reported by checkpatch. Signed-off-by: John B. Wyatt IV <jbwyatt4(a)gmail.com> --- v2: Change comment title and summary Suggested-by: Julia Lawall <julia.lawall(a)inria.fr> drivers/staging/android/ion/ion_page_pool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/ion/ion_page_pool.c b/… [View More]

1 0

linux-next: manual merge of the akpm-current tree with the drm tree
by Stephen Rothwell 03 Apr '20

03 Apr '20

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/memory.c between commit: 327e9fd48972 ("mm: Split huge pages on write-notify or COW") from the drm tree and commit: de0b1f32cbeb ("userfaultfd: wp: hook userfault handler to write protection fault") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your … [View More]upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc mm/memory.c index efa59b1b109c,9e75440c79ce..000000000000 --- a/mm/memory.c +++ b/mm/memory.c @@@ -3949,42 -3969,29 +3969,40 @@@ static inline vm_fault_t create_huge_pm /* `inline' is required to avoid gcc 4.1.2 build error */ static inline vm_fault_t wp_huge_pmd(struct vm_fault *vmf, pmd_t orig_pmd) { - if (vma_is_anonymous(vmf->vma)) + if (vma_is_anonymous(vmf->vma)) { + if (userfaultfd_huge_pmd_wp(vmf->vma, orig_pmd)) + return handle_userfault(vmf, VM_UFFD_WP); return do_huge_pmd_wp_page(vmf, orig_pmd); + } - if (vmf->vma->vm_ops->huge_fault) - return vmf->vma->vm_ops->huge_fault(vmf, PE_SIZE_PMD); + if (vmf->vma->vm_ops->huge_fault) { + vm_fault_t ret = vmf->vma->vm_ops->huge_fault(vmf, PE_SIZE_PMD); + + if (!(ret & VM_FAULT_FALLBACK)) + return ret; + } - /* COW handled on pte level: split pmd */ - VM_BUG_ON_VMA(vmf->vma->vm_flags & VM_SHARED, vmf->vma); + /* COW or write-notify handled on pte level: split pmd. */ __split_huge_pmd(vmf->vma, vmf->pmd, vmf->address, false, NULL); return VM_FAULT_FALLBACK; } - static inline bool vma_is_accessible(struct vm_area_struct *vma) - { - return vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE); - } - static vm_fault_t create_huge_pud(struct vm_fault *vmf) { -#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && \ + defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD) /* No support for anonymous transparent PUD pages yet */ if (vma_is_anonymous(vmf->vma)) - return VM_FAULT_FALLBACK; - if (vmf->vma->vm_ops->huge_fault) - return vmf->vma->vm_ops->huge_fault(vmf, PE_SIZE_PUD); + goto split; + if (vmf->vma->vm_ops->huge_fault) { + vm_fault_t ret = vmf->vma->vm_ops->huge_fault(vmf, PE_SIZE_PUD); + + if (!(ret & VM_FAULT_FALLBACK)) + return ret; + } +split: + /* COW or write-notify not handled on PUD level: split pud.*/ + __split_huge_pud(vmf->vma, vmf->pud, vmf->address); #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ return VM_FAULT_FALLBACK; } [View Less]

1 0

linux-next: manual merge of the akpm-current tree with the drm tree
by Stephen Rothwell 03 Apr '20

03 Apr '20

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/huge_mm.h between commit: 9a9731b18c9b ("mm: Add vmf_insert_pfn_xxx_prot() for huge page-table entries") from the drm tree and commit: 7b6b88969e9d ("mm: merge parameters for change_protection()") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to … [View More]your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/linux/huge_mm.h index f63b0882c1b3,e60c923e68c4..000000000000 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@@ -46,46 -46,9 +46,46 @@@ extern bool move_huge_pmd(struct vm_are pmd_t *old_pmd, pmd_t *new_pmd); extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, pgprot_t newprot, - int prot_numa); + unsigned long cp_flags); -vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write); -vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write); +vm_fault_t vmf_insert_pfn_pmd_prot(struct vm_fault *vmf, pfn_t pfn, + pgprot_t pgprot, bool write); + +/** + * vmf_insert_pfn_pmd - insert a pmd size pfn + * @vmf: Structure describing the fault + * @pfn: pfn to insert + * @pgprot: page protection to use + * @write: whether it's a write fault + * + * Insert a pmd size pfn. See vmf_insert_pfn() for additional info. + * + * Return: vm_fault_t value. + */ +static inline vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, + bool write) +{ + return vmf_insert_pfn_pmd_prot(vmf, pfn, vmf->vma->vm_page_prot, write); +} +vm_fault_t vmf_insert_pfn_pud_prot(struct vm_fault *vmf, pfn_t pfn, + pgprot_t pgprot, bool write); + +/** + * vmf_insert_pfn_pud - insert a pud size pfn + * @vmf: Structure describing the fault + * @pfn: pfn to insert + * @pgprot: page protection to use + * @write: whether it's a write fault + * + * Insert a pud size pfn. See vmf_insert_pfn() for additional info. + * + * Return: vm_fault_t value. + */ +static inline vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, + bool write) +{ + return vmf_insert_pfn_pud_prot(vmf, pfn, vmf->vma->vm_page_prot, write); +} + enum transparent_hugepage_flag { TRANSPARENT_HUGEPAGE_FLAG, TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG, [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2020