Re: [Intel-gfx] [PATCH 2/9] drm/i915/display: remove alias to dig_port

2019-12-23 Thread Matt Roper
On Mon, Dec 23, 2019 at 11:58:43AM -0800, Lucas De Marchi wrote:
> We don't need intel_dig_port and dig_port to refer to the same thing.
> Prefer the latter.
> 
> Signed-off-by: Lucas De Marchi 

Reviewed-by: Matt Roper 

> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c | 10 --
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c 
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index c9ba7d7f3787..f054c82214c0 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3674,12 +3674,11 @@ static void intel_ddi_pre_enable_hdmi(struct 
> intel_encoder *encoder,
> const struct intel_crtc_state *crtc_state,
> const struct drm_connector_state 
> *conn_state)
>  {
> - struct intel_digital_port *intel_dig_port = 
> enc_to_dig_port(&encoder->base);
> - struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
> + struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
> + struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
>   struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>   enum port port = encoder->port;
>   int level = intel_ddi_hdmi_level(dev_priv, port);
> - struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
>  
>   intel_dp_dual_mode_set_tmds_output(intel_hdmi, true);
>   intel_ddi_clk_select(encoder, crtc_state);
> @@ -3709,9 +3708,8 @@ static void intel_ddi_pre_enable_hdmi(struct 
> intel_encoder *encoder,
>  
>   intel_ddi_enable_pipe_clock(crtc_state);
>  
> - intel_dig_port->set_infoframes(encoder,
> -crtc_state->has_infoframe,
> -crtc_state, conn_state);
> + dig_port->set_infoframes(encoder, crtc_state->has_infoframe,
> +  crtc_state, conn_state);
>  }
>  
>  static void intel_ddi_pre_enable(struct intel_encoder *encoder,
> -- 
> 2.24.0
> 

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH 2/9] drm/i915/display: remove alias to dig_port

2019-12-23 Thread Lucas De Marchi
We don't need intel_dig_port and dig_port to refer to the same thing.
Prefer the latter.

Signed-off-by: Lucas De Marchi 
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c 
b/drivers/gpu/drm/i915/display/intel_ddi.c
index c9ba7d7f3787..f054c82214c0 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3674,12 +3674,11 @@ static void intel_ddi_pre_enable_hdmi(struct 
intel_encoder *encoder,
  const struct intel_crtc_state *crtc_state,
  const struct drm_connector_state 
*conn_state)
 {
-   struct intel_digital_port *intel_dig_port = 
enc_to_dig_port(&encoder->base);
-   struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
+   struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
+   struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
enum port port = encoder->port;
int level = intel_ddi_hdmi_level(dev_priv, port);
-   struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
 
intel_dp_dual_mode_set_tmds_output(intel_hdmi, true);
intel_ddi_clk_select(encoder, crtc_state);
@@ -3709,9 +3708,8 @@ static void intel_ddi_pre_enable_hdmi(struct 
intel_encoder *encoder,
 
intel_ddi_enable_pipe_clock(crtc_state);
 
-   intel_dig_port->set_infoframes(encoder,
-  crtc_state->has_infoframe,
-  crtc_state, conn_state);
+   dig_port->set_infoframes(encoder, crtc_state->has_infoframe,
+crtc_state, conn_state);
 }
 
 static void intel_ddi_pre_enable(struct intel_encoder *encoder,
-- 
2.24.0

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx