Merge tag 'drm-msm-next-2021-07-28' of https://gitlab.freedesktop.org/drm/msm into...

An early pull for v5.15 (there'll be more coming in a week or two),
consisting of the drm/scheduler conversion and a couple other small
series that one was based one.  Mostly sending this now because IIUC
danvet wanted it in drm-next so he could rebase on it.  (Daniel, if
you disagree then speak up, and I'll instead include this in the main
pull request once that is ready.)

This also has a core patch to drop drm_gem_object_put_locked() now
that the last use of it is removed.

[airlied: add NULL to drm_sched_init]

Signed-off-by: Dave Airlie <[email protected]>
From: Rob Clark <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGumRk7H88bqV=H9Fb1SM0zPBo5B7NsCU3jFFKBYxf5k+Q@mail.gmail.com

diff --cc drivers/gpu/drm/drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem_submit.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_ringbuffer.c
index 4d2a2a4abef8b0308aceaf55775bc16adce86a69,793dd853b7998a0308cf11124457ccb5a63509de..bd54c14126497e34d26c342dcf208d6e3a65e7c5
--- 1/drivers/gpu/drm/msm/msm_ringbuffer.c
--- 2/drivers/gpu/drm/msm/msm_ringbuffer.c
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@@ -45,6 -96,16 +96,16 @@@ struct msm_ringbuffer *msm_ringbuffer_n
        ring->memptrs = memptrs;
        ring->memptrs_iova = memptrs_iova;
  
 -                      NULL, to_msm_bo(ring->bo)->name);
+        /* currently managing hangcheck ourselves: */
+       sched_timeout = MAX_SCHEDULE_TIMEOUT;
+ 
+       ret = drm_sched_init(&ring->sched, &msm_sched_ops,
+                       num_hw_submissions, 0, sched_timeout,
++                      NULL, NULL, to_msm_bo(ring->bo)->name);
+       if (ret) {
+               goto fail;
+       }
+ 
        INIT_LIST_HEAD(&ring->submits);
        spin_lock_init(&ring->submit_lock);
        spin_lock_init(&ring->preempt_lock);