Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 580d8ed5 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Give encoders useful names 



Rather than let the core generate usless encoder names, let's pass in
something that actually identifies the piece of hardware we're dealing
with.

v2: Use 'DSI %c' instead of 'MIPI %c' for DSI encoders (Jani)
v3: Use port_name() in DSI code since we have it

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1464371966-15190-7-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 38573dc1

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -839,7 +839,7 @@ void intel_crt_init(struct drm_device *dev) 
			   &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);

			   &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);





	drm_encoder_init(dev, &crt->base.base, &intel_crt_enc_funcs,

	drm_encoder_init(dev, &crt->base.base, &intel_crt_enc_funcs,

			 DRM_MODE_ENCODER_DAC, NULL);

			 DRM_MODE_ENCODER_DAC, "CRT");





	intel_connector_attach_encoder(intel_connector, &crt->base);

	intel_connector_attach_encoder(intel_connector, &crt->base);

drivers/gpu/drm/i915/intel_ddi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2347,7 +2347,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) 
	encoder = &intel_encoder->base;

	encoder = &intel_encoder->base;





	drm_encoder_init(dev, encoder, &intel_ddi_funcs,

	drm_encoder_init(dev, encoder, &intel_ddi_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);

			 DRM_MODE_ENCODER_TMDS, "DDI %c", port_name(port));





	intel_encoder->compute_config = intel_ddi_compute_config;

	intel_encoder->compute_config = intel_ddi_compute_config;

	intel_encoder->enable = intel_enable_ddi;

	intel_encoder->enable = intel_enable_ddi;

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5590,7 +5590,7 @@ intel_dp_init(struct drm_device *dev, 
	encoder = &intel_encoder->base;

	encoder = &intel_encoder->base;





	if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,

	if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,

			     DRM_MODE_ENCODER_TMDS, NULL))

			     DRM_MODE_ENCODER_TMDS, "DP %c", port_name(port)))

		goto err_encoder_init;

		goto err_encoder_init;





	intel_encoder->compute_config = intel_dp_compute_config;

	intel_encoder->compute_config = intel_dp_compute_config;

drivers/gpu/drm/i915/intel_dp_mst.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -534,7 +534,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum 
	intel_mst->primary = intel_dig_port;

	intel_mst->primary = intel_dig_port;





	drm_encoder_init(dev, &intel_encoder->base, &intel_dp_mst_enc_funcs,

	drm_encoder_init(dev, &intel_encoder->base, &intel_dp_mst_enc_funcs,

			 DRM_MODE_ENCODER_DPMST, NULL);

			 DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe));





	intel_encoder->type = INTEL_OUTPUT_DP_MST;

	intel_encoder->type = INTEL_OUTPUT_DP_MST;

	intel_encoder->crtc_mask = 0x7;

	intel_encoder->crtc_mask = 0x7;

drivers/gpu/drm/i915/intel_dsi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1450,7 +1450,7 @@ void intel_dsi_init(struct drm_device *dev) 
	connector = &intel_connector->base;

	connector = &intel_connector->base;





	drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,

	drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,

			 NULL);

			 "DSI %c", port_name(port));





	intel_encoder->compute_config = intel_dsi_compute_config;

	intel_encoder->compute_config = intel_dsi_compute_config;

	intel_encoder->pre_enable = intel_dsi_pre_enable;

	intel_encoder->pre_enable = intel_dsi_pre_enable;