From: Ville Syrjälä Date: Fri, 18 Nov 2022 10:55:19 +0000 (+0200) Subject: drm/i915/dvo: Actually initialize the DVO encoder type X-Git-Tag: v6.6.7~1918^2~17^2~818 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ebf5caf1fae75634b0564152958ecb433cfa952;p=platform%2Fkernel%2Flinux-starfive.git drm/i915/dvo: Actually initialize the DVO encoder type We call drm_encoder_init() before determining the correct encoder type, thus we always end up with DRM_MODE_ENCODER_NONE. Determine the correct encoder type earlier. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20221118105525.27254-4-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c index 8859e40..fe61cb4 100644 --- a/drivers/gpu/drm/i915/display/intel_dvo.c +++ b/drivers/gpu/drm/i915/display/intel_dvo.c @@ -387,13 +387,26 @@ static enum port intel_dvo_port(i915_reg_t dvo_reg) return PORT_C; } +static int intel_dvo_encoder_type(const struct intel_dvo_device *dvo) +{ + switch (dvo->type) { + case INTEL_DVO_CHIP_TMDS: + return DRM_MODE_ENCODER_TMDS; + case INTEL_DVO_CHIP_LVDS_NO_FIXED: + case INTEL_DVO_CHIP_LVDS: + return DRM_MODE_ENCODER_LVDS; + default: + MISSING_CASE(dvo->type); + return DRM_MODE_ENCODER_NONE; + } +} + void intel_dvo_init(struct drm_i915_private *dev_priv) { struct intel_encoder *intel_encoder; struct intel_dvo *intel_dvo; struct intel_connector *intel_connector; int i; - int encoder_type = DRM_MODE_ENCODER_NONE; intel_dvo = kzalloc(sizeof(*intel_dvo), GFP_KERNEL); if (!intel_dvo) @@ -481,7 +494,8 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) port = intel_dvo_port(dvo->dvo_reg); drm_encoder_init(&dev_priv->drm, &intel_encoder->base, - &intel_dvo_enc_funcs, encoder_type, + &intel_dvo_enc_funcs, + intel_dvo_encoder_type(dvo), "DVO %c", port_name(port)); intel_encoder->type = INTEL_OUTPUT_DVO; @@ -500,14 +514,12 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) drm_connector_init(&dev_priv->drm, connector, &intel_dvo_connector_funcs, DRM_MODE_CONNECTOR_DVII); - encoder_type = DRM_MODE_ENCODER_TMDS; break; case INTEL_DVO_CHIP_LVDS_NO_FIXED: case INTEL_DVO_CHIP_LVDS: drm_connector_init(&dev_priv->drm, connector, &intel_dvo_connector_funcs, DRM_MODE_CONNECTOR_LVDS); - encoder_type = DRM_MODE_ENCODER_LVDS; break; }