Commit 743acd11 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Get rid of silly void* from MST code

Not sure why this thing is trying to avoid declaring the proper
type for these pointers. But since these are used only once let's
just get rid of the local variable entirely.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200310202752.28454-1-ville.syrjala@linux.intel.comReviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 1c664c15
...@@ -50,7 +50,6 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, ...@@ -50,7 +50,6 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
struct drm_i915_private *i915 = to_i915(connector->base.dev); struct drm_i915_private *i915 = to_i915(connector->base.dev);
const struct drm_display_mode *adjusted_mode = const struct drm_display_mode *adjusted_mode =
&crtc_state->hw.adjusted_mode; &crtc_state->hw.adjusted_mode;
void *port = connector->port;
bool constant_n = drm_dp_has_quirk(&intel_dp->desc, 0, bool constant_n = drm_dp_has_quirk(&intel_dp->desc, 0,
DP_DPCD_QUIRK_CONSTANT_N); DP_DPCD_QUIRK_CONSTANT_N);
int bpp, slots = -EINVAL; int bpp, slots = -EINVAL;
...@@ -66,7 +65,8 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, ...@@ -66,7 +65,8 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
false); false);
slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr, slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr,
port, crtc_state->pbn, 0); connector->port,
crtc_state->pbn, 0);
if (slots == -EDEADLK) if (slots == -EDEADLK)
return slots; return slots;
if (slots >= 0) if (slots >= 0)
...@@ -149,7 +149,6 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, ...@@ -149,7 +149,6 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
to_intel_digital_connector_state(conn_state); to_intel_digital_connector_state(conn_state);
const struct drm_display_mode *adjusted_mode = const struct drm_display_mode *adjusted_mode =
&pipe_config->hw.adjusted_mode; &pipe_config->hw.adjusted_mode;
void *port = connector->port;
struct link_config_limits limits; struct link_config_limits limits;
int ret; int ret;
...@@ -161,7 +160,8 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, ...@@ -161,7 +160,8 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO) if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
pipe_config->has_audio = pipe_config->has_audio =
drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, port); drm_dp_mst_port_has_audio(&intel_dp->mst_mgr,
connector->port);
else else
pipe_config->has_audio = pipe_config->has_audio =
intel_conn_state->force_audio == HDMI_AUDIO_ON; intel_conn_state->force_audio == HDMI_AUDIO_ON;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment