]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'drm-msm-next-2021-07-28' of https://gitlab.freedesktop.org/drm/msm into...
authorDave Airlie <airlied@redhat.com>
Fri, 30 Jul 2021 06:05:58 +0000 (16:05 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 30 Jul 2021 06:24:01 +0000 (16:24 +1000)
commit4172c213d600682a686e3a7553959f7d11b9c088
tree5f4341566519775e2d6a3a6c0c3654e5b2e57982
parent97ce420d2534e25ff3b038f3bb077f85f087750c
parenta98a7b5fefc8c341bd0b29e83be375b01ae59936
Merge tag 'drm-msm-next-2021-07-28' of https://gitlab.freedesktop.org/drm/msm into drm-next

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 <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGumRk7H88bqV=H9Fb1SM0zPBo5B7NsCU3jFFKBYxf5k+Q@mail.gmail.com
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/msm/msm_gem_submit.c
drivers/gpu/drm/msm/msm_ringbuffer.c