Commit c4ae82a0 authored by He Ying's avatar He Ying Committed by Ville Syrjälä
Browse files

drm: Small optimization to intel_dp_mst_atomic_master_trans_check 



If we want to return from for_each_intel_connector_iter(), one
way is calling drm_connector_list_iter_end() before returning
to avoid memleak. The other way is just breaking from the bracket
and then returning after the outside drm_connector_list_iter_end().
Obviously, the second way makes code smaller and more clear.
Apply it to the function intel_dp_mst_atomic_master_trans_check().

Signed-off-by: default avatarHe Ying <heying24@huawei.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211022022243.138860-1-heying24@huawei.com
parent 877d0749

drivers/gpu/drm/i915/display/intel_dp_mst.c

+8 −10
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ intel_dp_mst_atomic_master_trans_check(struct intel_connector *connector, 
	struct drm_i915_private *dev_priv = to_i915(state->base.dev);

	struct drm_connector_list_iter connector_list_iter;

	struct intel_connector *connector_iter;

	int ret = 0;



	if (DISPLAY_VER(dev_priv) < 12)

		return  0;
@@ -243,7 +244,6 @@ intel_dp_mst_atomic_master_trans_check(struct intel_connector *connector, 
		struct intel_digital_connector_state *conn_iter_state;

		struct intel_crtc_state *crtc_state;

		struct intel_crtc *crtc;

		int ret;



		if (connector_iter->mst_port != connector->mst_port ||

		    connector_iter == connector)
@@ -252,8 +252,8 @@ intel_dp_mst_atomic_master_trans_check(struct intel_connector *connector, 
		conn_iter_state = intel_atomic_get_digital_connector_state(state,

									   connector_iter);

		if (IS_ERR(conn_iter_state)) {

			drm_connector_list_iter_end(&connector_list_iter);

			return PTR_ERR(conn_iter_state);

			ret = PTR_ERR(conn_iter_state);

			break;

		}



		if (!conn_iter_state->base.crtc)
@@ -262,20 +262,18 @@ intel_dp_mst_atomic_master_trans_check(struct intel_connector *connector, 
		crtc = to_intel_crtc(conn_iter_state->base.crtc);

		crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);

		if (IS_ERR(crtc_state)) {

			drm_connector_list_iter_end(&connector_list_iter);

			return PTR_ERR(crtc_state);

			ret = PTR_ERR(crtc_state);

			break;

		}



		ret = drm_atomic_add_affected_planes(&state->base, &crtc->base);

		if (ret) {

			drm_connector_list_iter_end(&connector_list_iter);

			return ret;

		}

		if (ret)

			break;

		crtc_state->uapi.mode_changed = true;

	}

	drm_connector_list_iter_end(&connector_list_iter);



	return 0;

	return ret;

}



static int