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

Commit 3aa13521 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: Fix compile warnings"

parents eb0c0ec6 7c8974ac

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

+7 −2
Original line number Diff line number Diff line
@@ -2499,9 +2499,14 @@ static void _sde_kms_null_commit(struct drm_device *dev, 
	}



	crtc_state->active = true;

	drm_atomic_set_crtc_for_connector(conn_state, enc->crtc);

	ret = drm_atomic_set_crtc_for_connector(conn_state, enc->crtc);

	if (ret)

		SDE_ERROR("error %d setting the crtc\n", ret);



	ret = drm_atomic_commit(state);

	if (ret)

		SDE_ERROR("Error %d doing the atomic commit\n", ret);



	drm_atomic_commit(state);

end:

	if (state)

		drm_atomic_state_put(state);

drivers/gpu/drm/msm/sde_hdcp_2x.c

+6 −9
Original line number Diff line number Diff line
@@ -333,20 +333,17 @@ static void sde_hdcp_2x_clean(struct sde_hdcp_2x_ctrl *hdcp) 
static u8 sde_hdcp_2x_stream_type(u8 min_enc_level)

{

	u8 stream_type = 0;

	u8 const hdcp_min_enc_level_0 = 0, hdcp_min_enc_level_1 = 1,

	   hdcp_min_enc_level_2 = 2;

	u8 const stream_type_0 = 0, stream_type_1 = 1;



	switch (min_enc_level) {

	case hdcp_min_enc_level_0:

	case hdcp_min_enc_level_1:

		stream_type = stream_type_0;

	case 0:

	case 1:

		stream_type = 0;

		break;

	case hdcp_min_enc_level_2:

		stream_type = stream_type_1;

	case 2:

		stream_type = 1;

		break;

	default:

		stream_type = stream_type_0;

		stream_type = 0;

		break;

	}