OpenCloudOS-Kernel/drivers/gpu/drm/lima
Daniel Vetter 99b03ca651 Linux 5.16-rc5
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmG2fU0eHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGC7EH/3R7Rt+OD8Wn8Ss3
 w8V+dBxVwa2u2oMTyUHPxaeOXZ7bi38XlUdLFPOK/76bGwO0a5TmYZqsWdRbGyT0
 HfcYjHsQ0lbJXk/nh2oM47oJxJXVpThIHXJEk0FZ0Y5t+DYjIYlNHzqZymUyhLem
 St74zgWcyT+MXuqY34vB827FJDUnOxhhhi85tObeunaSPAomy9aiYidSC1ARREnz
 iz2VUntP/QnRnKVvL2nUZNzcz1xL5vfCRSKsRGRSv3qW1Y/1M71ylt6JVmSftWq+
 VmMdFxFhdrb1OK/1ct/930Un/UP2NG9EJsWxote2XYlnVSZHzDqH7lUhbqgdCcLz
 1m2tVNY=
 =7wRd
 -----END PGP SIGNATURE-----

Merge v5.16-rc5 into drm-next

Thomas Zimmermann requested a fixes backmerge, specifically also for
96c5f82ef0 ("drm/vc4: fix error code in vc4_create_object()")

Just a bunch of adjacent changes conflicts, even the big pile of them
in vc4.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2021-12-14 10:24:28 +01:00
..
Kconfig drm/lima: Add optional devfreq and cooling device support 2020-03-28 16:29:46 +08:00
Makefile drm/lima: Add optional devfreq and cooling device support 2020-03-28 16:29:46 +08:00
lima_bcast.c drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_bcast.h drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_ctx.c drm/lima: save process info for debug usage 2020-03-22 09:34:33 +08:00
lima_ctx.h drm/lima: save process info for debug usage 2020-03-22 09:34:33 +08:00
lima_devfreq.c drm for 5.13-rc1 2021-04-28 10:01:40 -07:00
lima_devfreq.h drm for 5.13-rc1 2021-04-28 10:01:40 -07:00
lima_device.c Linux 5.16-rc5 2021-12-14 10:24:28 +01:00
lima_device.h drm/lima: add pm resume/suspend ops 2020-04-24 20:51:19 +08:00
lima_dlbu.c drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_dlbu.h drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_drv.c drm/lima/lima_drv: Demote kernel-doc formatting abuse 2020-11-16 08:20:10 +08:00
lima_drv.h drm/lima: Expose job_hang_limit module parameter 2020-07-13 13:47:41 +08:00
lima_dump.h drm/lima: save task info dump when task fail 2020-03-22 09:35:19 +08:00
lima_gem.c drm: Return error codes from struct drm_driver.gem_create_object 2021-12-02 11:12:39 +01:00
lima_gem.h drm/lima: support heap buffer creation 2020-01-27 22:01:09 +08:00
lima_gp.c drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_gp.h drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_l2_cache.c drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_l2_cache.h drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_mmu.c drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_mmu.h drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_pmu.c drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_pmu.h drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_pp.c drm/lima: fix wait pp reset timeout 2020-07-20 08:46:06 +08:00
lima_pp.h drm/lima: add resume/suspend callback for each ip 2020-04-24 20:51:10 +08:00
lima_regs.h drm/lima: update register info 2020-01-27 22:00:12 +08:00
lima_sched.c drm/shmem-helper: Pass GEM shmem object in public interfaces 2021-11-15 11:46:13 +01:00
lima_sched.h drm/lima: use scheduler dependency tracking 2021-08-30 10:58:20 +02:00
lima_trace.c drm/lima: add trace point for tasks 2020-03-22 09:57:21 +08:00
lima_trace.h treewide: Add missing semicolons to __assign_str uses 2021-06-30 09:19:14 -04:00
lima_vm.c drm: lima: fix common struct sg_table related issues 2020-09-10 08:18:35 +02:00
lima_vm.h drm/lima: check vm != NULL in lima_vm_put 2020-04-24 20:50:46 +08:00