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

Commit 8a19ed57 authored by Ajay Singh Parmar's avatar Ajay Singh Parmar Committed by Abhijith Desai
Browse files

drm/msm/dp: fix hdcp status update 



As debug sub-module is initialized after hdcp sub-module, do not
update debug sub-module's data during hdcp sub-module initialization.

Change-Id: I91eccf157f4745095e3157636ed4f8012707c62a
Signed-off-by: default avatarAjay Singh Parmar <aparmar@codeaurora.org>
Signed-off-by: default avatarAbhijith Desai <desaia@codeaurora.org>
parent a9f72226

drivers/gpu/drm/msm/dp/dp_display.c

+4 −2
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ static int dp_display_initialize_hdcp(struct dp_display_private *dp) 
	return 0;

error:

	dp_display_deinitialize_hdcp(dp);

	dp->debug->hdcp_disabled = true;



	return rc;

}
@@ -1048,6 +1047,7 @@ static void dp_display_deinit_sub_modules(struct dp_display_private *dp) 
static int dp_init_sub_modules(struct dp_display_private *dp)

{

	int rc = 0;

	bool hdcp_disabled;

	struct device *dev = &dp->pdev->dev;

	struct dp_hpd_cb *cb = &dp->hpd_cb;

	struct dp_ctrl_in ctrl_in = {
@@ -1174,7 +1174,7 @@ static int dp_init_sub_modules(struct dp_display_private *dp) 
		goto error_hpd;

	}



	dp_display_initialize_hdcp(dp);

	hdcp_disabled = !!dp_display_initialize_hdcp(dp);



	debug_in.panel = dp->panel;

	debug_in.hpd = dp->hpd;
@@ -1192,6 +1192,8 @@ static int dp_init_sub_modules(struct dp_display_private *dp) 
		goto error_debug;

	}



	dp->debug->hdcp_disabled = hdcp_disabled;



	return rc;

error_debug:

	dp_hpd_put(dp->hpd);