Commit 2cf9cd82 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Remove redundant on stack dpll_hw_state from cnl_get_dpll()

Just store the stuff directly into crtc_state->dpll_hw_state rather
than to a temp and copying the whole thing over.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190207173230.22368-8-ville.syrjala@linux.intel.comReviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent e7251d71
...@@ -2307,8 +2307,7 @@ static bool cnl_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state) ...@@ -2307,8 +2307,7 @@ static bool cnl_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state)
} }
static bool static bool
cnl_ddi_dp_set_dpll_hw_state(struct intel_crtc_state *crtc_state, cnl_ddi_dp_set_dpll_hw_state(struct intel_crtc_state *crtc_state)
struct intel_dpll_hw_state *dpll_hw_state)
{ {
u32 cfgcr0; u32 cfgcr0;
...@@ -2344,7 +2343,11 @@ cnl_ddi_dp_set_dpll_hw_state(struct intel_crtc_state *crtc_state, ...@@ -2344,7 +2343,11 @@ cnl_ddi_dp_set_dpll_hw_state(struct intel_crtc_state *crtc_state,
break; break;
} }
dpll_hw_state->cfgcr0 = cfgcr0; memset(&crtc_state->dpll_hw_state, 0,
sizeof(crtc_state->dpll_hw_state));
crtc_state->dpll_hw_state.cfgcr0 = cfgcr0;
return true; return true;
} }
...@@ -2354,9 +2357,6 @@ cnl_get_dpll(struct intel_crtc_state *crtc_state, ...@@ -2354,9 +2357,6 @@ cnl_get_dpll(struct intel_crtc_state *crtc_state,
{ {
struct intel_shared_dpll *pll; struct intel_shared_dpll *pll;
bool bret; bool bret;
struct intel_dpll_hw_state dpll_hw_state;
memset(&dpll_hw_state, 0, sizeof(dpll_hw_state));
if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
bret = cnl_ddi_hdmi_pll_dividers(crtc_state); bret = cnl_ddi_hdmi_pll_dividers(crtc_state);
...@@ -2365,12 +2365,11 @@ cnl_get_dpll(struct intel_crtc_state *crtc_state, ...@@ -2365,12 +2365,11 @@ cnl_get_dpll(struct intel_crtc_state *crtc_state,
return NULL; return NULL;
} }
} else if (intel_crtc_has_dp_encoder(crtc_state)) { } else if (intel_crtc_has_dp_encoder(crtc_state)) {
bret = cnl_ddi_dp_set_dpll_hw_state(crtc_state, &dpll_hw_state); bret = cnl_ddi_dp_set_dpll_hw_state(crtc_state);
if (!bret) { if (!bret) {
DRM_DEBUG_KMS("Could not set DP dpll HW state.\n"); DRM_DEBUG_KMS("Could not set DP dpll HW state.\n");
return NULL; return NULL;
} }
crtc_state->dpll_hw_state = dpll_hw_state;
} else { } else {
DRM_DEBUG_KMS("Skip DPLL setup for output_types 0x%x\n", DRM_DEBUG_KMS("Skip DPLL setup for output_types 0x%x\n",
crtc_state->output_types); crtc_state->output_types);
......
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