Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9cc54ee authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/atomic: Update old_fb after setting a property. 



This change updates the old_fb pointer only after acquiring the plane lock,
if there are no properties the fb cannot have been changed either, so
this works out correctly.

Found in a discussion with Rob Clark.

Cc: Rob Clark <robdclark@gmail.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0d0b49c5

drivers/gpu/drm/drm_atomic.c

+6 −6
Original line number Diff line number Diff line
@@ -1472,12 +1472,6 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
			goto fail;

		}



		if (obj->type == DRM_MODE_OBJECT_PLANE) {

			plane = obj_to_plane(obj);

			plane_mask |= (1 << drm_plane_index(plane));

			plane->old_fb = plane->fb;

		}



		if (get_user(count_props, count_props_ptr + copied_objs)) {

			ret = -EFAULT;

			goto fail;
@@ -1514,6 +1508,12 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 


			copied_props++;

		}



		if (obj->type == DRM_MODE_OBJECT_PLANE && count_props) {

			plane = obj_to_plane(obj);

			plane_mask |= (1 << drm_plane_index(plane));

			plane->old_fb = plane->fb;

		}

	}



	if (arg->flags & DRM_MODE_PAGE_FLIP_EVENT) {