diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-04-15 08:10:42 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-04-22 03:47:16 +0300 |
| commit | 027b3f8ba9277410c3191d72d1ed2c6146d8a668 (patch) | |
| tree | 298d00e4f25de27510302383d1da6359327c1b45 /drivers/gpu | |
| parent | 2ddea3fd94889331855ff311ff540e0b182dd216 (diff) | |
| download | linux-027b3f8ba9277410c3191d72d1ed2c6146d8a668.tar.xz | |
drm/modes: stop handling framebuffer special
Since ref counting is in the object now we can just call the
normal interfaces.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index bec2c3282db9..d078a5c34d48 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -4850,19 +4850,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++) @@ -4878,8 +4866,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)); } |