Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'drm-misc-fixes-2024-05-30' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes

Short summary of fixes pull:

dma-buf:
- sw-sync: Don't interfere with IRQ handling
- Fix kthreads-handling error path

gem-shmem:
- Warn when trying to pin imported objects

lima:
- Fix dma_resv-related deadlock in object pin

msm:
- Remove build-time dependency on Python 3.9

nouveau:
- nvif: Fix possible integer overflow

panel:
- lg-sw43408: Select DP helpers; Declare backlight ops as static
- sitronix-st7789v: Various fixes for jt240mhqs_hwt_ek_e3 panel

panfrost:
- Fix dma_resv-related deadlock in object pin

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240530192307.GA14809@localhost.localdomain

+44 -21
+6
drivers/dma-buf/st-dma-fence.c
··· 540 540 t[i].before = pass; 541 541 t[i].task = kthread_run(thread_signal_callback, &t[i], 542 542 "dma-fence:%d", i); 543 + if (IS_ERR(t[i].task)) { 544 + ret = PTR_ERR(t[i].task); 545 + while (--i >= 0) 546 + kthread_stop_put(t[i].task); 547 + return ret; 548 + } 543 549 get_task_struct(t[i].task); 544 550 } 545 551
+2 -2
drivers/dma-buf/sync_debug.c
··· 110 110 111 111 seq_printf(s, "%s: %d\n", obj->name, obj->value); 112 112 113 - spin_lock_irq(&obj->lock); 113 + spin_lock(&obj->lock); /* Caller already disabled IRQ. */ 114 114 list_for_each(pos, &obj->pt_list) { 115 115 struct sync_pt *pt = container_of(pos, struct sync_pt, link); 116 116 sync_print_fence(s, &pt->base, false); 117 117 } 118 - spin_unlock_irq(&obj->lock); 118 + spin_unlock(&obj->lock); 119 119 } 120 120 121 121 static void sync_print_sync_file(struct seq_file *s,
+2
drivers/gpu/drm/drm_gem_shmem_helper.c
··· 233 233 234 234 dma_resv_assert_held(shmem->base.resv); 235 235 236 + drm_WARN_ON(shmem->base.dev, shmem->base.import_attach); 237 + 236 238 ret = drm_gem_shmem_get_pages(shmem); 237 239 238 240 return ret;
+1 -1
drivers/gpu/drm/lima/lima_gem.c
··· 185 185 if (bo->heap_size) 186 186 return -EINVAL; 187 187 188 - return drm_gem_shmem_pin(&bo->base); 188 + return drm_gem_shmem_pin_locked(&bo->base); 189 189 } 190 190 191 191 static int lima_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map)
+3 -2
drivers/gpu/drm/msm/registers/gen_header.py
··· 538 538 self.variants.add(reg.domain) 539 539 540 540 def do_validate(self, schemafile): 541 - if self.validate == False: 541 + if not self.validate: 542 542 return 543 543 544 544 try: ··· 948 948 parser = argparse.ArgumentParser() 949 949 parser.add_argument('--rnn', type=str, required=True) 950 950 parser.add_argument('--xml', type=str, required=True) 951 - parser.add_argument('--validate', action=argparse.BooleanOptionalAction) 951 + parser.add_argument('--validate', default=False, action='store_true') 952 + parser.add_argument('--no-validate', dest='validate', action='store_false') 952 953 953 954 subparsers = parser.add_subparsers() 954 955 subparsers.required = True
+18 -6
drivers/gpu/drm/nouveau/nvif/object.c
··· 142 142 struct nvif_ioctl_v0 ioctl; 143 143 struct nvif_ioctl_mthd_v0 mthd; 144 144 } *args; 145 + u32 args_size; 145 146 u8 stack[128]; 146 147 int ret; 147 148 148 - if (sizeof(*args) + size > sizeof(stack)) { 149 - if (!(args = kmalloc(sizeof(*args) + size, GFP_KERNEL))) 149 + if (check_add_overflow(sizeof(*args), size, &args_size)) 150 + return -ENOMEM; 151 + 152 + if (args_size > sizeof(stack)) { 153 + args = kmalloc(args_size, GFP_KERNEL); 154 + if (!args) 150 155 return -ENOMEM; 151 156 } else { 152 157 args = (void *)stack; ··· 162 157 args->mthd.method = mthd; 163 158 164 159 memcpy(args->mthd.data, data, size); 165 - ret = nvif_object_ioctl(object, args, sizeof(*args) + size, NULL); 160 + ret = nvif_object_ioctl(object, args, args_size, NULL); 166 161 memcpy(data, args->mthd.data, size); 167 162 if (args != (void *)stack) 168 163 kfree(args); ··· 281 276 object->map.size = 0; 282 277 283 278 if (parent) { 284 - if (!(args = kmalloc(sizeof(*args) + size, GFP_KERNEL))) { 279 + u32 args_size; 280 + 281 + if (check_add_overflow(sizeof(*args), size, &args_size)) { 282 + nvif_object_dtor(object); 283 + return -ENOMEM; 284 + } 285 + 286 + args = kmalloc(args_size, GFP_KERNEL); 287 + if (!args) { 285 288 nvif_object_dtor(object); 286 289 return -ENOMEM; 287 290 } ··· 306 293 args->new.oclass = oclass; 307 294 308 295 memcpy(args->new.data, data, size); 309 - ret = nvif_object_ioctl(parent, args, sizeof(*args) + size, 310 - &object->priv); 296 + ret = nvif_object_ioctl(parent, args, args_size, &object->priv); 311 297 memcpy(data, args->new.data, size); 312 298 kfree(args); 313 299 if (ret == 0)
+2
drivers/gpu/drm/panel/Kconfig
··· 340 340 depends on OF 341 341 depends on DRM_MIPI_DSI 342 342 depends on BACKLIGHT_CLASS_DEVICE 343 + select DRM_DISPLAY_DP_HELPER 344 + select DRM_DISPLAY_HELPER 343 345 help 344 346 Say Y here if you want to enable support for LG sw43408 panel. 345 347 The panel has a 1080x2160@60Hz resolution and uses 24 bit RGB per
+1 -1
drivers/gpu/drm/panel/panel-lg-sw43408.c
··· 182 182 return mipi_dsi_dcs_set_display_brightness_large(dsi, brightness); 183 183 } 184 184 185 - const struct backlight_ops sw43408_backlight_ops = { 185 + static const struct backlight_ops sw43408_backlight_ops = { 186 186 .update_status = sw43408_backlight_update_status, 187 187 }; 188 188
+8 -8
drivers/gpu/drm/panel/panel-sitronix-st7789v.c
··· 282 282 static const struct drm_display_mode jt240mhqs_hwt_ek_e3_mode = { 283 283 .clock = 6000, 284 284 .hdisplay = 240, 285 - .hsync_start = 240 + 28, 286 - .hsync_end = 240 + 28 + 10, 287 - .htotal = 240 + 28 + 10 + 10, 285 + .hsync_start = 240 + 38, 286 + .hsync_end = 240 + 38 + 10, 287 + .htotal = 240 + 38 + 10 + 10, 288 288 .vdisplay = 280, 289 - .vsync_start = 280 + 8, 290 - .vsync_end = 280 + 8 + 4, 291 - .vtotal = 280 + 8 + 4 + 4, 292 - .width_mm = 43, 293 - .height_mm = 37, 289 + .vsync_start = 280 + 48, 290 + .vsync_end = 280 + 48 + 4, 291 + .vtotal = 280 + 48 + 4 + 4, 292 + .width_mm = 37, 293 + .height_mm = 43, 294 294 .flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC, 295 295 }; 296 296
+1 -1
drivers/gpu/drm/panfrost/panfrost_gem.c
··· 192 192 if (bo->is_heap) 193 193 return -EINVAL; 194 194 195 - return drm_gem_shmem_pin(&bo->base); 195 + return drm_gem_shmem_pin_locked(&bo->base); 196 196 } 197 197 198 198 static enum drm_gem_object_status panfrost_gem_status(struct drm_gem_object *obj)