1. 13 Jan, 2023 2 commits
  2. 12 Jan, 2023 1 commit
    • Maíra Canal's avatar
      drm/vkms: reintroduce prepare_fb and cleanup_fb functions · 6e41acd2
      Maíra Canal authored
      With commit 359c6649 ("drm/gem: Implement shadow-plane {begin,
      end}_fb_access with vmap"), the behavior of the shadow-plane helpers
      changed and the vunmap is now performed at the end of
      the current pageflip, instead of the end of the following pageflip.
      
      By performing the vunmap at the end of the current pageflip, invalid
      memory is accessed by the vkms during the plane composition, as the data
      is being unmapped before being used, as reported by the following
      warning:
      
       [  275.866047] BUG: unable to handle page fault for address: ffffb382814e8002
       [  275.866055] #PF: supervisor read access in kernel mode
       [  275.866058] #PF: error_code(0x0000) - not-present page
       [  275.866061] PGD 1000067 P4D 1000067 PUD 110a067 PMD 46e3067 PTE 0
       [  275.866066] Oops: 0000 [#1] PREEMPT SMP PTI
       [  275.866070] CPU: 2 PID: 49 Comm: kworker/u8:2 Not tainted 6.1.0-rc6-00018-gb357e7ac-dirty #54
       [  275.866074] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014
       [  275.866076] Workqueue: vkms_composer vkms_composer_worker [vkms]
       [  275.866084] RIP: 0010:XRGB8888_to_argb_u16+0x5c/0xa0 [vkms]
       [  275.866092] Code: bf 56 0a 0f af 56 70 48 8b 76 28 01 ca 49 83 f8 02
       41 b9 01 00 00 00 4d 0f 43 c8 48 01 f2 48 83 c2 02 31 f6 66 c7 04 f0 ff
       ff <0f> b6 0c b2 89 cf c1 e7 08 09 cf 66 89 7c f0 02 0f b6 4c b2 ff 89
       [  275.866095] RSP: 0018:ffffb382801b7db0 EFLAGS: 00010246
       [  275.866098] RAX: ffff896336ace000 RBX: ffff896310e293c0 RCX: 0000000000000000
       [  275.866101] RDX: ffffb382814e8002 RSI: 0000000000000000 RDI: ffffb382801b7de8
       [  275.866103] RBP: 0000000000001400 R08: 0000000000000280 R09: 0000000000000280
       [  275.866105] R10: 0000000000000010 R11: ffffffffc011d990 R12: ffff896302a1ece0
       [  275.866107] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000080008001
       [  275.866109] FS:  0000000000000000(0000) GS:ffff89637dd00000(0000) knlGS:0000000000000000
       [  275.866112] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
       [  275.866114] CR2: ffffb382814e8002 CR3: 0000000003bb4000 CR4: 00000000000006e0
       [  275.866120] Call Trace:
       [  275.866123]  <TASK>
       [  275.866124]  compose_active_planes+0x1c4/0x380 [vkms]
       [  275.866132]  vkms_composer_worker+0x9f/0x130 [vkms]
       [  275.866139]  process_one_work+0x1c0/0x370
       [  275.866160]  worker_thread+0x221/0x410
       [  275.866164]  ? worker_clr_flags+0x50/0x50
       [  275.866167]  kthread+0xe1/0x100
       [  275.866172]  ? kthread_blkcg+0x30/0x30
       [  275.866176]  ret_from_fork+0x22/0x30
       [  275.866181]  </TASK>
       [  275.866182] Modules linked in: vkms
       [  275.866186] CR2: ffffb382814e8002
       [  275.866191] ---[ end trace 0000000000000000 ]---
      
      Therefore, introduce again prepare_fb and cleanup_fb functions to the
      vkms, which were previously removed on commit b43e2ec0 ("drm/vkms:
      Let shadow-plane helpers prepare the plane's FB").
      
      Fixes: 359c6649 ("drm/gem: Implement shadow-plane {begin, end}_fb_access with vmap")
      Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
      Signed-off-by: default avatarMelissa Wen <melissa.srw@gmail.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20230111131304.106039-1-mcanal@igalia.com
      6e41acd2
  3. 11 Jan, 2023 16 commits
  4. 10 Jan, 2023 21 commits