dri-devel July 2020

dri-devel@lists.freedesktop.org

336 participants
772 discussions

[PATCH AUTOSEL 5.4 14/18] drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout
by Sasha Levin 14 Jul '20

14 Jul '20

From: Ben Skeggs <bskeggs(a)redhat.com> [ Upstream commit 0156e76d388310a490aeb0f2fbb5b284ded3aecc ] Tegra TRM says worst-case reply time is 1216us, and this should fix some spurious timeouts that have been popping up. Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 ++-- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c index c8ab1b5741a3e..db7769cb33eba 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c @@ -118,10 +118,10 @@ g94_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, if (retries) udelay(400); - /* transaction request, wait up to 1ms for it to complete */ + /* transaction request, wait up to 2ms for it to complete */ nvkm_wr32(device, 0x00e4e4 + base, 0x00010000 | ctrl); - timeout = 1000; + timeout = 2000; do { ctrl = nvkm_rd32(device, 0x00e4e4 + base); udelay(1); diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c index 7ef60895f43a7..edb6148cbca04 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c @@ -118,10 +118,10 @@ gm200_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, if (retries) udelay(400); - /* transaction request, wait up to 1ms for it to complete */ + /* transaction request, wait up to 2ms for it to complete */ nvkm_wr32(device, 0x00d954 + base, 0x00010000 | ctrl); - timeout = 1000; + timeout = 2000; do { ctrl = nvkm_rd32(device, 0x00d954 + base); udelay(1); -- 2.25.1

1 0

[PATCH AUTOSEL 5.7 15/19] drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout
by Sasha Levin 14 Jul '20

14 Jul '20

1 0

[PATCH 0/1] Upstreaming the KFD IPC API
by Felix Kuehling 14 Jul '20

14 Jul '20

This API is used by MPI/UCX for efficiently sharing VRAM between MPI ranks on the same node. It has been part of the ROCm DKMS branch for a long time. This code is refactored to be less invasive for upstreaming. As a result struct kfd_bo and the associated interval tree is not needed upstream. The introduction of this API upstream bumps the KFD API version to 1.4. The corresponding Thunk change that goes with the proposed upstreaming of this API can be found here: https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/commit/682922bd40… Felix Kuehling (1): drm/amdkfd: Add IPC API drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 56 +++- drivers/gpu/drm/amd/amdkfd/Makefile | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 74 ++--- drivers/gpu/drm/amd/amdkfd/kfd_ipc.c | 263 ++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_ipc.h | 55 ++++ drivers/gpu/drm/amd/amdkfd/kfd_module.c | 5 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 + include/uapi/linux/kfd_ioctl.h | 62 ++++- 9 files changed, 488 insertions(+), 40 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_ipc.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_ipc.h -- 2.27.0

7 11

[PATCH] drm/msm: use kthread_create_worker instead of kthread_run
by Bernard Zhao 14 Jul '20

14 Jul '20

Use kthread_create_worker to simplify the code and optimise the manager struct: msm_drm_thread. With this change, we could remove struct element (struct task_struct *thread & struct kthread_worker worker), instead, use one point (struct kthread_worker *worker). Signed-off-by: Bernard Zhao <bernard(a)vivo.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 18 ++++++------------ drivers/gpu/drm/msm/msm_drv.h | 3 +-- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index e15b42a780e0..c959c959021d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -396,7 +396,7 @@ static void dpu_crtc_frame_event_cb(void *data, u32 event) fevent->event = event; fevent->crtc = crtc; fevent->ts = ktime_get(); - kthread_queue_work(&priv->event_thread[crtc_id].worker, &fevent->work); + kthread_queue_work(priv->event_thread[crtc_id].worker, &fevent->work); } void dpu_crtc_complete_commit(struct drm_crtc *crtc) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index f6ce40bf3699..82e79b82a594 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -238,10 +238,8 @@ static int msm_drm_uninit(struct device *dev) /* clean up event worker threads */ for (i = 0; i < priv->num_crtcs; i++) { - if (priv->event_thread[i].thread) { - kthread_destroy_worker(&priv->event_thread[i].worker); - priv->event_thread[i].thread = NULL; - } + if (priv->event_thread[i].worker) + kthread_destroy_worker(priv->event_thread[i].worker); } msm_gem_shrinker_cleanup(ddev); @@ -504,19 +502,15 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) for (i = 0; i < priv->num_crtcs; i++) { /* initialize event thread */ priv->event_thread[i].crtc_id = priv->crtcs[i]->base.id; - kthread_init_worker(&priv->event_thread[i].worker); priv->event_thread[i].dev = ddev; - priv->event_thread[i].thread = - kthread_run(kthread_worker_fn, - &priv->event_thread[i].worker, - "crtc_event:%d", priv->event_thread[i].crtc_id); - if (IS_ERR(priv->event_thread[i].thread)) { + priv->event_thread[i].worker = kthread_create_worker(0, + "crtc_event:%d", priv->event_thread[i].crtc_id); + if (IS_ERR(priv->event_thread[i].worker)) { DRM_DEV_ERROR(dev, "failed to create crtc_event kthread\n"); - priv->event_thread[i].thread = NULL; goto err_msm_uninit; } - ret = sched_setscheduler(priv->event_thread[i].thread, + ret = sched_setscheduler(priv->event_thread[i].worker->task, SCHED_FIFO, &param); if (ret) dev_warn(dev, "event_thread set priority failed:%d\n", diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index e2d6a6056418..daf2f4e5548c 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -129,9 +129,8 @@ struct msm_display_info { /* Commit/Event thread specific structure */ struct msm_drm_thread { struct drm_device *dev; - struct task_struct *thread; unsigned int crtc_id; - struct kthread_worker worker; + struct kthread_worker *worker; }; struct msm_drm_private { -- 2.17.1

1 0

[PATCH 0/7] drm/mgag200: Inline prepare/commit helpers
by Thomas Zimmermann 14 Jul '20

14 Jul '20

Mgag200's modesetting still utilizes the prepare and commit functions that were part of the non-atomic interface. This patchset integrates them into the simple-display's enable function. Patch 1 disables CRTC write protection once when initializing the registers. Before, CRTC registers were temporarily write-protected for no apparent reason. The screen is toggled on and off multiple times while setting a mode. Patch 3 removes any intermediate screen on/off changes. In patch 4, DPMS functionality is reduced to on an off. The DPMS helper function implemements on, off, suspend and standby. In atomic modesetting, only on and off is required. Tested on G200SE HW with Xorg, Weston and fbdev. Thomas Zimmermann (7): drm/mgag200: Don't write-protect CRTC 0-7 while in mga_crtc_prepare() drm/mgag200: Move PLL setup out of mode-setting function drm/mgag200: Don't set or clear <scroff> field during modeset drm/mgag200: Split DPMS function into helpers drm/mgag200: Set/clear <syncrst> field in display enable/disable helpers drm/mgag200: Rename G200WB prepare/commit function drm/mgag200: Inline mga_crtc_{prepare,commit}() into enable function drivers/gpu/drm/mgag200/mgag200_drv.h | 6 + drivers/gpu/drm/mgag200/mgag200_mode.c | 168 +++++++++---------------- drivers/gpu/drm/mgag200/mgag200_reg.h | 11 ++ 3 files changed, 76 insertions(+), 109 deletions(-) -- 2.27.0

2 9

KASAN: use-after-free Read in drm_gem_object_release
by butt3rflyh4ck 14 Jul '20

14 Jul '20

I report a bug (in linux-5.8.0-rc4) found by syzkaller. kernel config: https://github.com/butterflyhack/syzkaller-fuzz/blob/master/v5.8.0-rc4.conf… I test the reproducer and crash too. In the drm_em_vram_t() function, ttm_bo_init() function call ttm_bo_init_reserved(), the ttm_bo_init_reserved() function call ttm_bo_put(), it will free gbo->bo that is struct ttm_buffer_object. then, goto the err_drm_gem_object_release lable, drm_gem_object_release() function will free gbo->bo.base, so cause use after free. crash log: ================================================================== BUG: KASAN: use-after-free in drm_gem_object_release+0xf7/0x120 drivers/gpu/drm/drm_gem.c:953 Read of size 8 at addr ffff888064dfd928 by task syz-executor.2/1320 CPU: 1 PID: 1320 Comm: syz-executor.2 Not tainted 5.8.0-rc4+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x18f/0x20d lib/dump_stack.c:118 print_address_description.constprop.0.cold+0xae/0x436 mm/kasan/report.c:383 __kasan_report mm/kasan/report.c:513 [inline] kasan_report.cold+0x1f/0x37 mm/kasan/report.c:530 drm_gem_object_release+0xf7/0x120 drivers/gpu/drm/drm_gem.c:953 drm_gem_vram_init drivers/gpu/drm/drm_gem_vram_helper.c:211 [inline] drm_gem_vram_create+0x3e6/0x5e0 drivers/gpu/drm/drm_gem_vram_helper.c:244 drm_gem_vram_fill_create_dumb+0x17a/0x310 drivers/gpu/drm/drm_gem_vram_helper.c:615 drm_gem_vram_driver_dumb_create+0x51/0xb0 drivers/gpu/drm/drm_gem_vram_helper.c:710 drm_mode_create_dumb+0x27c/0x300 drivers/gpu/drm/drm_dumb_buffers.c:94 drm_ioctl_kernel+0x220/0x2e0 drivers/gpu/drm/drm_ioctl.c:787 drm_ioctl+0x4d2/0x96f drivers/gpu/drm/drm_ioctl.c:887 vfs_ioctl fs/ioctl.c:48 [inline] ksys_ioctl+0x11a/0x180 fs/ioctl.c:753 __do_sys_ioctl fs/ioctl.c:762 [inline] __se_sys_ioctl fs/ioctl.c:760 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:760 do_syscall_64+0x60/0xe0 arch/x86/entry/common.c:384 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x467a29 Code: Bad RIP value. RSP: 002b:00007f98f2d40c48 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 000000000076bf00 RCX: 0000000000467a29 RDX: 0000000020000040 RSI: 00000000c02064b2 RDI: 0000000000000003 RBP: 000000000070c600 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f98f2d416bc R13: 0000000000000297 R14: 0000000000702040 R15: 00000000004d2418 Allocated by task 1320: save_stack+0x1b/0x40 mm/kasan/common.c:48 set_track mm/kasan/common.c:56 [inline] __kasan_kmalloc.constprop.0+0xc2/0xd0 mm/kasan/common.c:494 kmem_cache_alloc_trace+0x14f/0x2d0 mm/slab.c:3551 kmalloc include/linux/slab.h:555 [inline] kzalloc include/linux/slab.h:669 [inline] drm_gem_vram_create+0x425/0x5e0 drivers/gpu/drm/drm_gem_vram_helper.c:239 drm_gem_vram_fill_create_dumb+0x17a/0x310 drivers/gpu/drm/drm_gem_vram_helper.c:615 drm_gem_vram_driver_dumb_create+0x51/0xb0 drivers/gpu/drm/drm_gem_vram_helper.c:710 drm_mode_create_dumb+0x27c/0x300 drivers/gpu/drm/drm_dumb_buffers.c:94 drm_ioctl_kernel+0x220/0x2e0 drivers/gpu/drm/drm_ioctl.c:787 drm_ioctl+0x4d2/0x96f drivers/gpu/drm/drm_ioctl.c:887 vfs_ioctl fs/ioctl.c:48 [inline] ksys_ioctl+0x11a/0x180 fs/ioctl.c:753 __do_sys_ioctl fs/ioctl.c:762 [inline] __se_sys_ioctl fs/ioctl.c:760 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:760 do_syscall_64+0x60/0xe0 arch/x86/entry/common.c:384 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 1320: save_stack+0x1b/0x40 mm/kasan/common.c:48 set_track mm/kasan/common.c:56 [inline] kasan_set_free_info mm/kasan/common.c:316 [inline] __kasan_slab_free+0xf5/0x140 mm/kasan/common.c:455 __cache_free mm/slab.c:3426 [inline] kfree+0x103/0x2c0 mm/slab.c:3757 ttm_bo_release+0xae1/0x1350 drivers/gpu/drm/ttm/ttm_bo.c:632 kref_put include/linux/kref.h:65 [inline] ttm_bo_put drivers/gpu/drm/ttm/ttm_bo.c:638 [inline] ttm_bo_init_reserved+0xb04/0xd00 drivers/gpu/drm/ttm/ttm_bo.c:1339 ttm_bo_init+0x10e/0x330 drivers/gpu/drm/ttm/ttm_bo.c:1366 drm_gem_vram_init drivers/gpu/drm/drm_gem_vram_helper.c:202 [inline] drm_gem_vram_create+0x3c1/0x5e0 drivers/gpu/drm/drm_gem_vram_helper.c:244 drm_gem_vram_fill_create_dumb+0x17a/0x310 drivers/gpu/drm/drm_gem_vram_helper.c:615 drm_gem_vram_driver_dumb_create+0x51/0xb0 drivers/gpu/drm/drm_gem_vram_helper.c:710 drm_mode_create_dumb+0x27c/0x300 drivers/gpu/drm/drm_dumb_buffers.c:94 drm_ioctl_kernel+0x220/0x2e0 drivers/gpu/drm/drm_ioctl.c:787 drm_ioctl+0x4d2/0x96f drivers/gpu/drm/drm_ioctl.c:887 vfs_ioctl fs/ioctl.c:48 [inline] ksys_ioctl+0x11a/0x180 fs/ioctl.c:753 __do_sys_ioctl fs/ioctl.c:762 [inline] __se_sys_ioctl fs/ioctl.c:760 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:760 do_syscall_64+0x60/0xe0 arch/x86/entry/common.c:384 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The buggy address belongs to the object at ffff888064dfd800 which belongs to the cache kmalloc-1k of size 1024 The buggy address is located 296 bytes inside of 1024-byte region [ffff888064dfd800, ffff888064dfdc00) The buggy address belongs to the page: page:ffffea0001937f40 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 flags: 0xfffe0000000200(slab) raw: 00fffe0000000200 ffffea0000f3c248 ffffea0001ad7388 ffff88806bc00c40 raw: 0000000000000000 ffff888064dfd000 0000000100000002 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff888064dfd800: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888064dfd880: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff888064dfd900: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff888064dfd980: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888064dfda00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ================================================================== Regards, butt3rflyh4ck.

5 8

Re: [PATCH 4/6] staging: qlge: qlge_main: Simplify while statements.
by Suraj Upadhyay 14 Jul '20

14 Jul '20

On Mon, Jul 13, 2020 at 05:12:35PM +0300, Dan Carpenter wrote: > On Mon, Jul 13, 2020 at 05:50:14PM +0530, Suraj Upadhyay wrote: > > Simplify while loops into more readable and simple for loops. > > > > I don't think either is more clear that the other. Walter Harms hates > count down loops and he's not entirely wrong... > > regards, > dan carpenter Hi Dan, Thanks for your response. Should I send a v2 of this patch or not ?? Also do you have any problems with the other two patches doing the same thing in different files ?? I am all ears. Thanks, Suraj Upadhyay.

2 1

[PATCH v3] drm/bridge: adv7511: Fix cec clock EPROBE_DEFER handling
by Vincent Whitchurch 14 Jul '20

14 Jul '20

If adv7511's devm_clk_get() for the cec clock returns -EPROBE_DEFER, we end up in an infinite probe loop. This happens: (1) adv7511's probe is called. (2) adv7511's probe adds some secondary i2c devices which bind to the dummy driver and thus call driver_deferred_probe_trigger() and increment deferred_trigger_count (see driver_bound()). (3) adv7511's probe returns -EPROBE_DEFER, and since the deferred_trigger_count has changed during the probe call, driver_deferred_probe_trigger() is called immediately (see really_probe()) and adv7511's probe is scheduled. (4) Goto step 1. [ 61.972915] really_probe: bus: 'i2c': really_probe: probing driver adv7511 with device 0-0039 [ 61.992734] really_probe: bus: 'i2c': really_probe: probing driver dummy with device 0-003f [ 61.993343] driver_bound: driver: 'dummy': driver_bound: bound to device '0-003f' [ 61.993626] really_probe: bus: 'i2c': really_probe: bound device 0-003f to driver dummy [ 61.995604] really_probe: bus: 'i2c': really_probe: probing driver dummy with device 0-0038 [ 61.996381] driver_bound: driver: 'dummy': driver_bound: bound to device '0-0038' [ 61.996663] really_probe: bus: 'i2c': really_probe: bound device 0-0038 to driver dummy [ 61.998651] really_probe: bus: 'i2c': really_probe: probing driver dummy with device 0-003c [ 61.999222] driver_bound: driver: 'dummy': driver_bound: bound to device '0-003c' [ 61.999496] really_probe: bus: 'i2c': really_probe: bound device 0-003c to driver dummy [ 62.010050] really_probe: i2c 0-0039: Driver adv7511 requests probe deferral [ 62.011380] really_probe: bus: 'platform': really_probe: probing driver pwm-clock with device clock-cec [ 62.012812] really_probe: platform clock-cec: Driver pwm-clock requests probe deferral [ 62.024679] really_probe: bus: 'i2c': really_probe: probing driver adv7511 with device 0-0039 Fix this by calling devm_clk_get() before registering the secondary devices. Signed-off-by: Vincent Whitchurch <vincent.whitchurch(a)axis.com> --- v3: Make adv7511_cec_init() return void. v2: Add devm_clk_put() in error path. drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 ++- drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 34 ++++++++------------ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 15 ++++++--- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h index a9bb734366ae..05a66149b186 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h @@ -380,17 +380,16 @@ struct adv7511 { }; #ifdef CONFIG_DRM_I2C_ADV7511_CEC -int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511); +void adv7511_cec_init(struct device *dev, struct adv7511 *adv7511); void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1); #else -static inline int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) +static inline void adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) { unsigned int offset = adv7511->type == ADV7533 ? ADV7533_REG_CEC_OFFSET : 0; regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, ADV7511_CEC_CTRL_POWER_DOWN); - return 0; } #endif diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c index a20a45c0b353..ee0ed4fb67c1 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c @@ -286,28 +286,17 @@ static const struct cec_adap_ops adv7511_cec_adap_ops = { .adap_transmit = adv7511_cec_adap_transmit, }; -static int adv7511_cec_parse_dt(struct device *dev, struct adv7511 *adv7511) -{ - adv7511->cec_clk = devm_clk_get(dev, "cec"); - if (IS_ERR(adv7511->cec_clk)) { - int ret = PTR_ERR(adv7511->cec_clk); - - adv7511->cec_clk = NULL; - return ret; - } - clk_prepare_enable(adv7511->cec_clk); - adv7511->cec_clk_freq = clk_get_rate(adv7511->cec_clk); - return 0; -} - -int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) +void adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) { unsigned int offset = adv7511->type == ADV7533 ? ADV7533_REG_CEC_OFFSET : 0; - int ret = adv7511_cec_parse_dt(dev, adv7511); + int ret; - if (ret) - goto err_cec_parse_dt; + if (!adv7511->cec_clk) + goto err_cec_no_clock; + + clk_prepare_enable(adv7511->cec_clk); + adv7511->cec_clk_freq = clk_get_rate(adv7511->cec_clk); adv7511->cec_adap = cec_allocate_adapter(&adv7511_cec_adap_ops, adv7511, dev_name(dev), CEC_CAP_DEFAULTS, ADV7511_MAX_ADDRS); @@ -334,7 +323,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) ret = cec_register_adapter(adv7511->cec_adap, dev); if (ret) goto err_cec_register; - return 0; + return; err_cec_register: cec_delete_adapter(adv7511->cec_adap); @@ -342,8 +331,11 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) err_cec_alloc: dev_info(dev, "Initializing CEC failed with error %d, disabling CEC\n", ret); -err_cec_parse_dt: + clk_disable_unprepare(adv7511->cec_clk); + devm_clk_put(dev, adv7511->cec_clk); + /* Ensure that adv7511_remove() doesn't attempt to disable it again. */ + adv7511->cec_clk = NULL; +err_cec_no_clock: regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, ADV7511_CEC_CTRL_POWER_DOWN); - return ret == -EPROBE_DEFER ? ret : 0; } diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 87b58c1acff4..8d8df6116082 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -1128,6 +1128,15 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) if (ret) return ret; + adv7511->cec_clk = devm_clk_get(dev, "cec"); + if (IS_ERR(adv7511->cec_clk)) { + ret = PTR_ERR(adv7511->cec_clk); + if (ret == -EPROBE_DEFER) + return ret; + + adv7511->cec_clk = NULL; + } + ret = adv7511_init_regulators(adv7511); if (ret) { dev_err(dev, "failed to init regulators\n"); @@ -1218,9 +1227,7 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) if (adv7511->type == ADV7511) adv7511_set_link_config(adv7511, &link_config); - ret = adv7511_cec_init(dev, adv7511); - if (ret) - goto err_unregister_cec; + adv7511_cec_init(dev, adv7511); adv7511->bridge.funcs = &adv7511_bridge_funcs; adv7511->bridge.of_node = dev->of_node; @@ -1232,8 +1239,6 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) err_unregister_cec: i2c_unregister_device(adv7511->i2c_cec); - if (adv7511->cec_clk) - clk_disable_unprepare(adv7511->cec_clk); err_i2c_unregister_packet: i2c_unregister_device(adv7511->i2c_packet); err_i2c_unregister_edid: -- 2.25.1

2 2

[Bug 208539] New: Warning at drm_mod_object_add on when display is re-enabled (after display off)
by bugzilla-daemon＠bugzilla.kernel.org 14 Jul '20

14 Jul '20

https://bugzilla.kernel.org/show_bug.cgi?id=208539 Bug ID: 208539 Summary: Warning at drm_mod_object_add on when display is re-enabled (after display off) Product: Drivers Version: 2.5 Kernel Version: 5.8.0-rc5 Hardware: All OS: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: dl9pf(a)gmx.de CC: dl9pf(a)gmx.de Regression: Yes [78580.431312] [drm] DM_MST: starting TM on aconnector: 00000000d383a98b [id: 67] [78580.744579] ------------[ cut here ]------------ [78580.744595] WARNING: CPU: 2 PID: 23119 at drivers/gpu/drm/drm_mode_object.c:45 drm_mode_object_add+0x75/0x80 [drm] [78580.744595] Modules linked in: fuse(E) rfcomm(E) tun(E) af_packet(E) xt_tcpudp(E) ip6t_REJECT(E) nf_reject_ipv6(E) ip6t_rpfilter(E) ipt_REJECT(E) nf_reject_ipv4(E) xt_conntrack(E) ebtable_nat(E) ebtable_broute(E) ip6table_nat(E) ip6table_mangle(E) ip6table_raw(E) ip6table_security(E) iptable_nat(E) nf_nat(E) iptable_mangle(E) iptable_raw(E) iptable_security(E) nf_conntrack(E) nf_defrag_ipv6(E) nf_defrag_ipv4(E) iscsi_ibft(E) iscsi_boot_sysfs(E) ip_set(E) nfnetlink(E) ebtable_filter(E) ebtables(E) ip6table_filter(E) ip6_tables(E) iptable_filter(E) ip_tables(E) x_tables(E) dmi_sysfs(E) cmac(E) algif_hash(E) algif_skcipher(E) af_alg(E) bnep(E) msr(E) intel_rapl_msr(E) intel_rapl_common(E) hid_logitech_hidpp(E) x86_pkg_temp_thermal(E) intel_powerclamp(E) iTCO_wdt(E) coretemp(E) ee1004(E) iTCO_vendor_support(E) kvm_intel(E) tps6598x(E) mei_hdcp(E) roles(E) typec(E) kvm(E) irqbypass(E) crct10dif_pclmul(E) crc32_pclmul(E) nls_iso8859_1(E) ghash_clmulni_intel(E) nls_cp437(E) aesni_intel(E) [78580.744607] crypto_simd(E) vfat(E) cryptd(E) fat(E) glue_helper(E) pcspkr(E) intel_wmi_thunderbolt(E) wmi_bmof(E) deflate(E) i2c_i801(E) efi_pstore(E) e1000e(E) i2c_smbus(E) iwlwifi(E) btusb(E) cdc_ether(E) btrtl(E) usbnet(E) btbcm(E) btintel(E) igb(E) cfg80211(E) ptp(E) bluetooth(E) r8152(E) mei_me(E) pps_core(E) dca(E) mei(E) ecdh_generic(E) mii(E) uvcvideo(E) videobuf2_vmalloc(E) rfkill(E) videobuf2_memops(E) ecc(E) videobuf2_v4l2(E) uas(E) snd_hda_codec_realtek(E) videobuf2_common(E) snd_hda_codec_generic(E) videodev(E) ledtrig_audio(E) usb_storage(E) snd_hda_codec_hdmi(E) snd_usb_audio(E) snd_hda_intel(E) snd_usbmidi_lib(E) snd_intel_dspcfg(E) snd_rawmidi(E) snd_seq_device(E) intel_lpss_pci(E) hid_logitech_dj(E) intel_lpss(E) joydev(E) mc(E) idma64(E) snd_hda_codec(E) ir_rc6_decoder(E) snd_hda_core(E) intel_pch_thermal(E) snd_hwdep(E) snd_pcm(E) snd_timer(E) snd(E) soundcore(E) thermal(E) fan(E) i2c_multi_instantiate(E) rc_rc6_mce(E) ite_cir(E) rc_core(E) button(E) acpi_pad(E) [78580.744620] btrfs(E) blake2b_generic(E) libcrc32c(E) xor(E) hid_generic(E) usbhid(E) raid6_pq(E) crc32c_intel(E) xhci_pci(E) serio_raw(E) sdhci_pci(E) xhci_hcd(E) cqhci(E) sdhci(E) usbcore(E) mmc_core(E) wmi(E) video(E) pinctrl_sunrisepoint(E) pinctrl_intel(E) amdgpu(E) iommu_v2(E) gpu_sched(E) i2c_algo_bit(E) ttm(E) drm_kms_helper(E) syscopyarea(E) sysfillrect(E) sysimgblt(E) fb_sys_fops(E) cec(E) drm(E) sg(E) dm_multipath(E) dm_mod(E) scsi_dh_rdac(E) scsi_dh_emc(E) scsi_dh_alua(E) efivarfs(E) [78580.744628] CPU: 2 PID: 23119 Comm: kworker/2:2 Tainted: G W E 5.8.0-rc5-1-default-20200713-0948 #1 [78580.744629] Hardware name: Intel Corporation NUC8i7HVK/NUC8i7HVB, BIOS HNKBLi70.86A.0054.2019.0214.1350 02/14/2019 [78580.744636] Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper] [78580.744645] RIP: 0010:drm_mode_object_add+0x75/0x80 [drm] [78580.744646] Code: 85 c0 78 07 89 45 00 44 89 65 04 4c 89 ef e8 f2 9e ef f6 85 db b8 00 00 00 00 0f 4e c3 5b 5d 41 5c 41 5d c3 80 7f 60 00 74 a9 <0f> 0b eb a5 0f 1f 80 00 00 00 00 0f 1f 44 00 00 41 54 4c 8d a7 f8 [78580.744647] RSP: 0000:ffffa66f44b43b18 EFLAGS: 00010202 [78580.744648] RAX: ffffffffc0ab3120 RBX: ffff8ba6c7611000 RCX: 0000000000000007 [78580.744648] RDX: 00000000e0e0e0e0 RSI: ffff8babddd0b218 RDI: ffff8ba6c7611000 [78580.744648] RBP: ffff8babddd0b218 R08: 0000000000000000 R09: ffff8babddd0b200 [78580.744649] R10: 0000000000000000 R11: ffffa66f44b43c08 R12: 00000000e0e0e0e0 [78580.744649] R13: 0000000000000007 R14: ffffffffc0929e00 R15: ffff8babddd0b218 [78580.744650] FS: 0000000000000000(0000) GS:ffff8bae1ec80000(0000) knlGS:0000000000000000 [78580.744650] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [78580.744651] CR2: 00007f948d2c95c0 CR3: 00000008444e0004 CR4: 00000000003606e0 [78580.744651] Call Trace: [78580.744662] drm_encoder_init+0x49/0x160 [drm] [78580.744664] ? _cond_resched+0x16/0x40 [78580.744666] ? kmem_cache_alloc_trace+0x14b/0x200 [78580.744741] dm_dp_add_mst_connector+0x114/0x1e0 [amdgpu] [78580.744747] drm_dp_mst_port_add_connector+0x52/0xe0 [drm_kms_helper] [78580.744749] ? acpi_os_signal_semaphore+0x70/0x80 [78580.744750] ? acpi_ut_release_mutex+0x13e/0x145 [78580.744751] ? _cond_resched+0x16/0x40 [78580.744753] ? klist_next+0x136/0x140 [78580.744754] ? __process_new_driver+0x20/0x20 [78580.744756] ? bus_for_each_drv+0x82/0xa0 [78580.744757] ? i2c_register_adapter+0x1b1/0x370 [78580.744761] ? drm_dp_port_set_pdt+0x115/0x2a0 [drm_kms_helper] [78580.744765] drm_dp_mst_handle_link_address_port+0x2cf/0x4b0 [drm_kms_helper] [78580.744770] drm_dp_send_link_address+0x1a5/0x370 [drm_kms_helper] [78580.744771] ? __queue_work+0x1e0/0x370 [78580.744775] drm_dp_check_and_send_link_address+0xad/0xd0 [drm_kms_helper] [78580.744778] drm_dp_mst_link_probe_work+0x94/0x180 [drm_kms_helper] [78580.744780] process_one_work+0x1e3/0x3b0 [78580.744781] worker_thread+0x46/0x340 [78580.744782] ? process_one_work+0x3b0/0x3b0 [78580.744783] kthread+0x119/0x140 [78580.744784] ? __kthread_bind_mask+0x60/0x60 [78580.744786] ret_from_fork+0x22/0x30 [78580.744787] ---[ end trace 439e8523e829733f ]--- [78581.000232] ------------[ cut here ]------------ [78581.000257] WARNING: CPU: 2 PID: 23119 at drivers/gpu/drm/drm_mode_object.c:45 drm_mode_object_add+0x75/0x80 [drm] [78581.000258] Modules linked in: fuse(E) rfcomm(E) tun(E) af_packet(E) xt_tcpudp(E) ip6t_REJECT(E) nf_reject_ipv6(E) ip6t_rpfilter(E) ipt_REJECT(E) nf_reject_ipv4(E) xt_conntrack(E) ebtable_nat(E) ebtable_broute(E) ip6table_nat(E) ip6table_mangle(E) ip6table_raw(E) ip6table_security(E) iptable_nat(E) nf_nat(E) iptable_mangle(E) iptable_raw(E) iptable_security(E) nf_conntrack(E) nf_defrag_ipv6(E) nf_defrag_ipv4(E) iscsi_ibft(E) iscsi_boot_sysfs(E) ip_set(E) nfnetlink(E) ebtable_filter(E) ebtables(E) ip6table_filter(E) ip6_tables(E) iptable_filter(E) ip_tables(E) x_tables(E) dmi_sysfs(E) cmac(E) algif_hash(E) algif_skcipher(E) af_alg(E) bnep(E) msr(E) intel_rapl_msr(E) intel_rapl_common(E) hid_logitech_hidpp(E) x86_pkg_temp_thermal(E) intel_powerclamp(E) iTCO_wdt(E) coretemp(E) ee1004(E) iTCO_vendor_support(E) kvm_intel(E) tps6598x(E) mei_hdcp(E) roles(E) typec(E) kvm(E) irqbypass(E) crct10dif_pclmul(E) crc32_pclmul(E) nls_iso8859_1(E) ghash_clmulni_intel(E) nls_cp437(E) aesni_intel(E) [78581.000281] crypto_simd(E) vfat(E) cryptd(E) fat(E) glue_helper(E) pcspkr(E) intel_wmi_thunderbolt(E) wmi_bmof(E) deflate(E) i2c_i801(E) efi_pstore(E) e1000e(E) i2c_smbus(E) iwlwifi(E) btusb(E) cdc_ether(E) btrtl(E) usbnet(E) btbcm(E) btintel(E) igb(E) cfg80211(E) ptp(E) bluetooth(E) r8152(E) mei_me(E) pps_core(E) dca(E) mei(E) ecdh_generic(E) mii(E) uvcvideo(E) videobuf2_vmalloc(E) rfkill(E) videobuf2_memops(E) ecc(E) videobuf2_v4l2(E) uas(E) snd_hda_codec_realtek(E) videobuf2_common(E) snd_hda_codec_generic(E) videodev(E) ledtrig_audio(E) usb_storage(E) snd_hda_codec_hdmi(E) snd_usb_audio(E) snd_hda_intel(E) snd_usbmidi_lib(E) snd_intel_dspcfg(E) snd_rawmidi(E) snd_seq_device(E) intel_lpss_pci(E) hid_logitech_dj(E) intel_lpss(E) joydev(E) mc(E) idma64(E) snd_hda_codec(E) ir_rc6_decoder(E) snd_hda_core(E) intel_pch_thermal(E) snd_hwdep(E) snd_pcm(E) snd_timer(E) snd(E) soundcore(E) thermal(E) fan(E) i2c_multi_instantiate(E) rc_rc6_mce(E) ite_cir(E) rc_core(E) button(E) acpi_pad(E) [78581.000310] btrfs(E) blake2b_generic(E) libcrc32c(E) xor(E) hid_generic(E) usbhid(E) raid6_pq(E) crc32c_intel(E) xhci_pci(E) serio_raw(E) sdhci_pci(E) xhci_hcd(E) cqhci(E) sdhci(E) usbcore(E) mmc_core(E) wmi(E) video(E) pinctrl_sunrisepoint(E) pinctrl_intel(E) amdgpu(E) iommu_v2(E) gpu_sched(E) i2c_algo_bit(E) ttm(E) drm_kms_helper(E) syscopyarea(E) sysfillrect(E) sysimgblt(E) fb_sys_fops(E) cec(E) drm(E) sg(E) dm_multipath(E) dm_mod(E) scsi_dh_rdac(E) scsi_dh_emc(E) scsi_dh_alua(E) efivarfs(E) [78581.000326] CPU: 2 PID: 23119 Comm: kworker/2:2 Tainted: G W E 5.8.0-rc5-1-default-20200713-0948 #1 [78581.000326] Hardware name: Intel Corporation NUC8i7HVK/NUC8i7HVB, BIOS HNKBLi70.86A.0054.2019.0214.1350 02/14/2019 [78581.000335] Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper] [78581.000346] RIP: 0010:drm_mode_object_add+0x75/0x80 [drm] [78581.000347] Code: 85 c0 78 07 89 45 00 44 89 65 04 4c 89 ef e8 f2 9e ef f6 85 db b8 00 00 00 00 0f 4e c3 5b 5d 41 5c 41 5d c3 80 7f 60 00 74 a9 <0f> 0b eb a5 0f 1f 80 00 00 00 00 0f 1f 44 00 00 41 54 4c 8d a7 f8 [78581.000348] RSP: 0018:ffffa66f44b43b18 EFLAGS: 00010202 [78581.000348] RAX: ffffffffc0ab3120 RBX: ffff8ba6c7611000 RCX: 0000000000000007 [78581.000349] RDX: 00000000e0e0e0e0 RSI: ffff8babddd08a18 RDI: ffff8ba6c7611000 [78581.000349] RBP: ffff8babddd08a18 R08: 0000000000000000 R09: ffff8babddd08a00 [78581.000350] R10: 0000000000000000 R11: ffffffffb8338420 R12: 00000000e0e0e0e0 [78581.000350] R13: 0000000000000007 R14: ffffffffc0929e00 R15: ffff8babddd08a18 [78581.000351] FS: 0000000000000000(0000) GS:ffff8bae1ec80000(0000) knlGS:0000000000000000 [78581.000351] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [78581.000352] CR2: 00007f856fc25000 CR3: 000000076c170001 CR4: 00000000003606e0 [78581.000352] Call Trace: [78581.000363] drm_encoder_init+0x49/0x160 [drm] [78581.000366] ? _cond_resched+0x16/0x40 [78581.000368] ? kmem_cache_alloc_trace+0x14b/0x200 [78581.000461] dm_dp_add_mst_connector+0x114/0x1e0 [amdgpu] [78581.000467] drm_dp_mst_port_add_connector+0x52/0xe0 [drm_kms_helper] [78581.000470] ? acpi_os_signal_semaphore+0x70/0x80 [78581.000471] ? acpi_ut_release_mutex+0x13e/0x145 [78581.000472] ? _cond_resched+0x16/0x40 [78581.000474] ? klist_next+0x136/0x140 [78581.000476] ? __process_new_driver+0x20/0x20 [78581.000477] ? bus_for_each_drv+0x82/0xa0 [78581.000478] ? _cond_resched+0x16/0x40 [78581.000479] ? kmem_cache_alloc_trace+0x14b/0x200 [78581.000483] ? drm_dp_mst_add_port+0x2f/0xe0 [drm_kms_helper] [78581.000487] drm_dp_mst_handle_link_address_port+0x2cf/0x4b0 [drm_kms_helper] [78581.000492] drm_dp_send_link_address+0x1a5/0x370 [drm_kms_helper] [78581.000494] ? __queue_work+0x1e0/0x370 [78581.000497] drm_dp_check_and_send_link_address+0xad/0xd0 [drm_kms_helper] [78581.000501] drm_dp_mst_link_probe_work+0x94/0x180 [drm_kms_helper] [78581.000502] process_one_work+0x1e3/0x3b0 [78581.000503] worker_thread+0x46/0x340 [78581.000504] ? process_one_work+0x3b0/0x3b0 [78581.000505] kthread+0x119/0x140 [78581.000506] ? __kthread_bind_mask+0x60/0x60 [78581.000508] ret_from_fork+0x22/0x30 [78581.000509] ---[ end trace 439e8523e8297340 ]--- dl9pf@monster:~> inxi -G Graphics: Device-1: Advanced Micro Devices [AMD/ATI] Polaris 22 XT [Radeon RX Vega M GH] driver: amdgpu v: kernel Display: x11 server: X.Org 1.20.8 driver: amdgpu resolution: 1: 1080x1920~60Hz 2: 1920x1080~60Hz 3: 1080x1920 OpenGL: renderer: AMD VEGAM (DRM 3.38.0 5.8.0-rc5-1-default-20200713-0948 LLVM 10.0.0) v: 4.6 Mesa 20.1.1 -- You are receiving this mail because: You are watching the assignee of the bug.

1 1

[PATCH v2] efi: avoid error message when booting under Xen
by Juergen Gross 14 Jul '20

14 Jul '20

efifb_probe() will issue an error message in case the kernel is booted as Xen dom0 from UEFI as EFI_MEMMAP won't be set in this case. Avoid that message by calling efi_mem_desc_lookup() only if EFI_MEMMAP is set. Fixes: 38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes when mapping the FB") Signed-off-by: Juergen Gross <jgross(a)suse.com> --- drivers/video/fbdev/efifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 65491ae74808..e57c00824965 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -453,7 +453,7 @@ static int efifb_probe(struct platform_device *dev) info->apertures->ranges[0].base = efifb_fix.smem_start; info->apertures->ranges[0].size = size_remap; - if (efi_enabled(EFI_BOOT) && + if (efi_enabled(EFI_MEMMAP) && !efi_mem_desc_lookup(efifb_fix.smem_start, &md)) { if ((efifb_fix.smem_start + efifb_fix.smem_len) > (md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT))) { -- 2.26.2

3 2

← Newer
1
...
51
52
53
54
55
56
57
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2020