Commit da3fd7ac authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher
Browse files

drm/amd/display: Update CP property based on HW query 



[Why]
We need to use HW state to set content protection to ENABLED.
This way we know that the link is encrypted from the HW side

[How]
Create a workqueue that queries the HW every ~2seconds, and sets it to
ENABLED or DESIRED based on the result from the hardware

Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2a0f9270

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3 −13
Original line number Diff line number Diff line
@@ -5436,19 +5436,9 @@ static void update_content_protection(struct drm_connector_state *state, const s 
{

	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);



	if (state->content_protection == DRM_MODE_CONTENT_PROTECTION_DESIRED) {

		hdcp_add_display(hdcp_w, aconnector->dc_link->link_index);



		/*

		 * TODO: ENABLED should be verified using psp, it is planned later.

		 * Just set this to ENABLED for now

		 */

		state->content_protection = DRM_MODE_CONTENT_PROTECTION_ENABLED;



		return;

	}



	if (state->content_protection == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)

	if (state->content_protection == DRM_MODE_CONTENT_PROTECTION_DESIRED)

		hdcp_add_display(hdcp_w, aconnector->dc_link->link_index, aconnector);

	else if (state->content_protection == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)

		hdcp_remove_display(hdcp_w, aconnector->dc_link->link_index, aconnector->base.index);



}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c

+64 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "amdgpu.h"

#include "amdgpu_dm.h"

#include "dm_helpers.h"

#include <drm/drm_hdcp.h>



bool lp_write_i2c(void *handle, uint32_t address, const uint8_t *data, uint32_t size)

{
@@ -82,16 +83,19 @@ static void process_output(struct hdcp_workqueue *hdcp_work) 


}



void hdcp_add_display(struct hdcp_workqueue *hdcp_work, unsigned int link_index)

void hdcp_add_display(struct hdcp_workqueue *hdcp_work, unsigned int link_index, struct amdgpu_dm_connector *aconnector)

{

	struct hdcp_workqueue *hdcp_w = &hdcp_work[link_index];

	struct mod_hdcp_display *display = &hdcp_work[link_index].display;

	struct mod_hdcp_link *link = &hdcp_work[link_index].link;



	mutex_lock(&hdcp_w->mutex);

	hdcp_w->aconnector = aconnector;



	mod_hdcp_add_display(&hdcp_w->hdcp, link, display, &hdcp_w->output);



	schedule_delayed_work(&hdcp_w->property_validate_dwork, msecs_to_jiffies(DRM_HDCP_CHECK_PERIOD_MS));



	process_output(hdcp_w);



	mutex_unlock(&hdcp_w->mutex);
@@ -106,6 +110,9 @@ void hdcp_remove_display(struct hdcp_workqueue *hdcp_work, unsigned int link_ind 


	mod_hdcp_remove_display(&hdcp_w->hdcp, display_index, &hdcp_w->output);



	cancel_delayed_work(&hdcp_w->property_validate_dwork);

	hdcp_w->encryption_status = MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF;



	process_output(hdcp_w);



	mutex_unlock(&hdcp_w->mutex);
@@ -120,6 +127,9 @@ void hdcp_reset_display(struct hdcp_workqueue *hdcp_work, unsigned int link_inde 


	mod_hdcp_reset_connection(&hdcp_w->hdcp,  &hdcp_w->output);



	cancel_delayed_work(&hdcp_w->property_validate_dwork);

	hdcp_w->encryption_status = MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF;



	process_output(hdcp_w);



	mutex_unlock(&hdcp_w->mutex);
@@ -155,7 +165,58 @@ static void event_callback(struct work_struct *work) 




}

static void event_property_update(struct work_struct *work)

{



	struct hdcp_workqueue *hdcp_work = container_of(work, struct hdcp_workqueue, property_update_work);

	struct amdgpu_dm_connector *aconnector = hdcp_work->aconnector;

	struct drm_device *dev = hdcp_work->aconnector->base.dev;

	long ret;



	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);

	mutex_lock(&hdcp_work->mutex);





	if (aconnector->base.state->commit) {

		ret = wait_for_completion_interruptible_timeout(&aconnector->base.state->commit->hw_done, 10 * HZ);



		if (ret == 0) {

			DRM_ERROR("HDCP state unknown! Setting it to DESIRED");

			hdcp_work->encryption_status = MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF;

		}

	}



	if (hdcp_work->encryption_status == MOD_HDCP_ENCRYPTION_STATUS_HDCP1_ON)

		drm_hdcp_update_content_protection(&aconnector->base, DRM_MODE_CONTENT_PROTECTION_ENABLED);

	else

		drm_hdcp_update_content_protection(&aconnector->base, DRM_MODE_CONTENT_PROTECTION_DESIRED);





	mutex_unlock(&hdcp_work->mutex);

	drm_modeset_unlock(&dev->mode_config.connection_mutex);

}



static void event_property_validate(struct work_struct *work)

{

	struct hdcp_workqueue *hdcp_work =

		container_of(to_delayed_work(work), struct hdcp_workqueue, property_validate_dwork);

	struct mod_hdcp_display_query query;

	struct amdgpu_dm_connector *aconnector = hdcp_work->aconnector;



	mutex_lock(&hdcp_work->mutex);



	query.encryption_status = MOD_HDCP_ENCRYPTION_STATUS_HDCP_OFF;

	mod_hdcp_query_display(&hdcp_work->hdcp, aconnector->base.index, &query);



	if (query.encryption_status != hdcp_work->encryption_status) {

		hdcp_work->encryption_status = query.encryption_status;

		schedule_work(&hdcp_work->property_update_work);

	}



	schedule_delayed_work(&hdcp_work->property_validate_dwork, msecs_to_jiffies(DRM_HDCP_CHECK_PERIOD_MS));



	mutex_unlock(&hdcp_work->mutex);

}



static void event_watchdog_timer(struct work_struct *work)

{
@@ -250,8 +311,10 @@ struct hdcp_workqueue *hdcp_create_workqueue(void *psp_context, struct cp_psp *c 
		mutex_init(&hdcp_work[i].mutex);



		INIT_WORK(&hdcp_work[i].cpirq_work, event_cpirq);

		INIT_WORK(&hdcp_work[i].property_update_work, event_property_update);

		INIT_DELAYED_WORK(&hdcp_work[i].callback_dwork, event_callback);

		INIT_DELAYED_WORK(&hdcp_work[i].watchdog_timer_dwork, event_watchdog_timer);

		INIT_DELAYED_WORK(&hdcp_work[i].property_validate_dwork, event_property_validate);



		hdcp_work[i].hdcp.config.psp.handle =  psp_context;

		hdcp_work[i].hdcp.config.ddc.handle = dc_get_link_at_index(dc, i);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h

+6 −1
Original line number Diff line number Diff line
@@ -38,8 +38,11 @@ struct cp_psp; 


struct hdcp_workqueue {

	struct work_struct cpirq_work;

	struct work_struct property_update_work;

	struct delayed_work callback_dwork;

	struct delayed_work watchdog_timer_dwork;

	struct delayed_work property_validate_dwork;

	struct amdgpu_dm_connector *aconnector;

	struct mutex mutex;



	struct mod_hdcp hdcp;
@@ -47,10 +50,12 @@ struct hdcp_workqueue { 
	struct mod_hdcp_display display;

	struct mod_hdcp_link link;



	enum mod_hdcp_encryption_status encryption_status;

	uint8_t max_link;

};



void hdcp_add_display(struct hdcp_workqueue *hdcp_work, unsigned int link_index);

void hdcp_add_display(struct hdcp_workqueue *hdcp_work, unsigned int link_index,

		      struct amdgpu_dm_connector *aconnector);

void hdcp_remove_display(struct hdcp_workqueue *work, unsigned int link_index, unsigned int display_index);

void hdcp_reset_display(struct hdcp_workqueue *work, unsigned int link_index);

void hdcp_handle_cpirq(struct hdcp_workqueue *work, unsigned int link_index);

CRA Git | Maintained and supported by SUSTech CRA and CCSE