diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-07-30 16:05:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-30 16:24:01 +1000 |
| commit | f1b7996551a40a4ebb551130c83077a0cabcb935 (patch) | |
| tree | 5f4341566519775e2d6a3a6c0c3654e5b2e57982 /include/drm | |
| parent | cfeeb0b5e09c28bd7eb1e5c514200595e15967aa (diff) | |
| parent | 4541e4f2225c30b0e9442be9eb2fb8b7086cdd1f (diff) | |
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
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_gem.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index 240049566592..35e7f44c2a75 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -384,8 +384,6 @@ drm_gem_object_put(struct drm_gem_object *obj) __drm_gem_object_put(obj); } -void drm_gem_object_put_locked(struct drm_gem_object *obj); - int drm_gem_handle_create(struct drm_file *file_priv, struct drm_gem_object *obj, u32 *handlep); |