[PATCH] [RFC] drm/i915: use drm_connector to get output type

Mahesh Kumar mahesh1.kumar at intel.com
Tue Apr 10 09:27:28 UTC 2018


Signed-off-by: Mahesh Kumar <mahesh1.kumar at intel.com>
---
 drivers/gpu/drm/i915/intel_ddi.c     | 6 +++---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 drivers/gpu/drm/i915/intel_drv.h     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 92cb26b18a9b..3d41aceaf473 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2861,9 +2861,9 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
 static enum intel_output_type
 intel_ddi_compute_output_type(struct intel_encoder *encoder,
 			      struct intel_crtc_state *crtc_state,
-			      struct drm_connector_state *conn_state)
+			      struct drm_connector *connector)
 {
-	switch (conn_state->connector->connector_type) {
+	switch (connector->connector_type) {
 	case DRM_MODE_CONNECTOR_HDMIA:
 		return INTEL_OUTPUT_HDMI;
 	case DRM_MODE_CONNECTOR_eDP:
@@ -2871,7 +2871,7 @@ intel_ddi_compute_output_type(struct intel_encoder *encoder,
 	case DRM_MODE_CONNECTOR_DisplayPort:
 		return INTEL_OUTPUT_DP;
 	default:
-		MISSING_CASE(conn_state->connector->connector_type);
+		MISSING_CASE(connector->connector_type);
 		return INTEL_OUTPUT_UNUSED;
 	}
 }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 72ef6e3141aa..a989566eac2c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10980,7 +10980,7 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
 		if (encoder->compute_output_type)
 			pipe_config->output_types |=
 				BIT(encoder->compute_output_type(encoder, pipe_config,
-								 connector_state));
+								 connector));
 		else
 			pipe_config->output_types |= BIT(encoder->type);
 	}
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 9969309132d0..32444f0f2e8c 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -219,7 +219,7 @@ struct intel_encoder {
 			struct intel_connector *connector);
 	enum intel_output_type (*compute_output_type)(struct intel_encoder *,
 						      struct intel_crtc_state *,
-						      struct drm_connector_state *);
+						      struct drm_connector *);
 	bool (*compute_config)(struct intel_encoder *,
 			       struct intel_crtc_state *,
 			       struct drm_connector_state *);
-- 
2.16.2



More information about the Intel-gfx-trybot mailing list