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

Commit 5e9e8ec0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: dp: update min_enc_level only if link is authenticated"

parents 63dd11f3 3f7f84f7

msm/dp/dp_hdcp2p2.c

+0 −5
Original line number Diff line number Diff line
@@ -346,11 +346,6 @@ static void dp_hdcp2p2_min_level_change(void *client_ctx, 
		return;

	}



	if (!dp_hdcp2p2_is_valid_state(ctrl)) {

		DP_ERR("invalid state\n");

		return;

	}



	cdata.context = ctrl->lib_ctx;

	cdata.min_enc_level = min_enc_level;

	dp_hdcp2p2_wakeup_lib(ctrl, &cdata);

msm/sde_hdcp_2x.c

+4 −2
Original line number Diff line number Diff line
@@ -903,8 +903,10 @@ static int sde_hdcp_2x_wakeup(struct sde_hdcp_2x_wakeup_data *data) 
		break;

	case HDCP_2X_CMD_MIN_ENC_LEVEL:

		hdcp->min_enc_level = data->min_enc_level;

		if (hdcp->authenticated) {

			kfifo_put(&hdcp->cmd_q, data->cmd);

			wake_up(&hdcp->wait_q);

		}

		break;

	default:

		kfifo_put(&hdcp->cmd_q, data->cmd);