diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:18:46 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:18:46 +0100 |
| commit | f573fd96c0d6b6dfb2a91605a211dd15cb3153d4 (patch) | |
| tree | ab706afb1df5131b258a6ff01ed25cdd7bd16825 /mali_kbase/mali_kbase_event.c | |
| parent | d31cf595e359c7bde5c272f5b729c86277148e52 (diff) | |
| parent | fca8613cfcf585bf9113dca96a05daea9fd89794 (diff) | |
| download | gpu-f573fd96c0d6b6dfb2a91605a211dd15cb3153d4.tar.gz | |
Merge r31p0 from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r31p0 from
commit fca8613cfcf585bf9113dca96a05daea9fd89794
Bug: 185900681
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I3c814b6145b10beee3d0fecedb74a6225a09a858
Diffstat (limited to 'mali_kbase/mali_kbase_event.c')
| -rw-r--r-- | mali_kbase/mali_kbase_event.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mali_kbase/mali_kbase_event.c b/mali_kbase/mali_kbase_event.c index bde72e8..7f72b95 100644 --- a/mali_kbase/mali_kbase_event.c +++ b/mali_kbase/mali_kbase_event.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * - * (C) COPYRIGHT 2010-2016,2018-2020 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2010-2016,2018-2021 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -42,7 +42,7 @@ static struct base_jd_udata kbase_event_process(struct kbase_context *kctx, stru KBASE_TLSTREAM_TL_DEL_ATOM(kbdev, katom); katom->status = KBASE_JD_ATOM_STATE_UNUSED; - dev_dbg(kbdev->dev, "Atom %p status to unused\n", (void *)katom); + dev_dbg(kbdev->dev, "Atom %pK status to unused\n", (void *)katom); wake_up(&katom->completed); return data; @@ -79,7 +79,7 @@ int kbase_event_dequeue(struct kbase_context *ctx, struct base_jd_event_v2 *ueve mutex_unlock(&ctx->event_mutex); - dev_dbg(ctx->kbdev->dev, "event dequeuing %p\n", (void *)atom); + dev_dbg(ctx->kbdev->dev, "event dequeuing %pK\n", (void *)atom); uevent->event_code = atom->event_code; uevent->atom_number = (atom - ctx->jctx.atoms); @@ -164,11 +164,11 @@ void kbase_event_post(struct kbase_context *ctx, struct kbase_jd_atom *atom) { struct kbase_device *kbdev = ctx->kbdev; - dev_dbg(kbdev->dev, "Posting event for atom %p\n", (void *)atom); + dev_dbg(kbdev->dev, "Posting event for atom %pK\n", (void *)atom); if (WARN_ON(atom->status != KBASE_JD_ATOM_STATE_COMPLETED)) { dev_warn(kbdev->dev, - "%s: Atom %d (%p) not completed (status %d)\n", + "%s: Atom %d (%pK) not completed (status %d)\n", __func__, kbase_jd_atom_id(atom->kctx, atom), atom->kctx, |