From: Dave Airlie <airlied@gmail.com>
To: dri-devel@lists.freedesktop.org
Subject: [PATCH 11/15] drm/modes: stop handling framebuffer special
Date: Fri, 15 Apr 2016 15:10:42 +1000 [thread overview]
Message-ID: <1460697046-23781-12-git-send-email-airlied@gmail.com> (raw)
In-Reply-To: <1460697046-23781-1-git-send-email-airlied@gmail.com>
From: Dave Airlie <airlied@redhat.com>
Since ref counting is in the object now we can just call the
normal interfaces.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/gpu/drm/drm_crtc.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 46f32f2..f6bf828 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -4810,19 +4810,7 @@ bool drm_property_change_valid_get(struct drm_property *property,
if (value == 0)
return true;
- /* handle refcnt'd objects specially: */
- if (property->values[0] == DRM_MODE_OBJECT_FB) {
- struct drm_framebuffer *fb;
- fb = drm_framebuffer_lookup(property->dev, value);
- if (fb) {
- *ref = &fb->base;
- return true;
- } else {
- return false;
- }
- } else {
- return _object_find(property->dev, value, property->values[0]) != NULL;
- }
+ return _object_find(property->dev, value, property->values[0]) != NULL;
}
for (i = 0; i < property->num_values; i++)
@@ -4838,8 +4826,7 @@ void drm_property_change_valid_put(struct drm_property *property,
return;
if (drm_property_type_is(property, DRM_MODE_PROP_OBJECT)) {
- if (property->values[0] == DRM_MODE_OBJECT_FB)
- drm_framebuffer_unreference(obj_to_fb(ref));
+ drm_mode_object_unreference(ref);
} else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB))
drm_property_unreference_blob(obj_to_blob(ref));
}
--
2.5.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-04-15 5:10 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-15 5:10 drm reference counter connectors and fix lifetimes Dave Airlie
2016-04-15 5:10 ` [PATCH 01/15] drm/mode: rework drm_mode_object_put to drm_mode_object_unregister Dave Airlie
2016-04-21 8:03 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 02/15] drm/mode: move framebuffer_free up above framebuffer_init Dave Airlie
2016-04-21 8:03 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 03/15] drm/modes: drop __drm_framebuffer_unregister Dave Airlie
2016-04-21 8:05 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 04/15] drm/mode: introduce wrapper to read framebuffer refcount Dave Airlie
2016-04-21 8:07 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 05/15] drm/mode: move framebuffer reference into object Dave Airlie
2016-04-21 8:12 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 06/15] drm/mode: use _object_find to find framebuffers Dave Airlie
2016-04-21 8:14 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 07/15] drm/mode: reduce scope of fb_lock in framebuffer init Dave Airlie
2016-04-21 8:54 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 08/15] drm/mode: reduce lock hold in addfb2 Dave Airlie
2016-04-21 8:59 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 09/15] drm/modes: move reference taking into object lookup Dave Airlie
2016-04-21 9:05 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 10/15] drm/modes: reduce fb_lock to just protecting lists Dave Airlie
2016-04-21 9:06 ` Daniel Vetter
2016-04-15 5:10 ` Dave Airlie [this message]
2016-04-21 9:06 ` [PATCH 11/15] drm/modes: stop handling framebuffer special Daniel Vetter
2016-04-15 5:10 ` [PATCH 12/15] drm/modes: add connector reference counting Dave Airlie
2016-04-22 9:24 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 13/15] drm: take references to connectors used in a modeset Dave Airlie
2016-04-22 8:49 ` Daniel Vetter
2016-04-27 1:44 ` Dave Airlie
2016-04-15 5:10 ` [PATCH 14/15] drm/i915/mst: use reference counted connectors Dave Airlie
2016-04-22 9:03 ` Daniel Vetter
2016-04-27 1:54 ` Dave Airlie
2016-04-27 6:29 ` Daniel Vetter
2016-04-15 5:10 ` [PATCH 15/15] drm/radeon/dp_mst: use connector ref counting Dave Airlie
2016-04-22 9:04 ` Daniel Vetter
2016-04-21 9:08 ` drm reference counter connectors and fix lifetimes Daniel Vetter
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=1460697046-23781-12-git-send-email-airlied@gmail.com \
--to=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.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).