| Message ID | 20201023122112.15265-10-anshuman.gupta@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,01/16] drm/i915/hdcp: Update CP property in update_pipe | expand |
> -----Original Message----- > From: Anshuman Gupta <anshuman.gupta@intel.com> > Sent: Friday, October 23, 2020 5:51 PM > To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org > Cc: seanpaul@chromium.org; Nikula, Jani <jani.nikula@intel.com>; C, > Ramalingam <ramalingam.c@intel.com>; Li, Juston <juston.li@intel.com>; > Shankar, Uma <uma.shankar@intel.com>; Gupta, Anshuman > <anshuman.gupta@intel.com> > Subject: [PATCH v3 09/16] drm/i915/hdcp: Encapsulate hdcp_port_data to > dig_port > > hdcp_port_data is specific to a port on which HDCP encryption is getting > enabled, so encapsulate it to intel_digital_port. > This will be required to enable HDCP 2.2 stream encryption. Looks Good to me. Reviewed-by: Uma Shankar <uma.shankar@intel.com> > Cc: Ramalingam C <ramalingam.c@intel.com> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 2 + > .../drm/i915/display/intel_display_types.h | 5 +- > drivers/gpu/drm/i915/display/intel_hdcp.c | 56 +++++++++++-------- > 3 files changed, 39 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index fbeffdfd1a0d..a46ba4e6a835 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4746,6 +4746,8 @@ static void intel_ddi_encoder_destroy(struct > drm_encoder *encoder) > intel_dp_encoder_flush_work(encoder); > > drm_encoder_cleanup(encoder); > + if (dig_port) > + kfree(dig_port->port_data.streams); > kfree(dig_port); > } > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index 59b8fc21e3e8..749c3a7e0b45 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -402,7 +402,6 @@ struct intel_hdcp { > * content can flow only through a link protected by HDCP2.2. > */ > u8 content_type; > - struct hdcp_port_data port_data; > > bool is_paired; > bool is_repeater; > @@ -1446,10 +1445,12 @@ struct intel_digital_port { > enum phy_fia tc_phy_fia; > u8 tc_phy_fia_idx; > > - /* protects num_hdcp_streams reference count */ > + /* protects num_hdcp_streams reference count, port_data */ > struct mutex hdcp_mutex; > /* the number of pipes using HDCP signalling out of this port */ > unsigned int num_hdcp_streams; > + /* HDCP port data need to pass to security f/w */ > + struct hdcp_port_data port_data; > > void (*write_infoframe)(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, diff --git > a/drivers/gpu/drm/i915/display/intel_hdcp.c > b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 10770bf0e85e..207fa17129ae 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -15,6 +15,7 @@ > #include <drm/drm_hdcp.h> > #include <drm/i915_component.h> > > +#include "i915_drv.h" > #include "i915_reg.h" > #include "intel_display_power.h" > #include "intel_display_types.h" > @@ -1031,7 +1032,8 @@ static int > hdcp2_prepare_ake_init(struct intel_connector *connector, > struct hdcp2_ake_init *ake_data) { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1060,7 +1062,8 @@ hdcp2_verify_rx_cert_prepare_km(struct > intel_connector *connector, > struct hdcp2_ake_no_stored_km *ek_pub_km, > size_t *msg_sz) > { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1087,7 +1090,8 @@ hdcp2_verify_rx_cert_prepare_km(struct > intel_connector *connector, static int hdcp2_verify_hprime(struct > intel_connector *connector, > struct hdcp2_ake_send_hprime *rx_hprime) { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1112,7 +1116,8 @@ static int > hdcp2_store_pairing_info(struct intel_connector *connector, > struct hdcp2_ake_send_pairing_info *pairing_info) { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1138,7 +1143,8 @@ static int > hdcp2_prepare_lc_init(struct intel_connector *connector, > struct hdcp2_lc_init *lc_init) > { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1164,7 +1170,8 @@ static int > hdcp2_verify_lprime(struct intel_connector *connector, > struct hdcp2_lc_send_lprime *rx_lprime) { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1189,7 +1196,8 @@ hdcp2_verify_lprime(struct intel_connector > *connector, static int hdcp2_prepare_skey(struct intel_connector *connector, > struct hdcp2_ske_send_eks *ske_data) { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1217,7 +1225,8 @@ hdcp2_verify_rep_topology_prepare_ack(struct > intel_connector *connector, > *rep_topology, > struct hdcp2_rep_send_ack *rep_send_ack) { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1245,7 +1254,8 @@ static int > hdcp2_verify_mprime(struct intel_connector *connector, > struct hdcp2_rep_stream_ready *stream_ready) { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1268,7 +1278,8 @@ hdcp2_verify_mprime(struct intel_connector > *connector, > > static int hdcp2_authenticate_port(struct intel_connector *connector) { > - struct hdcp_port_data *data = &connector->hdcp.port_data; > + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > + struct hdcp_port_data *data = &dig_port->port_data; > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1292,6 +1303,7 @@ static int hdcp2_authenticate_port(struct > intel_connector *connector) > > static int hdcp2_close_mei_session(struct intel_connector *connector) { > + struct intel_digital_port *dig_port = > +intel_attached_dig_port(connector); > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct i915_hdcp_comp_master *comp; > int ret; > @@ -1305,7 +1317,7 @@ static int hdcp2_close_mei_session(struct > intel_connector *connector) > } > > ret = comp->ops->close_hdcp_session(comp->mei_dev, > - &connector->hdcp.port_data); > + &dig_port->port_data); > mutex_unlock(&dev_priv->hdcp_comp_mutex); > > return ret; > @@ -1498,8 +1510,9 @@ int > _hdcp2_propagate_stream_management_info(struct intel_connector > *connector) > if (ret < 0) > goto out; > > - hdcp->port_data.seq_num_m = hdcp->seq_num_m; > - hdcp->port_data.streams[0].stream_type = hdcp->content_type; > + dig_port->port_data.seq_num_m = hdcp->seq_num_m; > + dig_port->port_data.streams[0].stream_type = hdcp->content_type; > + > ret = hdcp2_verify_mprime(connector, &msgs.stream_ready); > > out: > @@ -1731,7 +1744,9 @@ hdcp2_propagate_stream_management_info(struct > intel_connector *connector) > > static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) { > + struct intel_digital_port *dig_port = > +intel_attached_dig_port(connector); > struct drm_i915_private *i915 = to_i915(connector->base.dev); > + struct hdcp_port_data *data = &dig_port->port_data; > struct intel_hdcp *hdcp = &connector->hdcp; > int ret, i, tries = 3; > > @@ -1745,8 +1760,7 @@ static int hdcp2_authenticate_and_encrypt(struct > intel_connector *connector) > ret); > break; > } > - hdcp->port_data.streams[0].stream_type = > - hdcp->content_type; > + data->streams[0].stream_type = hdcp->content_type; > ret = hdcp2_authenticate_port(connector); > if (!ret) > break; > @@ -1989,8 +2003,8 @@ static int initialize_hdcp_port_data(struct > intel_connector *connector, > const struct intel_hdcp_shim *shim) { > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > + struct hdcp_port_data *data = &dig_port->port_data; > struct intel_hdcp *hdcp = &connector->hdcp; > - struct hdcp_port_data *data = &hdcp->port_data; > enum port port = dig_port->base.port; > > if (INTEL_GEN(dev_priv) < 12) > @@ -2012,16 +2026,15 @@ static int initialize_hdcp_port_data(struct > intel_connector *connector, > data->port_type = (u8)HDCP_PORT_TYPE_INTEGRATED; > data->protocol = (u8)shim->protocol; > > - data->k = 1; > if (!data->streams) > - data->streams = kcalloc(data->k, > + data->streams = kcalloc(INTEL_NUM_PIPES(dev_priv), > sizeof(struct hdcp2_streamid_type), > GFP_KERNEL); > if (!data->streams) { > drm_err(&dev_priv->drm, "Out of Memory\n"); > return -ENOMEM; > } > - > + /* For SST */ > data->streams[0].stream_id = 0; > data->streams[0].stream_type = hdcp->content_type; > > @@ -2100,7 +2113,7 @@ int intel_hdcp_init(struct intel_connector *connector, > hdcp- > >hdcp2_supported); > if (ret) { > hdcp->hdcp2_supported = false; > - kfree(hdcp->port_data.streams); > + kfree(dig_port->port_data.streams); > return ret; > } > > @@ -2140,7 +2153,7 @@ int intel_hdcp_enable(struct intel_connector > *connector, > } > > if (INTEL_GEN(dev_priv) >= 12) > - hdcp->port_data.fw_tc = intel_get_mei_fw_tc(hdcp- > >cpu_transcoder); > + dig_port->port_data.fw_tc = > +intel_get_mei_fw_tc(hdcp->cpu_transcoder); > > /* > * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup > @@ -2307,7 +2320,6 @@ void intel_hdcp_cleanup(struct intel_connector > *connector) > drm_WARN_ON(connector->base.dev, work_pending(&hdcp- > >prop_work)); > > mutex_lock(&hdcp->mutex); > - kfree(hdcp->port_data.streams); > hdcp->shim = NULL; > mutex_unlock(&hdcp->mutex); > } > -- > 2.26.2
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index fbeffdfd1a0d..a46ba4e6a835 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4746,6 +4746,8 @@ static void intel_ddi_encoder_destroy(struct drm_encoder *encoder) intel_dp_encoder_flush_work(encoder); drm_encoder_cleanup(encoder); + if (dig_port) + kfree(dig_port->port_data.streams); kfree(dig_port); } diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 59b8fc21e3e8..749c3a7e0b45 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -402,7 +402,6 @@ struct intel_hdcp { * content can flow only through a link protected by HDCP2.2. */ u8 content_type; - struct hdcp_port_data port_data; bool is_paired; bool is_repeater; @@ -1446,10 +1445,12 @@ struct intel_digital_port { enum phy_fia tc_phy_fia; u8 tc_phy_fia_idx; - /* protects num_hdcp_streams reference count */ + /* protects num_hdcp_streams reference count, port_data */ struct mutex hdcp_mutex; /* the number of pipes using HDCP signalling out of this port */ unsigned int num_hdcp_streams; + /* HDCP port data need to pass to security f/w */ + struct hdcp_port_data port_data; void (*write_infoframe)(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 10770bf0e85e..207fa17129ae 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -15,6 +15,7 @@ #include <drm/drm_hdcp.h> #include <drm/i915_component.h> +#include "i915_drv.h" #include "i915_reg.h" #include "intel_display_power.h" #include "intel_display_types.h" @@ -1031,7 +1032,8 @@ static int hdcp2_prepare_ake_init(struct intel_connector *connector, struct hdcp2_ake_init *ake_data) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1060,7 +1062,8 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector, struct hdcp2_ake_no_stored_km *ek_pub_km, size_t *msg_sz) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1087,7 +1090,8 @@ hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector, static int hdcp2_verify_hprime(struct intel_connector *connector, struct hdcp2_ake_send_hprime *rx_hprime) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1112,7 +1116,8 @@ static int hdcp2_store_pairing_info(struct intel_connector *connector, struct hdcp2_ake_send_pairing_info *pairing_info) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1138,7 +1143,8 @@ static int hdcp2_prepare_lc_init(struct intel_connector *connector, struct hdcp2_lc_init *lc_init) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1164,7 +1170,8 @@ static int hdcp2_verify_lprime(struct intel_connector *connector, struct hdcp2_lc_send_lprime *rx_lprime) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1189,7 +1196,8 @@ hdcp2_verify_lprime(struct intel_connector *connector, static int hdcp2_prepare_skey(struct intel_connector *connector, struct hdcp2_ske_send_eks *ske_data) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1217,7 +1225,8 @@ hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector, *rep_topology, struct hdcp2_rep_send_ack *rep_send_ack) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1245,7 +1254,8 @@ static int hdcp2_verify_mprime(struct intel_connector *connector, struct hdcp2_rep_stream_ready *stream_ready) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1268,7 +1278,8 @@ hdcp2_verify_mprime(struct intel_connector *connector, static int hdcp2_authenticate_port(struct intel_connector *connector) { - struct hdcp_port_data *data = &connector->hdcp.port_data; + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct hdcp_port_data *data = &dig_port->port_data; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1292,6 +1303,7 @@ static int hdcp2_authenticate_port(struct intel_connector *connector) static int hdcp2_close_mei_session(struct intel_connector *connector) { + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct i915_hdcp_comp_master *comp; int ret; @@ -1305,7 +1317,7 @@ static int hdcp2_close_mei_session(struct intel_connector *connector) } ret = comp->ops->close_hdcp_session(comp->mei_dev, - &connector->hdcp.port_data); + &dig_port->port_data); mutex_unlock(&dev_priv->hdcp_comp_mutex); return ret; @@ -1498,8 +1510,9 @@ int _hdcp2_propagate_stream_management_info(struct intel_connector *connector) if (ret < 0) goto out; - hdcp->port_data.seq_num_m = hdcp->seq_num_m; - hdcp->port_data.streams[0].stream_type = hdcp->content_type; + dig_port->port_data.seq_num_m = hdcp->seq_num_m; + dig_port->port_data.streams[0].stream_type = hdcp->content_type; + ret = hdcp2_verify_mprime(connector, &msgs.stream_ready); out: @@ -1731,7 +1744,9 @@ hdcp2_propagate_stream_management_info(struct intel_connector *connector) static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) { + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct hdcp_port_data *data = &dig_port->port_data; struct intel_hdcp *hdcp = &connector->hdcp; int ret, i, tries = 3; @@ -1745,8 +1760,7 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) ret); break; } - hdcp->port_data.streams[0].stream_type = - hdcp->content_type; + data->streams[0].stream_type = hdcp->content_type; ret = hdcp2_authenticate_port(connector); if (!ret) break; @@ -1989,8 +2003,8 @@ static int initialize_hdcp_port_data(struct intel_connector *connector, const struct intel_hdcp_shim *shim) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); + struct hdcp_port_data *data = &dig_port->port_data; struct intel_hdcp *hdcp = &connector->hdcp; - struct hdcp_port_data *data = &hdcp->port_data; enum port port = dig_port->base.port; if (INTEL_GEN(dev_priv) < 12) @@ -2012,16 +2026,15 @@ static int initialize_hdcp_port_data(struct intel_connector *connector, data->port_type = (u8)HDCP_PORT_TYPE_INTEGRATED; data->protocol = (u8)shim->protocol; - data->k = 1; if (!data->streams) - data->streams = kcalloc(data->k, + data->streams = kcalloc(INTEL_NUM_PIPES(dev_priv), sizeof(struct hdcp2_streamid_type), GFP_KERNEL); if (!data->streams) { drm_err(&dev_priv->drm, "Out of Memory\n"); return -ENOMEM; } - + /* For SST */ data->streams[0].stream_id = 0; data->streams[0].stream_type = hdcp->content_type; @@ -2100,7 +2113,7 @@ int intel_hdcp_init(struct intel_connector *connector, hdcp->hdcp2_supported); if (ret) { hdcp->hdcp2_supported = false; - kfree(hdcp->port_data.streams); + kfree(dig_port->port_data.streams); return ret; } @@ -2140,7 +2153,7 @@ int intel_hdcp_enable(struct intel_connector *connector, } if (INTEL_GEN(dev_priv) >= 12) - hdcp->port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder); + dig_port->port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder); /* * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup @@ -2307,7 +2320,6 @@ void intel_hdcp_cleanup(struct intel_connector *connector) drm_WARN_ON(connector->base.dev, work_pending(&hdcp->prop_work)); mutex_lock(&hdcp->mutex); - kfree(hdcp->port_data.streams); hdcp->shim = NULL; mutex_unlock(&hdcp->mutex); }
hdcp_port_data is specific to a port on which HDCP encryption is getting enabled, so encapsulate it to intel_digital_port. This will be required to enable HDCP 2.2 stream encryption. Cc: Ramalingam C <ramalingam.c@intel.com> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 2 + .../drm/i915/display/intel_display_types.h | 5 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 56 +++++++++++-------- 3 files changed, 39 insertions(+), 24 deletions(-)