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

Commit 30c03e54 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: avoid fence creation if property reset"

parents 462a659b adbac6f2

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

+3 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,9 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector, 
		}

		break;

	case CONNECTOR_PROP_RETIRE_FENCE:

		if (!val)

			goto end;



		rc = sde_fence_create(&c_conn->retire_fence, &fence_fd, 0);

		if (rc) {

			SDE_ERROR("fence create failed rc:%d\n", rc);

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

+3 −0
Original line number Diff line number Diff line
@@ -5108,6 +5108,9 @@ static int sde_crtc_atomic_set_property(struct drm_crtc *crtc, 
		cstate->bw_split_vote = true;

		break;

	case CRTC_PROP_OUTPUT_FENCE:

		if (!val)

			goto exit;



		ret = _sde_crtc_get_output_fence(crtc, state, &fence_fd);

		if (ret) {

			SDE_ERROR("fence create failed rc:%d\n", ret);