Merge "Revert "drm/msm/sde: create release/retire fence once per commit"" (e830c0a3) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/drm/msm/sde/sde_connector.c

+14 −34

Original line number	Diff line number	Diff line
		@@ -1189,8 +1189,7 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
		struct sde_connector *c_conn;
		struct sde_connector_state *c_state;
		int idx, rc;
		uint64_t fence_user_fd;
		uint64_t __user prev_user_fd;
		uint64_t fence_fd;

		if (!connector \|\| !state \|\| !property) {
		SDE_ERROR("invalid argument(s), conn %pK, state %pK, prp %pK\n",
		@@ -1233,43 +1232,24 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
		if (!val)
		goto end;

		rc = copy_from_user(&prev_user_fd, (void __user *)val,
		sizeof(uint64_t));
		if (rc) {
		SDE_ERROR("copy from user failed rc:%d\n", rc);
		rc = -EFAULT;
		goto end;
		}

		/*
		* client is expected to reset the property to -1 before
		* requesting for the retire fence
		* update the the offset to a timeline for commit completion
		*/
		if (prev_user_fd == -1) {
		/*
		* update the offset to a timeline for
		* commit completion
		*/
		rc = sde_fence_create(c_conn->retire_fence,
		&fence_user_fd, 1);
		rc = sde_fence_create(c_conn->retire_fence, &fence_fd, 1);
		if (rc) {
		SDE_ERROR("fence create failed rc:%d\n", rc);
		goto end;
		}

		rc = copy_to_user((uint64_t __user *)(uintptr_t)val,
		&fence_user_fd, sizeof(uint64_t));
		rc = copy_to_user((uint64_t __user *)(uintptr_t)val, &fence_fd,
		sizeof(uint64_t));
		if (rc) {
		SDE_ERROR("copy to user failed rc:%d\n", rc);
		/*
		* fence will be released with timeline
		* update
		*/
		put_unused_fd(fence_user_fd);
		/* fence will be released with timeline update */
		put_unused_fd(fence_fd);
		rc = -EFAULT;
		goto end;
		}
		}
		break;
		case CONNECTOR_PROP_ROI_V1:
		rc = _sde_connector_set_roi_v1(c_conn, c_state,

drivers/gpu/drm/msm/sde/sde_crtc.c

+10 −26

Original line number	Diff line number	Diff line
		@@ -5102,8 +5102,7 @@ static int sde_crtc_atomic_set_property(struct drm_crtc *crtc,
		struct sde_crtc *sde_crtc;
		struct sde_crtc_state *cstate;
		int idx, ret;
		uint64_t fence_user_fd;
		uint64_t __user prev_user_fd;
		uint64_t fence_fd;

		if (!crtc \|\| !state \|\| !property) {
		SDE_ERROR("invalid argument(s)\n");
		@@ -5163,35 +5162,20 @@ static int sde_crtc_atomic_set_property(struct drm_crtc *crtc,
		if (!val)
		goto exit;

		ret = copy_from_user(&prev_user_fd, (void __user *)val,
		sizeof(uint64_t));
		if (ret) {
		SDE_ERROR("copy from user failed rc:%d\n", ret);
		ret = -EFAULT;
		goto exit;
		}

		/*
		* client is expected to reset the property to -1 before
		* requesting for the release fence
		*/
		if (prev_user_fd == -1) {
		ret = _sde_crtc_get_output_fence(crtc, state,
		&fence_user_fd);
		ret = _sde_crtc_get_output_fence(crtc, state, &fence_fd);
		if (ret) {
		SDE_ERROR("fence create failed rc:%d\n", ret);
		goto exit;
		}

		ret = copy_to_user((uint64_t __user *)(uintptr_t)val,
		&fence_user_fd, sizeof(uint64_t));
		ret = copy_to_user((uint64_t __user *)(uintptr_t)val, &fence_fd,
		sizeof(uint64_t));
		if (ret) {
		SDE_ERROR("copy to user failed rc:%d\n", ret);
		put_unused_fd(fence_user_fd);
		put_unused_fd(fence_fd);
		ret = -EFAULT;
		goto exit;
		}
		}
		break;
		default:
		/* nothing to do */

drivers/gpu/drm/msm/sde/sde_fence.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,7 @@ int sde_fence_create(struct sde_fence_context ctx, uint64_t val,
		list_for_each_entry(fc, &ctx->fence_list_head, fence_list) {
		if (trigger_value == fc->base.seqno) {
		fd = fc->fd;
		*val = fd;
		break;
		}
		}