| Message ID | 20231026093647.987267-4-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Thu, 26 Oct 2023, Suraj Kandpal <suraj.kandpal@intel.com> wrote: > Let's create a blanket function which just has some conditions > which need to be checked before connectors enable hdcp. > This cleans up code and avoids code duplication. This series has two 2/3 patches... confused me, probably going to confuse CI too... BR, Jani. > > --v3 > -Keep function name as intel_hdcp_enable() [Jani] > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 5 +---- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +---- > drivers/gpu/drm/i915/display/intel_hdcp.c | 21 ++++++++++++++++----- > drivers/gpu/drm/i915/display/intel_hdcp.h | 8 ++++---- > 4 files changed, 22 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 9151d5add960..b644cf981846 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3259,10 +3259,7 @@ static void intel_enable_ddi(struct intel_atomic_state *state, > else > intel_enable_ddi_dp(state, encoder, crtc_state, conn_state); > > - /* Enable hdcp if it's desired */ > - if (conn_state->content_protection == > - DRM_MODE_CONTENT_PROTECTION_DESIRED) > - intel_hdcp_enable(state, encoder, crtc_state, conn_state); > + intel_hdcp_enable(state, encoder, crtc_state, conn_state); > } > > static void intel_disable_ddi_dp(struct intel_atomic_state *state, > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 7b4628f4f124..4366da79fe81 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -836,10 +836,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, > > intel_audio_codec_enable(encoder, pipe_config, conn_state); > > - /* Enable hdcp if it's desired */ > - if (conn_state->content_protection == > - DRM_MODE_CONTENT_PROTECTION_DESIRED) > - intel_hdcp_enable(state, encoder, pipe_config, conn_state); > + intel_hdcp_enable(state, encoder, pipe_config, conn_state); > } > > static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder, > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 7c0cfcb48521..44c0a93f3af8 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -2324,10 +2324,10 @@ intel_hdcp_set_streams(struct intel_digital_port *dig_port, > return 0; > } > > -int intel_hdcp_enable(struct intel_atomic_state *state, > - struct intel_encoder *encoder, > - const struct intel_crtc_state *pipe_config, > - const struct drm_connector_state *conn_state) > +static int _intel_hdcp_enable(struct intel_atomic_state *state, > + struct intel_encoder *encoder, > + const struct intel_crtc_state *pipe_config, > + const struct drm_connector_state *conn_state) > { > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > struct intel_connector *connector = > @@ -2404,6 +2404,17 @@ int intel_hdcp_enable(struct intel_atomic_state *state, > return ret; > } > > +void intel_hdcp_enable(struct intel_atomic_state *state, > + struct intel_encoder *encoder, > + const struct intel_crtc_state *crtc_state, > + const struct drm_connector_state *conn_state) > +{ > + /* Enable hdcp if it's desired */ > + if (conn_state->content_protection == > + DRM_MODE_CONTENT_PROTECTION_DESIRED) > + _intel_hdcp_enable(state, encoder, crtc_state, conn_state); > +} > + > int intel_hdcp_disable(struct intel_connector *connector) > { > struct intel_digital_port *dig_port = intel_attached_dig_port(connector); > @@ -2491,7 +2502,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state, > } > > if (desired_and_not_enabled || content_protection_type_changed) > - intel_hdcp_enable(state, encoder, crtc_state, conn_state); > + _intel_hdcp_enable(state, encoder, crtc_state, conn_state); > } > > void intel_hdcp_component_fini(struct drm_i915_private *i915) > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h > index 5997c52a0958..a9c784fd9ba5 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.h > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h > @@ -28,10 +28,10 @@ void intel_hdcp_atomic_check(struct drm_connector *connector, > int intel_hdcp_init(struct intel_connector *connector, > struct intel_digital_port *dig_port, > const struct intel_hdcp_shim *hdcp_shim); > -int intel_hdcp_enable(struct intel_atomic_state *state, > - struct intel_encoder *encoder, > - const struct intel_crtc_state *pipe_config, > - const struct drm_connector_state *conn_state); > +void intel_hdcp_enable(struct intel_atomic_state *state, > + struct intel_encoder *encoder, > + const struct intel_crtc_state *pipe_config, > + const struct drm_connector_state *conn_state); > int intel_hdcp_disable(struct intel_connector *connector); > void intel_hdcp_update_pipe(struct intel_atomic_state *state, > struct intel_encoder *encoder,
> -----Original Message----- > From: Jani Nikula <jani.nikula@linux.intel.com> > Sent: Thursday, October 26, 2023 3:34 PM > To: Kandpal, Suraj <suraj.kandpal@intel.com>; intel-gfx@lists.freedesktop.org > Cc: Shankar, Uma <uma.shankar@intel.com>; Nautiyal, Ankit K > <ankit.k.nautiyal@intel.com>; Kandpal, Suraj <suraj.kandpal@intel.com> > Subject: Re: [PATCH 2/3] drm/i915/hdcp: Create a blanket hdcp enable function > > On Thu, 26 Oct 2023, Suraj Kandpal <suraj.kandpal@intel.com> wrote: > > Let's create a blanket function which just has some conditions which > > need to be checked before connectors enable hdcp. > > This cleans up code and avoids code duplication. > > This series has two 2/3 patches... confused me, probably going to confuse CI > too... > Weird will send out a new patch series just in case Though the patchwork seems to catch it properly https://patchwork.freedesktop.org/series/125550/ Regards, Suraj Kandpal > BR, > Jani. > > > > > > --v3 > > -Keep function name as intel_hdcp_enable() [Jani] > > > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_ddi.c | 5 +---- > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +---- > > drivers/gpu/drm/i915/display/intel_hdcp.c | 21 ++++++++++++++++----- > > drivers/gpu/drm/i915/display/intel_hdcp.h | 8 ++++---- > > 4 files changed, 22 insertions(+), 17 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > index 9151d5add960..b644cf981846 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > @@ -3259,10 +3259,7 @@ static void intel_enable_ddi(struct > intel_atomic_state *state, > > else > > intel_enable_ddi_dp(state, encoder, crtc_state, conn_state); > > > > - /* Enable hdcp if it's desired */ > > - if (conn_state->content_protection == > > - DRM_MODE_CONTENT_PROTECTION_DESIRED) > > - intel_hdcp_enable(state, encoder, crtc_state, conn_state); > > + intel_hdcp_enable(state, encoder, crtc_state, conn_state); > > } > > > > static void intel_disable_ddi_dp(struct intel_atomic_state *state, > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > > index 7b4628f4f124..4366da79fe81 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > > @@ -836,10 +836,7 @@ static void intel_mst_enable_dp(struct > > intel_atomic_state *state, > > > > intel_audio_codec_enable(encoder, pipe_config, conn_state); > > > > - /* Enable hdcp if it's desired */ > > - if (conn_state->content_protection == > > - DRM_MODE_CONTENT_PROTECTION_DESIRED) > > - intel_hdcp_enable(state, encoder, pipe_config, conn_state); > > + intel_hdcp_enable(state, encoder, pipe_config, conn_state); > > } > > > > static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder > > *encoder, diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > > b/drivers/gpu/drm/i915/display/intel_hdcp.c > > index 7c0cfcb48521..44c0a93f3af8 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > > @@ -2324,10 +2324,10 @@ intel_hdcp_set_streams(struct intel_digital_port > *dig_port, > > return 0; > > } > > > > -int intel_hdcp_enable(struct intel_atomic_state *state, > > - struct intel_encoder *encoder, > > - const struct intel_crtc_state *pipe_config, > > - const struct drm_connector_state *conn_state) > > +static int _intel_hdcp_enable(struct intel_atomic_state *state, > > + struct intel_encoder *encoder, > > + const struct intel_crtc_state *pipe_config, > > + const struct drm_connector_state *conn_state) > > { > > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > struct intel_connector *connector = > > @@ -2404,6 +2404,17 @@ int intel_hdcp_enable(struct intel_atomic_state > *state, > > return ret; > > } > > > > +void intel_hdcp_enable(struct intel_atomic_state *state, > > + struct intel_encoder *encoder, > > + const struct intel_crtc_state *crtc_state, > > + const struct drm_connector_state *conn_state) { > > + /* Enable hdcp if it's desired */ > > + if (conn_state->content_protection == > > + DRM_MODE_CONTENT_PROTECTION_DESIRED) > > + _intel_hdcp_enable(state, encoder, crtc_state, conn_state); } > > + > > int intel_hdcp_disable(struct intel_connector *connector) { > > struct intel_digital_port *dig_port = > > intel_attached_dig_port(connector); > > @@ -2491,7 +2502,7 @@ void intel_hdcp_update_pipe(struct > intel_atomic_state *state, > > } > > > > if (desired_and_not_enabled || content_protection_type_changed) > > - intel_hdcp_enable(state, encoder, crtc_state, conn_state); > > + _intel_hdcp_enable(state, encoder, crtc_state, conn_state); > > } > > > > void intel_hdcp_component_fini(struct drm_i915_private *i915) diff > > --git a/drivers/gpu/drm/i915/display/intel_hdcp.h > > b/drivers/gpu/drm/i915/display/intel_hdcp.h > > index 5997c52a0958..a9c784fd9ba5 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdcp.h > > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h > > @@ -28,10 +28,10 @@ void intel_hdcp_atomic_check(struct drm_connector > > *connector, int intel_hdcp_init(struct intel_connector *connector, > > struct intel_digital_port *dig_port, > > const struct intel_hdcp_shim *hdcp_shim); -int > > intel_hdcp_enable(struct intel_atomic_state *state, > > - struct intel_encoder *encoder, > > - const struct intel_crtc_state *pipe_config, > > - const struct drm_connector_state *conn_state); > > +void intel_hdcp_enable(struct intel_atomic_state *state, > > + struct intel_encoder *encoder, > > + const struct intel_crtc_state *pipe_config, > > + const struct drm_connector_state *conn_state); > > int intel_hdcp_disable(struct intel_connector *connector); void > > intel_hdcp_update_pipe(struct intel_atomic_state *state, > > struct intel_encoder *encoder, > > -- > Jani Nikula, Intel
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 9151d5add960..b644cf981846 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3259,10 +3259,7 @@ static void intel_enable_ddi(struct intel_atomic_state *state, else intel_enable_ddi_dp(state, encoder, crtc_state, conn_state); - /* Enable hdcp if it's desired */ - if (conn_state->content_protection == - DRM_MODE_CONTENT_PROTECTION_DESIRED) - intel_hdcp_enable(state, encoder, crtc_state, conn_state); + intel_hdcp_enable(state, encoder, crtc_state, conn_state); } static void intel_disable_ddi_dp(struct intel_atomic_state *state, diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 7b4628f4f124..4366da79fe81 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -836,10 +836,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, intel_audio_codec_enable(encoder, pipe_config, conn_state); - /* Enable hdcp if it's desired */ - if (conn_state->content_protection == - DRM_MODE_CONTENT_PROTECTION_DESIRED) - intel_hdcp_enable(state, encoder, pipe_config, conn_state); + intel_hdcp_enable(state, encoder, pipe_config, conn_state); } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder, diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 7c0cfcb48521..44c0a93f3af8 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -2324,10 +2324,10 @@ intel_hdcp_set_streams(struct intel_digital_port *dig_port, return 0; } -int intel_hdcp_enable(struct intel_atomic_state *state, - struct intel_encoder *encoder, - const struct intel_crtc_state *pipe_config, - const struct drm_connector_state *conn_state) +static int _intel_hdcp_enable(struct intel_atomic_state *state, + struct intel_encoder *encoder, + const struct intel_crtc_state *pipe_config, + const struct drm_connector_state *conn_state) { struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct intel_connector *connector = @@ -2404,6 +2404,17 @@ int intel_hdcp_enable(struct intel_atomic_state *state, return ret; } +void intel_hdcp_enable(struct intel_atomic_state *state, + struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + const struct drm_connector_state *conn_state) +{ + /* Enable hdcp if it's desired */ + if (conn_state->content_protection == + DRM_MODE_CONTENT_PROTECTION_DESIRED) + _intel_hdcp_enable(state, encoder, crtc_state, conn_state); +} + int intel_hdcp_disable(struct intel_connector *connector) { struct intel_digital_port *dig_port = intel_attached_dig_port(connector); @@ -2491,7 +2502,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state, } if (desired_and_not_enabled || content_protection_type_changed) - intel_hdcp_enable(state, encoder, crtc_state, conn_state); + _intel_hdcp_enable(state, encoder, crtc_state, conn_state); } void intel_hdcp_component_fini(struct drm_i915_private *i915) diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h index 5997c52a0958..a9c784fd9ba5 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.h +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h @@ -28,10 +28,10 @@ void intel_hdcp_atomic_check(struct drm_connector *connector, int intel_hdcp_init(struct intel_connector *connector, struct intel_digital_port *dig_port, const struct intel_hdcp_shim *hdcp_shim); -int intel_hdcp_enable(struct intel_atomic_state *state, - struct intel_encoder *encoder, - const struct intel_crtc_state *pipe_config, - const struct drm_connector_state *conn_state); +void intel_hdcp_enable(struct intel_atomic_state *state, + struct intel_encoder *encoder, + const struct intel_crtc_state *pipe_config, + const struct drm_connector_state *conn_state); int intel_hdcp_disable(struct intel_connector *connector); void intel_hdcp_update_pipe(struct intel_atomic_state *state, struct intel_encoder *encoder,
Let's create a blanket function which just has some conditions which need to be checked before connectors enable hdcp. This cleans up code and avoids code duplication. --v3 -Keep function name as intel_hdcp_enable() [Jani] Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 5 +---- drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +---- drivers/gpu/drm/i915/display/intel_hdcp.c | 21 ++++++++++++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 8 ++++---- 4 files changed, 22 insertions(+), 17 deletions(-)