| Message ID | 1481812185-19098-2-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Dec 15, 2016 at 03:29:42PM +0100, Maarten Lankhorst wrote: > drm_atomic_state_put is called unconditionally, so TEST_ONLY is no > different from commit. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> I think it'd be good to update the kerneldoc for the atomic_commit callback to mention that drivers should grab their own references using drm_atomic_state_get() when they need it. Applied this one meanwhile, thanks. -Daniel > --- > drivers/gpu/drm/drm_atomic.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 60697482b94c..d1d252261bf1 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -2195,10 +2195,6 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, > goto out; > > if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) { > - /* > - * Unlike commit, check_only does not clean up state. > - * Below we call drm_atomic_state_put for it. > - */ > ret = drm_atomic_check_only(state); > } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) { > ret = drm_atomic_nonblocking_commit(state); > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 60697482b94c..d1d252261bf1 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -2195,10 +2195,6 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, goto out; if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) { - /* - * Unlike commit, check_only does not clean up state. - * Below we call drm_atomic_state_put for it. - */ ret = drm_atomic_check_only(state); } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) { ret = drm_atomic_nonblocking_commit(state);
drm_atomic_state_put is called unconditionally, so TEST_ONLY is no different from commit. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/drm_atomic.c | 4 ---- 1 file changed, 4 deletions(-)