From: Eric Anholt <eric@anholt.net>
To: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org, Eric Anholt <eric@anholt.net>
Subject: [PATCH] drm: shmem helper fixups.
Date: Mon, 26 Nov 2018 13:54:15 -0800 [thread overview]
Message-ID: <20181126215415.19397-1-eric@anholt.net> (raw)
In-Reply-To: <Message-Id: <20181017130454.44292-5-noralf@tronnes.org>
The prime_mmap was removed in a later review change, and the kfree
needs to use obj because shmem is initialized later on.
Signed-off-by: Eric Anholt <eric@anholt.net>
---
With these changes to Noralf's patch, it's:
Tested-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 7471856d34ac..a0f9df8a6721 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -31,7 +31,6 @@ static const struct drm_gem_object_funcs drm_gem_shmem_funcs = {
.get_sg_table = drm_gem_shmem_get_sg_table,
.vmap = drm_gem_shmem_vmap,
.vunmap = drm_gem_shmem_vunmap,
- .prime_mmap = drm_gem_shmem_prime_mmap,
.vm_ops = &drm_gem_shmem_vm_ops,
};
@@ -81,7 +80,7 @@ struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t
err_release:
drm_gem_object_release(obj);
err_free:
- kfree(shmem);
+ kfree(obj);
return ERR_PTR(ret);
}
--
2.20.0.rc1
parent reply other threads:[~2018-11-26 21:54 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <Message-Id: <20181017130454.44292-5-noralf@tronnes.org>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181126215415.19397-1-eric@anholt.net \
--to=eric@anholt.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).