mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
drm/i915/dvo: Eliminate useless 'port' variable
Reorder the drm_encoder_init() vs. encoder->port assignment so that we don't need the extra 'port' variable. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20221118105525.27254-6-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
201ec1bbca
commit
c584f86c62
1 changed files with 6 additions and 8 deletions
|
@ -453,7 +453,6 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
|
||||||
bool dvoinit;
|
bool dvoinit;
|
||||||
enum pipe pipe;
|
enum pipe pipe;
|
||||||
u32 dpll[I915_MAX_PIPES];
|
u32 dpll[I915_MAX_PIPES];
|
||||||
enum port port;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allow the I2C driver info to specify the GPIO to be used in
|
* Allow the I2C driver info to specify the GPIO to be used in
|
||||||
|
@ -506,21 +505,20 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
|
||||||
if (!dvoinit)
|
if (!dvoinit)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
port = intel_dvo_port(dvo->dvo_reg);
|
|
||||||
drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
|
|
||||||
&intel_dvo_enc_funcs,
|
|
||||||
intel_dvo_encoder_type(dvo),
|
|
||||||
"DVO %c", port_name(port));
|
|
||||||
|
|
||||||
intel_encoder->type = INTEL_OUTPUT_DVO;
|
intel_encoder->type = INTEL_OUTPUT_DVO;
|
||||||
intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
|
intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
|
||||||
intel_encoder->port = port;
|
intel_encoder->port = intel_dvo_port(dvo->dvo_reg);
|
||||||
intel_encoder->pipe_mask = ~0;
|
intel_encoder->pipe_mask = ~0;
|
||||||
|
|
||||||
if (dvo->type != INTEL_DVO_CHIP_LVDS)
|
if (dvo->type != INTEL_DVO_CHIP_LVDS)
|
||||||
intel_encoder->cloneable = BIT(INTEL_OUTPUT_ANALOG) |
|
intel_encoder->cloneable = BIT(INTEL_OUTPUT_ANALOG) |
|
||||||
BIT(INTEL_OUTPUT_DVO);
|
BIT(INTEL_OUTPUT_DVO);
|
||||||
|
|
||||||
|
drm_encoder_init(&dev_priv->drm, &intel_encoder->base,
|
||||||
|
&intel_dvo_enc_funcs,
|
||||||
|
intel_dvo_encoder_type(dvo),
|
||||||
|
"DVO %c", port_name(intel_encoder->port));
|
||||||
|
|
||||||
if (dvo->type == INTEL_DVO_CHIP_TMDS)
|
if (dvo->type == INTEL_DVO_CHIP_TMDS)
|
||||||
intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT |
|
intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT |
|
||||||
DRM_CONNECTOR_POLL_DISCONNECT;
|
DRM_CONNECTOR_POLL_DISCONNECT;
|
||||||
|
|
Loading…
Reference in a new issue