From: Russell King <rmk+kernel@arm.linux.org.uk>
To: Rob Clark <robdclark@gmail.com>, David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org
Subject: [PATCH RFC 4/4] DRM: Armada: prime refcounting bug fix
Date: Mon, 09 Dec 2013 00:10:24 +0000 [thread overview]
Message-ID: <E1VpoQa-0000qs-6g@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20131209000421.GV4360@n2100.arm.linux.org.uk>
Commit 011c2282c74d changed the way refcounting on imported dma_bufs
works, and this hadn't been spotted while forward-porting Armada.
Reflect the changes in that commit into the Armada driver.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
drivers/gpu/drm/armada/armada_gem.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index adc7c2da75bb..887816f43476 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -558,7 +558,6 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
* refcount on the gem object itself.
*/
drm_gem_object_reference(obj);
- dma_buf_put(buf);
return obj;
}
}
@@ -574,6 +573,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
}
dobj->obj.import_attach = attach;
+ get_dma_buf(buf);
/*
* Don't call dma_buf_map_attachment() here - it maps the
--
1.7.4.4
next prev parent reply other threads:[~2013-12-09 0:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 0:04 [PATCH 0/4] Armada DRM: four fixes Russell King - ARM Linux
2013-12-09 0:08 ` [PATCH RFC 1/4] DRM: Armada: implement lastclose() for fbhelper Russell King
2013-12-10 15:26 ` Thierry Reding
2013-12-09 0:08 ` [PATCH RFC 2/4] DRM: Armada: destroy framebuffer after helper Russell King
2013-12-10 15:26 ` Thierry Reding
2013-12-09 0:10 ` [PATCH RFC 3/4] DRM: Armada: fix printing of phys_addr_t/dma_addr_t Russell King
2013-12-10 15:30 ` Thierry Reding
2013-12-09 0:10 ` Russell King [this message]
2013-12-10 16:00 ` [PATCH RFC 4/4] DRM: Armada: prime refcounting bug fix Thierry Reding
2013-12-10 12:59 ` [PATCH 0/4] Armada DRM: four fixes Rob Clark
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=E1VpoQa-0000qs-6g@rmk-PC.arm.linux.org.uk \
--to=rmk+kernel@arm.linux.org.uk \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=robdclark@gmail.com \
/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