diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-05-31 14:03:18 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-01 07:00:05 +0200 |
| commit | 1e8985a835fdffc99f823c25ace54833656c505a (patch) | |
| tree | a27724548bdf427e1ed00be91e03d376a0beae3e | |
| parent | drm: make drm_atomic_set_mode_prop_for_crtc() more reliable (diff) | |
| download | linux-1e8985a835fdffc99f823c25ace54833656c505a.tar.xz linux-1e8985a835fdffc99f823c25ace54833656c505a.zip | |
drm: fix fb refcount issue with atomic modesetting
After commit 027b3f8ba9277410c3191d72d1ed2c6146d8a668 ("drm/modes: stop
handling framebuffer special") extra fb refs are left around when doing
atomic modesetting.
The problem is that the new drm_property_change_valid_get() does not
return anything in the '**ref' parameter, which causes
drm_property_change_valid_put() to do nothing.
For some reason this doesn't cause problems with legacy API.
Also, previously the code only set the 'ref' variable for fbs, with this
patch the 'ref' is set for all objects.
Fixes: 027b3f8ba927 ("drm/modes: stop handling framebuffer special")
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 06b6e2173697..0e3cc66aa8b7 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -4839,7 +4839,8 @@ bool drm_property_change_valid_get(struct drm_property *property, if (value == 0) return true; - return _object_find(property->dev, value, property->values[0]) != NULL; + *ref = _object_find(property->dev, value, property->values[0]); + return *ref != NULL; } for (i = 0; i < property->num_values; i++) |