+1

.mailmap

reviewed

··· 19 19 Ahmad Masri <quic_amasri@quicinc.com> <amasri@codeaurora.org> 20 20 Adam Oldham <oldhamca@gmail.com> 21 21 Adam Radford <aradford@gmail.com> 22 22 + Aditya Garg <gargaditya08@proton.me> <gargaditya08@live.com> 22 23 Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com> 23 24 Adrian Bunk <bunk@stusta.de> 24 25 Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>

+1 -1

MAINTAINERS

reviewed

··· 7873 7873 7874 7874 DRM DRIVER FOR APPLE TOUCH BARS 7875 7875 M: Aun-Ali Zaidi <admin@kodeit.net> 7876 7876 - M: Aditya Garg <gargaditya08@live.com> 7876 7876 + M: Aditya Garg <gargaditya08@proton.me> 7877 7877 L: dri-devel@lists.freedesktop.org 7878 7878 S: Maintained 7879 7879 T: git https://gitlab.freedesktop.org/drm/misc/kernel.git

+1 -1

drivers/gpu/drm/drm_color_mgmt.c

reviewed

··· 831 831 } 832 832 833 833 /** 834 834 - * drm_crtc_fill_palette_332 - Programs a default palette for R332-like formats 834 834 + * drm_crtc_fill_palette_332 - Programs a default palette for RGB332-like formats 835 835 * @crtc: The displaying CRTC 836 836 * @set_palette: Callback for programming the hardware gamma LUT 837 837 *

+2 -2

drivers/gpu/drm/drm_gem_framebuffer_helper.c

reviewed

··· 172 172 } 173 173 174 174 for (i = 0; i < info->num_planes; i++) { 175 175 - unsigned int width = mode_cmd->width / (i ? info->hsub : 1); 176 176 - unsigned int height = mode_cmd->height / (i ? info->vsub : 1); 175 175 + unsigned int width = drm_format_info_plane_width(info, mode_cmd->width, i); 176 176 + unsigned int height = drm_format_info_plane_height(info, mode_cmd->height, i); 177 177 unsigned int min_size; 178 178 179 179 objs[i] = drm_gem_object_lookup(file, mode_cmd->handles[i]);

+1 -1

drivers/gpu/drm/imagination/pvr_fw_trace.c

reviewed

··· 558 558 &pvr_fw_trace_fops); 559 559 } 560 560 561 561 - debugfs_create_file("trace_mask", 0600, dir, fw_trace, 561 561 + debugfs_create_file("trace_mask", 0600, dir, pvr_dev, 562 562 &pvr_fw_trace_mask_fops); 563 563 }

+2

drivers/gpu/drm/sysfb/ofdrm.c

reviewed

··· 350 350 struct pci_dev *pcidev = data; 351 351 352 352 pci_disable_device(pcidev); 353 353 + pci_dev_put(pcidev); 353 354 } 354 355 355 356 static int ofdrm_device_init_pci(struct ofdrm_device *odev) ··· 376 375 if (ret) { 377 376 drm_err(dev, "pci_enable_device(%s) failed: %d\n", 378 377 dev_name(&pcidev->dev), ret); 378 378 + pci_dev_put(pcidev); 379 379 return ret; 380 380 } 381 381 ret = devm_add_action_or_reset(&pdev->dev, ofdrm_pci_release, pcidev);

+2 -2

drivers/gpu/drm/tiny/appletbdrm.c

reviewed

··· 353 353 frames_size + 354 354 sizeof(struct appletbdrm_fb_request_footer), 16); 355 355 356 356 - appletbdrm_state->request = kzalloc(request_size, GFP_KERNEL); 356 356 + appletbdrm_state->request = kvzalloc(request_size, GFP_KERNEL); 357 357 358 358 if (!appletbdrm_state->request) 359 359 return -ENOMEM; ··· 543 543 { 544 544 struct appletbdrm_plane_state *appletbdrm_state = to_appletbdrm_plane_state(state); 545 545 546 546 - kfree(appletbdrm_state->request); 546 546 + kvfree(appletbdrm_state->request); 547 547 kfree(appletbdrm_state->response); 548 548 549 549 __drm_gem_destroy_shadow_plane_state(&appletbdrm_state->base);

+1 -2

drivers/gpu/drm/udl/udl_main.c

reviewed

··· 285 285 return unode->urb; 286 286 } 287 287 288 288 - #define GET_URB_TIMEOUT HZ 289 288 struct urb *udl_get_urb(struct udl_device *udl) 290 289 { 291 290 struct urb *urb; 292 291 293 292 spin_lock_irq(&udl->urbs.lock); 294 294 - urb = udl_get_urb_locked(udl, GET_URB_TIMEOUT); 293 293 + urb = udl_get_urb_locked(udl, HZ * 2); 295 294 spin_unlock_irq(&udl->urbs.lock); 296 295 return urb; 297 296 }

+4 -1

drivers/gpu/drm/udl/udl_modeset.c

reviewed

··· 21 21 #include <drm/drm_gem_framebuffer_helper.h> 22 22 #include <drm/drm_gem_shmem_helper.h> 23 23 #include <drm/drm_modeset_helper_vtables.h> 24 24 + #include <drm/drm_print.h> 24 25 #include <drm/drm_probe_helper.h> 25 26 #include <drm/drm_vblank.h> 26 27 ··· 343 342 return; 344 343 345 344 urb = udl_get_urb(udl); 346 346 - if (!urb) 345 345 + if (!urb) { 346 346 + drm_err_ratelimited(dev, "get urb failed when enabling crtc\n"); 347 347 goto out; 348 348 + } 348 349 349 350 buf = (char *)urb->transfer_buffer; 350 351 buf = udl_vidreg_lock(buf);

+2 -2

include/linux/dma-buf.h

reviewed

··· 322 322 * @vmapping_counter: 323 323 * 324 324 * Used internally to refcnt the vmaps returned by dma_buf_vmap(). 325 325 - * Protected by @lock. 325 325 + * Protected by @resv. 326 326 */ 327 327 unsigned vmapping_counter; 328 328 329 329 /** 330 330 * @vmap_ptr: 331 331 - * The current vmap ptr if @vmapping_counter > 0. Protected by @lock. 331 331 + * The current vmap ptr if @vmapping_counter > 0. Protected by @resv. 332 332 */ 333 333 struct iosys_map vmap_ptr; 334 334