dri-devel July 2020

dri-devel@lists.freedesktop.org

336 participants
772 discussions

[PATCH 0/3] Fix Kconfig dependency issue with DMAENGINES selection
by Laurent Pinchart 31 Jul '20

31 Jul '20

Hello, This small series fixes a Kconfig dependency issue with the recently merged Xilixn DPSUB DRM/KMS driver. The fix is in patch 3/3, but requires a separate fixes in patches 1/3 and 2/3 to avoid circular dependencies: drivers/i2c/Kconfig:8:error: recursive dependency detected! drivers/i2c/Kconfig:8: symbol I2C is selected by FB_DDC drivers/video/fbdev/Kconfig:63: symbol FB_DDC depends on FB drivers/video/fbdev/Kconfig:12: symbol FB is selected by DRM_KMS_FB_HELPER drivers/gpu/drm/Kconfig:80: symbol DRM_KMS_FB_HELPER depends on DRM_KMS_HELPER drivers/gpu/drm/Kconfig:74: symbol DRM_KMS_HELPER is selected by DRM_ZYNQMP_DPSUB drivers/gpu/drm/xlnx/Kconfig:1: symbol DRM_ZYNQMP_DPSUB depends on DMA_ENGINE drivers/dma/Kconfig:44: symbol DMA_ENGINE depends on DMADEVICES drivers/dma/Kconfig:6: symbol DMADEVICES is selected by SND_SOC_SH4_SIU sound/soc/sh/Kconfig:30: symbol SND_SOC_SH4_SIU is selected by SND_SIU_MIGOR sound/soc/sh/Kconfig:60: symbol SND_SIU_MIGOR depends on I2C For a resolution refer to Documentation/kbuild/kconfig-language.rst subsection "Kconfig recursive dependency limitations" Due to the DPSUB driver being merged in v5.9, this is a candidate fix for v5.9 as well. 1/3 and 2/3 can be merged independently, 3/3 depends on the first two. What's the best course of action, can I merge this all in a single tree, or should the rapidio and ASoC patches be merged independently early in the -rc cycle, and the DRM patch later on top ? I don't expect conflicts (especially in 2/3 and 3/3), so merging the whole series in one go would be simpler in my opinion. Laurent Pinchart (3): rapidio: Replace 'select' DMAENGINES 'with depends on' ASoC: sh: Replace 'select' DMAENGINES 'with depends on' drm: xlnx: dpsub: Fix DMADEVICES Kconfig dependency drivers/gpu/drm/xlnx/Kconfig | 1 + drivers/rapidio/Kconfig | 2 +- sound/soc/sh/Kconfig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- Regards, Laurent Pinchart

3 6

[PATCH] drm/msm: Add vblank timestamp support for dpu1
by Robert Beckett 31 Jul '20

31 Jul '20

add vblank timestamp support via drm helpers Signed-off-by: Robert Beckett <bob.beckett(a)collabora.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 71 ++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 5 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 ++- drivers/gpu/drm/msm/msm_drv.c | 1 + 5 files changed, 92 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index f272a8d0f95b..b62552cad135 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -297,8 +297,8 @@ void dpu_crtc_vblank_callback(struct drm_crtc *crtc) dpu_crtc->vblank_cb_time = ktime_get(); else dpu_crtc->vblank_cb_count++; - _dpu_crtc_complete_flip(crtc); drm_crtc_handle_vblank(crtc); + _dpu_crtc_complete_flip(crtc); trace_dpu_crtc_vblank_cb(DRMID(crtc)); } @@ -1320,6 +1320,73 @@ static void dpu_crtc_early_unregister(struct drm_crtc *crtc) debugfs_remove_recursive(dpu_crtc->debugfs_root); } +static struct drm_encoder *get_encoder_from_crtc(struct drm_crtc *crtc) +{ + struct drm_device *dev = crtc->dev; + struct drm_encoder *encoder; + + drm_for_each_encoder(encoder, dev) + if (encoder->crtc == crtc) + return encoder; + + return NULL; +} + +static bool dpu_crtc_get_scanout_position(struct drm_crtc *crtc, + bool in_vblank_irq, + int *vpos, int *hpos, + ktime_t *stime, ktime_t *etime, + const struct drm_display_mode *mode) +{ + unsigned int pipe = crtc->index; + struct drm_encoder *encoder; + int line, vsw, vbp, vactive_start, vactive_end, vfp_end; + + + encoder = get_encoder_from_crtc(crtc); + if (!encoder) { + DRM_ERROR("no encoder found for crtc %d\n", pipe); + return false; + } + + vsw = mode->crtc_vsync_end - mode->crtc_vsync_start; + vbp = mode->crtc_vtotal - mode->crtc_vsync_end; + + /* + * the line counter is 1 at the start of the VSYNC pulse and VTOTAL at + * the end of VFP. Translate the porch values relative to the line + * counter positions. + */ + + vactive_start = vsw + vbp + 1; + + vactive_end = vactive_start + mode->crtc_vdisplay; + + /* last scan line before VSYNC */ + vfp_end = mode->crtc_vtotal; + + if (stime) + *stime = ktime_get(); + + line = dpu_encoder_get_linecount(encoder); + + if (line < vactive_start) + line -= vactive_start; + else if (line > vactive_end) + line = line - vfp_end - vactive_start; + else + line -= vactive_start; + + *vpos = line; + *hpos = 0; + + if (etime) + *etime = ktime_get(); + + return true; +} + + static const struct drm_crtc_funcs dpu_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = dpu_crtc_destroy, @@ -1331,6 +1398,7 @@ static const struct drm_crtc_funcs dpu_crtc_funcs = { .early_unregister = dpu_crtc_early_unregister, .enable_vblank = msm_crtc_enable_vblank, .disable_vblank = msm_crtc_disable_vblank, + .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, }; static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = { @@ -1339,6 +1407,7 @@ static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = { .atomic_check = dpu_crtc_atomic_check, .atomic_begin = dpu_crtc_atomic_begin, .atomic_flush = dpu_crtc_atomic_flush, + .get_scanout_position = dpu_crtc_get_scanout_position, }; /* initialize crtc */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index a97f6d2e5a08..1d7d676355ee 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1659,6 +1659,13 @@ static u32 _dpu_encoder_calculate_linetime(struct dpu_encoder_virt *dpu_enc, return line_time; } +int dpu_encoder_get_linecount(struct drm_encoder *encoder) +{ + struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(encoder); + + return dpu_enc->cur_master->ops.get_line_count(dpu_enc->cur_master); +} + int dpu_encoder_vsync_time(struct drm_encoder *drm_enc, ktime_t *wakeup_time) { struct drm_display_mode *mode; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h index b4913465e602..f492ef0a2b2b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h @@ -85,6 +85,11 @@ void dpu_encoder_trigger_kickoff_pending(struct drm_encoder *encoder); */ void dpu_encoder_kickoff(struct drm_encoder *encoder); +/** + * dpu_encoder_get_linecount - get the current scanline count for this encoder + */ +int dpu_encoder_get_linecount(struct drm_encoder *encoder); + /** * dpu_encoder_wakeup_time - get the time of the next vsync */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index c0a4d4e16d82..db8a461a1786 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -14,6 +14,7 @@ #include <drm/drm_crtc.h> #include <drm/drm_file.h> +#include <drm/drm_vblank.h> #include "msm_drv.h" #include "msm_mmu.h" @@ -337,6 +338,11 @@ static void dpu_kms_prepare_commit(struct msm_kms *kms, if (!kms) return; + for_each_new_crtc_in_state(state, crtc, crtc_state, i) { + if (crtc_state->mode.crtc_clock) + drm_crtc_vblank_get(crtc); + } + /* Call prepare_commit for all affected encoders */ for_each_new_crtc_in_state(state, crtc, crtc_state, i) { drm_for_each_encoder_mask(encoder, crtc->dev, @@ -389,8 +395,10 @@ static void dpu_kms_complete_commit(struct msm_kms *kms, unsigned crtc_mask) DPU_ATRACE_BEGIN("kms_complete_commit"); - for_each_crtc_mask(dpu_kms->dev, crtc, crtc_mask) + for_each_crtc_mask(dpu_kms->dev, crtc, crtc_mask) { dpu_crtc_complete_commit(crtc); + drm_crtc_vblank_put(crtc); + } DPU_ATRACE_END("kms_complete_commit"); } diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 36d98d4116ca..01734191cd31 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -687,6 +687,7 @@ int msm_crtc_enable_vblank(struct drm_crtc *crtc) struct msm_kms *kms = priv->kms; if (!kms) return -ENXIO; + drm_calc_timestamping_constants(crtc, &crtc->state->adjusted_mode); DBG("dev=%p, crtc=%u", dev, pipe); return vblank_ctrl_queue_work(priv, pipe, true); } -- 2.20.1

1 0

[PATCH] drm/vkms: add missing drm_crtc_vblank_put to the get/put pair on flush
by Melissa Wen 31 Jul '20

31 Jul '20

This patch adds a missing drm_crtc_vblank_put op to the pair drm_crtc_vblank_get/put (inc/decrement counter to guarantee vblanks). It clears the execution of the following kms_cursor_crc subtests: 1. pipe-A-cursor-[size,alpha-opaque, NxN-(on-screen, off-screen, sliding, random, fast-moving])] - successful when running individually. 2. pipe-A-cursor-dpms passes again 3. pipe-A-cursor-suspend also passes The issue was initially tracked in the sequential execution of IGT kms_cursor_crc subtest: when running the test sequence or one of its subtests twice, the odd execs complete and the pairs get stuck in an endless wait. In the IGT code, calling a wait_for_vblank before the start of CRC capture prevented the busy-wait. But the problem persisted in the pipe-A-cursor-dpms and -suspend subtests. Checking the history, the pipe-A-cursor-dpms subtest was successful when, in vkms_atomic_commit_tail, instead of using the flip_done op, it used wait_for_vblanks. Another way to prevent blocking was wait_one_vblank when enabling crtc. However, in both cases, pipe-A-cursor-suspend persisted blocking in the 2nd start of CRC capture, which may indicate that something got stuck in the step of CRC setup. Indeed, wait_one_vblank in the crc setup was able to sync things and free all kms_cursor_crc subtests. Tracing and comparing a clean run with a blocked one: - in a clean one, vkms_crtc_atomic_flush enables vblanks; - when blocked, only in next op, vkms_crtc_atomic_enable, the vblanks started. Moreover, a series of vkms_vblank_simulate flow out until disabling vblanks. Also watching the steps of vkms_crtc_atomic_flush, when the very first drm_crtc_vblank_get returned an error, the subtest crashed. On the other hand, when vblank_get succeeded, the subtest completed. Finally, checking the flush steps: it increases counter to hold a vblank reference (get), but there isn't a op to decreased it and release vblanks (put). Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Rodrigo Siqueira <rodrigosiqueiramelo(a)gmail.com> Cc: Haneen Mohammed <hamohammed.sa(a)gmail.com> Signed-off-by: Melissa Wen <melissa.srw(a)gmail.com> --- drivers/gpu/drm/vkms/vkms_crtc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index ac85e17428f8..a99d6b4a92dd 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -246,6 +246,7 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crtc, spin_unlock(&crtc->dev->event_lock); + drm_crtc_vblank_put(crtc); crtc->state->event = NULL; } -- 2.27.0

6 25

Re: [PATCH v9 08/12] device core: Introduce DMA range map, supplanting dma_pfn_offset
by Rob Herring 31 Jul '20

31 Jul '20

On Wed, Jul 29, 2020 at 12:19 AM Christoph Hellwig <hch(a)lst.de> wrote: > > On Tue, Jul 28, 2020 at 02:24:51PM -0400, Jim Quinlan wrote: > > I started using devm_kcalloc() but at least two reviewers convinced me > > to just use kcalloc(). In addition, when I was using devm_kcalloc() > > it was awkward because 'dev' is not available to this function. > > > > It comes down to whether unbind/binding the device N times is actually > > a reasonable usage. As for my experience I've seen two cases: (1) my > > overnight "bind/unbind the PCIe RC driver" script, and we have a > > customer who does an unbind/bind as a hail mary to bring back life to > > their dead EP device. If the latter case happens repeatedly, there > > are bigger problems. > > We can't just leak the allocations. Do you have a pointer to the > arguments against managed resources? I'm generally not a huge fan > of the managed resources, but for a case like this they actually seem > useful. If we don't use the managed resources we'll at leat need > to explicitly free the resources when freeing the device. The lifetime for devm_kcalloc may not be what we want here. devm allocs are freed on probe fail or remove, not on freeing the device (there is a just in case free there too though). Rob

3 3

drm: list_add corruption followed by BUG (stack guard page was hit)
by Luis Henriques 31 Jul '20

31 Jul '20

Hi! I've just got the following WARNING followed by a BUG on rc7. Maybe it's already a known issue, but here it is anyway. Cheers, -- Luis [ 38.001304] ------------[ cut here ]------------ [ 38.001312] list_add corruption. prev->next should be next (ffff8fe713397b88), but was 0000000000000000. (prev=ffff8fe715fb9140). [ 38.001337] WARNING: CPU: 3 PID: 501 at lib/list_debug.c:26 __list_add_valid+0x4d/0x70 [ 38.001340] Modules linked in: cdc_ether(E) usbnet(E) r8152(E) mii(E) hid_generic(E) usbhid(E) snd_hda_codec_hdmi(E) iwlmvm(E) dell_rbtn(E) mac80211(E) libarc4(E) snd_hda_codec_realtek(E) x86_pkg_temp_thermal(E) intel_powerclamp(E) snd_hda_codec_generic(E) coretemp(E) mei_wdt(E) dell_laptop(E) kvm_intel(E) ledtrig_audio(E) intel_rapl_msr(E) dell_smm_hwmon(E) snd_hda_intel(E) kvm(E) uvcvideo(E) snd_intel_dspcfg(E) videobuf2_vmalloc(E) irqbypass(E) iwlwifi(E) videobuf2_memops(E) rapl(E) snd_hda_codec(E) videobuf2_v4l2(E) intel_cstate(E) dell_wmi(E) joydev(E) snd_hwdep(E) pcspkr(E) serio_raw(E) intel_uncore(E) dell_smbios(E) videobuf2_common(E) dcdbas(E) snd_hda_core(E) iTCO_wdt(E) snd_pcm(E) videodev(E) wmi_bmof(E) snd_timer(E) dell_wmi_descriptor(E) intel_wmi_thunderbolt(E) iTCO_vendor_support(E) mei_me(E) snd(E) cfg80211(E) soundcore(E) tpm_crb(E) mc(E) rfkill(E) mei(E) intel_pch_thermal(E) sg(E) processor_thermal_device(E) intel_rapl_common(E) intel_soc_dts_iosf(E) battery(E) tpm_tis(E) [ 38.001397] int3403_thermal(E) tpm_tis_core(E) tpm(E) dell_smo8800(E) intel_hid(E) evdev(E) rng_core(E) int3400_thermal(E) int3402_thermal(E) acpi_thermal_rel(E) int340x_thermal_zone(E) sparse_keymap(E) acpi_pad(E) ac(E) nft_counter(E) nft_ct(E) nf_conntrack(E) nf_defrag_ipv6(E) nf_defrag_ipv4(E) i2c_dev(E) nf_tables(E) parport_pc(E) ppdev(E) nfnetlink(E) lp(E) parport(E) ip_tables(E) x_tables(E) autofs4(E) ext4(E) crc16(E) mbcache(E) jbd2(E) btrfs(E) blake2b_generic(E) xor(E) raid6_pq(E) libcrc32c(E) crc32c_generic(E) dm_crypt(E) cbc(E) encrypted_keys(E) dm_mod(E) sd_mod(E) t10_pi(E) rtsx_pci_sdmmc(E) crct10dif_pclmul(E) crc32_pclmul(E) crc32c_intel(E) ghash_clmulni_intel(E) mmc_core(E) aesni_intel(E) crypto_simd(E) cryptd(E) glue_helper(E) ahci(E) nouveau(E) i915(E) mxm_wmi(E) i2c_i801(E) i2c_smbus(E) libahci(E) ttm(E) i2c_algo_bit(E) rtsx_pci(E) xhci_pci(E) drm_kms_helper(E) intel_lpss_pci(E) libata(E) syscopyarea(E) intel_lpss(E) xhci_hcd(E) idma64(E) sysfillrect(E) virt_dma(E) [ 38.001461] sysimgblt(E) scsi_mod(E) fb_sys_fops(E) mfd_core(E) usbcore(E) usb_common(E) drm(E) fan(E) thermal(E) i2c_hid(E) hid(E) wmi(E) video(E) button(E) [ 38.001482] CPU: 3 PID: 501 Comm: kworker/3:4 Tainted: G E 5.8.0-rc7 #43 [ 38.001485] Hardware name: Dell Inc. Precision 5510/0N8J4R, BIOS 1.14.2 05/25/2020 [ 38.001513] Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper] [ 38.001521] RIP: 0010:__list_add_valid+0x4d/0x70 [ 38.001527] Code: c3 4c 89 c1 48 c7 c7 98 34 ed af e8 7f 16 c9 ff 0f 0b 31 c0 c3 48 89 d1 4c 89 c6 4c 89 ca 48 c7 c7 e8 34 ed af e8 65 16 c9 ff <0f> 0b 31 c0 c3 48 89 f2 4c 89 c1 48 89 fe 48 c7 c7 38 35 ed af e8 [ 38.001530] RSP: 0018:ffffa47680417ca0 EFLAGS: 00010286 [ 38.001535] RAX: 0000000000000000 RBX: ffff8fe713397b88 RCX: 0000000000000027 [ 38.001538] RDX: 0000000000000027 RSI: 0000000000000096 RDI: ffff8fe71e197b68 [ 38.001541] RBP: ffff8fe7133977e8 R08: ffff8fe71e197b60 R09: 0000000000000084 [ 38.001544] R10: ffffa47680417b48 R11: ffffa47680417b4d R12: ffff8fe71869f800 [ 38.001547] R13: ffff8fe715fb9140 R14: ffff8fe71869f940 R15: ffff8fe713397b68 [ 38.001551] FS: 0000000000000000(0000) GS:ffff8fe71e180000(0000) knlGS:0000000000000000 [ 38.001555] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 38.001558] CR2: 00007f9e3f7159d0 CR3: 000000040e60a004 CR4: 00000000003606e0 [ 38.001561] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 38.001563] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 38.001566] Call Trace: [ 38.001593] drm_dp_queue_down_tx+0x5c/0x110 [drm_kms_helper] [ 38.001604] ? i2c_register_adapter+0x1d0/0x390 [ 38.001627] drm_dp_send_enum_path_resources+0x54/0x120 [drm_kms_helper] [ 38.001650] drm_dp_send_link_address+0x682/0x990 [drm_kms_helper] [ 38.001657] ? prepare_to_wait_event+0x7e/0x150 [ 38.001661] ? finish_wait+0x3f/0x80 [ 38.001684] drm_dp_check_and_send_link_address+0xad/0xd0 [drm_kms_helper] [ 38.001707] drm_dp_mst_link_probe_work+0x94/0x180 [drm_kms_helper] [ 38.001714] process_one_work+0x1ae/0x370 [ 38.001720] worker_thread+0x50/0x3a0 [ 38.001725] ? process_one_work+0x370/0x370 [ 38.001729] kthread+0x11b/0x140 [ 38.001734] ? kthread_associate_blkcg+0x90/0x90 [ 38.001741] ret_from_fork+0x22/0x30 [ 38.001747] ---[ end trace ca03f107384f1adc ]--- [ 38.001759] BUG: stack guard page was hit at 0000000062c9d455 (stack is 00000000e3f6f298..0000000086ee600f) [ 38.001766] kernel stack overflow (page fault): 0000 [#1] SMP PTI [ 38.001771] CPU: 3 PID: 501 Comm: kworker/3:4 Tainted: G W E 5.8.0-rc7 #43 [ 38.001774] Hardware name: Dell Inc. Precision 5510/0N8J4R, BIOS 1.14.2 05/25/2020 [ 38.001797] Workqueue: events_long drm_dp_mst_link_probe_work [drm_kms_helper] [ 38.001820] RIP: 0010:process_single_tx_qlock+0x364/0x4d0 [drm_kms_helper] [ 38.001826] Code: f8 49 89 54 00 f8 4c 89 c2 48 29 ca 48 01 d0 49 29 d7 48 83 e0 f8 48 83 f8 08 0f 82 16 ff ff ff 48 83 e0 f8 31 d2 49 8b 34 17 <48> 89 34 11 48 83 c2 08 48 39 c2 72 ef e9 fa fe ff ff c6 44 24 4e [ 38.001829] RSP: 0018:ffffa47680417bd0 EFLAGS: 00010207 [ 38.001833] RAX: fffffffffffffff0 RBX: 00000000fffffffc RCX: ffffa47680417c28 [ 38.001835] RDX: 00000000000003d8 RSI: 0000000000000000 RDI: ffffa47680417c20 [ 38.001838] RBP: ffff8fe715fb9000 R08: ffffa47680417c23 R09: 000000000000000a [ 38.001841] R10: 0000000000000002 R11: 0000000000000001 R12: ffff8fe7133977e8 [ 38.001843] R13: 0000000000000000 R14: 0000000000000003 R15: ffff8fe715fb9009 [ 38.001847] FS: 0000000000000000(0000) GS:ffff8fe71e180000(0000) knlGS:0000000000000000 [ 38.001850] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 38.001853] CR2: ffffa47680418000 CR3: 000000040e60a004 CR4: 00000000003606e0 [ 38.001856] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 38.001858] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 38.001860] Call Trace: [ 38.001871] ? asm_exc_invalid_op+0x12/0x20 [ 38.001885] Modules linked in: cdc_ether(E) usbnet(E) r8152(E) mii(E) hid_generic(E) usbhid(E) snd_hda_codec_hdmi(E) iwlmvm(E) dell_rbtn(E) mac80211(E) libarc4(E) snd_hda_codec_realtek(E) x86_pkg_temp_thermal(E) intel_powerclamp(E) snd_hda_codec_generic(E) coretemp(E) mei_wdt(E) dell_laptop(E) kvm_intel(E) ledtrig_audio(E) intel_rapl_msr(E) dell_smm_hwmon(E) snd_hda_intel(E) kvm(E) uvcvideo(E) snd_intel_dspcfg(E) videobuf2_vmalloc(E) irqbypass(E) iwlwifi(E) videobuf2_memops(E) rapl(E) snd_hda_codec(E) videobuf2_v4l2(E) intel_cstate(E) dell_wmi(E) joydev(E) snd_hwdep(E) pcspkr(E) serio_raw(E) intel_uncore(E) dell_smbios(E) videobuf2_common(E) dcdbas(E) snd_hda_core(E) iTCO_wdt(E) snd_pcm(E) videodev(E) wmi_bmof(E) snd_timer(E) dell_wmi_descriptor(E) intel_wmi_thunderbolt(E) iTCO_vendor_support(E) mei_me(E) snd(E) cfg80211(E) soundcore(E) tpm_crb(E) mc(E) rfkill(E) mei(E) intel_pch_thermal(E) sg(E) processor_thermal_device(E) intel_rapl_common(E) intel_soc_dts_iosf(E) battery(E) tpm_tis(E) [ 38.001934] int3403_thermal(E) tpm_tis_core(E) tpm(E) dell_smo8800(E) intel_hid(E) evdev(E) rng_core(E) int3400_thermal(E) int3402_thermal(E) acpi_thermal_rel(E) int340x_thermal_zone(E) sparse_keymap(E) acpi_pad(E) ac(E) nft_counter(E) nft_ct(E) nf_conntrack(E) nf_defrag_ipv6(E) nf_defrag_ipv4(E) i2c_dev(E) nf_tables(E) parport_pc(E) ppdev(E) nfnetlink(E) lp(E) parport(E) ip_tables(E) x_tables(E) autofs4(E) ext4(E) crc16(E) mbcache(E) jbd2(E) btrfs(E) blake2b_generic(E) xor(E) raid6_pq(E) libcrc32c(E) crc32c_generic(E) dm_crypt(E) cbc(E) encrypted_keys(E) dm_mod(E) sd_mod(E) t10_pi(E) rtsx_pci_sdmmc(E) crct10dif_pclmul(E) crc32_pclmul(E) crc32c_intel(E) ghash_clmulni_intel(E) mmc_core(E) aesni_intel(E) crypto_simd(E) cryptd(E) glue_helper(E) ahci(E) nouveau(E) i915(E) mxm_wmi(E) i2c_i801(E) i2c_smbus(E) libahci(E) ttm(E) i2c_algo_bit(E) rtsx_pci(E) xhci_pci(E) drm_kms_helper(E) intel_lpss_pci(E) libata(E) syscopyarea(E) intel_lpss(E) xhci_hcd(E) idma64(E) sysfillrect(E) virt_dma(E) [ 38.001990] sysimgblt(E) scsi_mod(E) fb_sys_fops(E) mfd_core(E) usbcore(E) usb_common(E) drm(E) fan(E) thermal(E) i2c_hid(E) hid(E) wmi(E) video(E) button(E) [ 38.002008] ---[ end trace ca03f107384f1add ]--- [ 38.002031] RIP: 0010:process_single_tx_qlock+0x364/0x4d0 [drm_kms_helper] [ 38.002036] Code: f8 49 89 54 00 f8 4c 89 c2 48 29 ca 48 01 d0 49 29 d7 48 83 e0 f8 48 83 f8 08 0f 82 16 ff ff ff 48 83 e0 f8 31 d2 49 8b 34 17 <48> 89 34 11 48 83 c2 08 48 39 c2 72 ef e9 fa fe ff ff c6 44 24 4e [ 38.002039] RSP: 0018:ffffa47680417bd0 EFLAGS: 00010207 [ 38.002042] RAX: fffffffffffffff0 RBX: 00000000fffffffc RCX: ffffa47680417c28 [ 38.002045] RDX: 00000000000003d8 RSI: 0000000000000000 RDI: ffffa47680417c20 [ 38.002048] RBP: ffff8fe715fb9000 R08: ffffa47680417c23 R09: 000000000000000a [ 38.002051] R10: 0000000000000002 R11: 0000000000000001 R12: ffff8fe7133977e8 [ 38.002053] R13: 0000000000000000 R14: 0000000000000003 R15: ffff8fe715fb9009 [ 38.002057] FS: 0000000000000000(0000) GS:ffff8fe71e180000(0000) knlGS:0000000000000000 [ 38.002060] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 38.002062] CR2: ffffa47680418000 CR3: 000000040e60a004 CR4: 00000000003606e0 [ 38.002065] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 38.002068] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400

1 0

[PATCH] drm/vkms: fix xrgb on compute crc
by Melissa Wen 31 Jul '20

31 Jul '20

The previous memset operation was not correctly zeroing the alpha channel to compute the crc, and as a result, the IGT subtest kms_cursor_crc/pipe-A-cursor-alpha-transparent fails. Fixes: db7f419c06d7c ("drm/vkms: Compute CRC with Cursor Plane") Signed-off-by: Melissa Wen <melissa.srw(a)gmail.com> --- drivers/gpu/drm/vkms/vkms_composer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index 4af2f19480f4..b8b060354667 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -33,7 +33,7 @@ static uint32_t compute_crc(void *vaddr_out, struct vkms_composer *composer) + (i * composer->pitch) + (j * composer->cpp); /* XRGB format ignores Alpha channel */ - memset(vaddr_out + src_offset + 24, 0, 8); + bitmap_clear(vaddr_out + src_offset, 24, 8); crc = crc32_le(crc, vaddr_out + src_offset, sizeof(u32)); } -- 2.27.0

2 1

[PATCH] Added orientation quirk for ASUS tablet model T103HAF
by Marius Iacob 31 Jul '20

31 Jul '20

From 06ba7d3e64e55262bf818084904eec7b7320a2ad Mon Sep 17 00:00:00 2001 From: Marius Iacob <themariusus(a)gmail.com> Date: Wed, 29 Jul 2020 16:51:41 +0300 Subject: [PATCH] Added orientation quirk for ASUS tablet model T103HAF --- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c index d00ea384dcbf..58f5dc2f6dd5 100644 --- a/drivers/gpu/drm/drm_panel_orientation_quirks.c +++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c @@ -121,6 +121,12 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T101HA"), }, .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* Asus T103HAF */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, }, { /* GPD MicroPC (generic strings, also match on bios date) */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"), -- 2.27.0

2 1

[PATCH] drm: re-add deleted doc for drm_gem_open_ioctl
by Steve Cohen 31 Jul '20

31 Jul '20

Add back the removed documentation for drm_gem_open_ioctl. This patch is submitted in response to [1]. [1] https://lore.kernel.org/linux-arm-msm/20200728085244.GY6419@phenom.ffwll.lo… Signed-off-by: Steve Cohen <cohens(a)codeaurora.org> --- drivers/gpu/drm/drm_gem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index ee2058a..fe94122 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -871,6 +871,9 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data, * @file_priv: drm file-private structure * * Open an object using the global name, returning a handle and the size. + * + * This handle (of course) holds a reference to the object, so the object + * will not go away until the handle is deleted. */ int drm_gem_open_ioctl(struct drm_device *dev, void *data, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

2 1

[PATCH] drm/vkms: Fix soft lockup.
by Xu Qiang 31 Jul '20

31 Jul '20

A soft deadlock occurs when call hrtimer_cancel in softirq context: a) The main frequency of the machine is very slow b) output->period_ns is very small, even only 1 ns The problem can be solved in the following way: Setting a hrtimer exit flag in the vkms_disable_vblank function and checking the flag in the vkms_vblank_simulate function. If the flag is set, the hrtimer is not added to hrtimer queue again,the hrtimer_cancel function can exit quickly without deadlock. watchdog: BUG: soft lockup - CPU#2 stuck for 134s! [syz-executor.2:18027] Modules linked in: CPU: 2 PID: 18027 Comm: syz-executor.2 Tainted: G W 5.8.0-rc2-csan #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 RIP: 0010:csd_lock_wait kernel/smp.c:108 [inline] RIP: 0010:smp_call_function_many_cond+0x40c/0x470 kernel/smp.c:555 RSP: 0018:ffffc900028d3a88 EFLAGS: 00000297 RAX: 0000000000000002 RBX: ffff888237cacc80 RCX: ffffffff813240fc RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000005 RBP: 0000000000000001 R08: ffff8881f497d000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000100 R12: ffff888237cf6fc0 R13: 0000000000000003 R14: ffff888237cacc88 R15: 0000000000000001 FS: 00007fa6314a9700(0000) GS:ffff888237c80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000513c80 CR3: 00000001e3df3002 CR4: 00000000000626e0 Call Trace: smp_call_function_many kernel/smp.c:577 [inline] smp_call_function+0x40/0x80 kernel/smp.c:599 on_each_cpu+0x2a/0xc0 kernel/smp.c:717 __purge_vmap_area_lazy+0x7c/0xbc0 mm/vmalloc.c:1367 _vm_unmap_aliases.part.0+0x126/0x180 mm/vmalloc.c:1800 _vm_unmap_aliases mm/vmalloc.c:1769 [inline] vm_unmap_aliases+0x2f/0x40 mm/vmalloc.c:1823 change_page_attr_set_clr+0x10a/0x4a0 arch/x86/mm/pat/set_memory.c:1732 change_page_attr_clear arch/x86/mm/pat/set_memory.c:1789 [inline] set_memory_ro+0x2b/0x40 arch/x86/mm/pat/set_memory.c:1935 bpf_jit_binary_lock_ro include/linux/filter.h:815 [inline] bpf_int_jit_compile+0x54f/0x663 arch/x86/net/bpf_jit_comp.c:1929 bpf_prog_select_runtime+0x1cc/0x2c0 kernel/bpf/core.c:1807 bpf_migrate_filter net/core/filter.c:1264 [inline] bpf_prepare_filter net/core/filter.c:1312 [inline] bpf_prepare_filter+0x518/0x620 net/core/filter.c:1278 __get_filter+0x107/0x160 net/core/filter.c:1481 sk_attach_filter+0x19/0xa0 net/core/filter.c:1496 sock_setsockopt+0x1208/0x1230 net/core/sock.c:1080 __sys_setsockopt+0x248/0x270 net/socket.c:2123 __do_sys_setsockopt net/socket.c:2143 [inline] __se_sys_setsockopt net/socket.c:2140 [inline] __x64_sys_setsockopt+0x22/0x30 net/socket.c:2140 do_syscall_64+0x48/0xb0 arch/x86/entry/common.c:359 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Sending NMI from CPU 2 to CPUs 0-1,3-5: NMI backtrace for cpu 4 skipped: idling at native_safe_halt+0xe/0x10 arch/x86/include/asm/irqflags.h:60 NMI backtrace for cpu 0 skipped: idling at native_safe_halt+0xe/0x10 arch/x86/include/asm/irqflags.h:60 NMI backtrace for cpu 1 NMI backtrace for cpu 3 CPU: 3 PID: 0 Comm: swapper/3 Tainted: G W 5.8.0-rc2-csan #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 RIP: 0010:preempt_count arch/x86/include/asm/preempt.h:26 [inline] RIP: 0010:preempt_count_sub+0xa/0x90 kernel/sched/core.c:3874 RSP: 0018:ffffc9000012cdd0 EFLAGS: 00000046 RAX: 0000000000000001 RBX: ffff88822ecb8fb0 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000086 RDI: 0000000000000001 RBP: ffff888237d5edc0 R08: ffff888236ddc000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 00000000ffffffff R13: 0000000000000086 R14: ffff888237d5edc0 R15: ffffffff85bc6d60 FS: 0000000000000000(0000) GS:ffff888237cc0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f35cc47adb8 CR3: 0000000005a23006 CR4: 00000000000626e0 Call Trace: <IRQ> __raw_spin_unlock_irqrestore include/linux/spinlock_api_smp.h:161 [inline] _raw_spin_unlock_irqrestore+0x2f/0x50 kernel/locking/spinlock.c:191 unlock_hrtimer_base kernel/time/hrtimer.c:898 [inline] hrtimer_try_to_cancel kernel/time/hrtimer.c:1171 [inline] hrtimer_try_to_cancel+0xbd/0x1b0 kernel/time/hrtimer.c:1151 hrtimer_cancel+0x13/0x40 kernel/time/hrtimer.c:1278 __disable_vblank drivers/gpu/drm/drm_vblank.c:429 [inline] drm_vblank_disable_and_save+0x122/0x140 drivers/gpu/drm/drm_vblank.c:470 vblank_disable_fn+0x96/0xa0 drivers/gpu/drm/drm_vblank.c:487 call_timer_fn+0x3a/0x230 kernel/time/timer.c:1404 expire_timers kernel/time/timer.c:1449 [inline] __run_timers kernel/time/timer.c:1773 [inline] __run_timers kernel/time/timer.c:1740 [inline] run_timer_softirq+0x2b8/0x840 kernel/time/timer.c:1786 __do_softirq+0x118/0x344 kernel/softirq.c:292 asm_call_on_stack+0xf/0x20 arch/x86/entry/entry_64.S:711 </IRQ> __run_on_irqstack arch/x86/include/asm/irq_stack.h:22 [inline] run_on_irqstack_cond arch/x86/include/asm/irq_stack.h:48 [inline] do_softirq_own_stack+0x5a/0x70 arch/x86/kernel/irq_64.c:77 invoke_softirq kernel/softirq.c:387 [inline] __irq_exit_rcu kernel/softirq.c:417 [inline] irq_exit_rcu+0xb1/0xd0 kernel/softirq.c:429 sysvec_apic_timer_interrupt+0x42/0xd0 arch/x86/kernel/apic/apic.c:1091 asm_sysvec_apic_timer_interrupt+0x12/0x20 arch/x86/include/asm/idtentry.h:596 ------------[ cut here ]------------ WARNING: CPU: 5 PID: 8121 at drivers/gpu/drm/vkms/vkms_crtc.c:21 vkms_vblank_simulate+0x19a/0x1b0 drivers/gpu/drm/vkms/vkms_crtc.c:21 Modules linked in: CPU: 5 PID: 8121 Comm: syslog-ng Tainted: G W 5.8.0-rc2-csan #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 RIP: 0010:vkms_vblank_simulate+0x19a/0x1b0 drivers/gpu/drm/vkms/vkms_crtc.c:21 RSP: 0018:ffffc90000184ee8 EFLAGS: 00010046 RAX: ffff88822864a080 RBX: ffff88822ecb8fb0 RCX: ffffffff826cd2b0 RDX: 0000000080010000 RSI: ffffffff826cd40a RDI: 0000000000000007 RBP: 00000000001f058d R08: ffff88822864a080 R09: 7fffffffffffffff R10: 0000000000000000 R11: 0000000000000000 R12: ffff88822ecb8630 R13: 0000000000000000 R14: 0000017998a35917 R15: ffff888237d5ed80 FS: 00007f8dcbde0700(0000) GS:ffff888237d40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffff600400 CR3: 000000022575f002 CR4: 00000000000626e0 Call Trace: <IRQ> __run_hrtimer kernel/time/hrtimer.c:1520 [inline] __hrtimer_run_queues+0x14c/0x410 kernel/time/hrtimer.c:1584 hrtimer_interrupt+0x141/0x2c0 kernel/time/hrtimer.c:1646 local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1080 [inline] __sysvec_apic_timer_interrupt+0x6e/0x170 arch/x86/kernel/apic/apic.c:1097 asm_call_on_stack+0xf/0x20 arch/x86/entry/entry_64.S:711 </IRQ> __run_on_irqstack arch/x86/include/asm/irq_stack.h:22 [inline] run_on_irqstack_cond arch/x86/include/asm/irq_stack.h:48 [inline] sysvec_apic_timer_interrupt+0xa9/0xd0 arch/x86/kernel/apic/apic.c:1091 asm_sysvec_apic_timer_interrupt+0x12/0x20 arch/x86/include/asm/idtentry.h:596 RIP: 0010:con_should_update drivers/tty/vt/vt.c:291 [inline] RIP: 0010:do_con_write.part.0+0xad6/0xfa0 drivers/tty/vt/vt.c:2790 ---[ end trace d6a6c6a9ecb73597 ]--- NMI backtrace for cpu 5 skipped: idling at native_halt+0xd/0x10 arch/x86/include/asm/irqflags.h:66 Cc: stable(a)vger.kernel.org Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Xu Qiang <xuqiang36(a)huawei.com> --- drivers/gpu/drm/vkms/vkms_crtc.c | 5 ++++- drivers/gpu/drm/vkms/vkms_drv.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index ac85e17428f8..655294f11bb8 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -49,7 +49,7 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) DRM_DEBUG_DRIVER("Composer worker already queued\n"); } - return HRTIMER_RESTART; + return output->hrtimer_exit ? HRTIMER_NORESTART : HRTIMER_RESTART; } static int vkms_enable_vblank(struct drm_crtc *crtc) @@ -66,6 +66,8 @@ static int vkms_enable_vblank(struct drm_crtc *crtc) out->period_ns = ktime_set(0, vblank->framedur_ns); hrtimer_start(&out->vblank_hrtimer, out->period_ns, HRTIMER_MODE_REL); + out->hrtimer_exit = false; + return 0; } @@ -73,6 +75,7 @@ static void vkms_disable_vblank(struct drm_crtc *crtc) { struct vkms_output *out = drm_crtc_to_vkms_output(crtc); + out->hrtimer_exit = true; hrtimer_cancel(&out->vblank_hrtimer); } diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index f4036bb0b9a8..4d4323dc2cfd 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -65,6 +65,7 @@ struct vkms_output { struct drm_connector connector; struct hrtimer vblank_hrtimer; ktime_t period_ns; + bool hrtimer_exit; struct drm_pending_vblank_event *event; /* ordered wq for composer_work */ struct workqueue_struct *composer_workq; -- 2.25.0

2 1

[PATCH 0/2] Small cleanups to ingenic-drm driver
by Paul Cercueil 31 Jul '20

31 Jul '20

Here are a few cleanups to the ingenic-drm driver. - some error paths were missing and have been added; - the mode validation has been moved to the .mode_valid helper callback. Cheers, -Paul Paul Cercueil (2): drm/ingenic: Handle errors of drm_atomic_get_plane_state drm/ingenic: Validate mode in a .mode_valid callback drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 41 +++++++++++++++-------- 1 file changed, 27 insertions(+), 14 deletions(-) -- 2.27.0

3 6

← Newer
1
...
19
20
21
22
23
24
25
...
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