drm/i915: Remove redundant on stack dpll_hw_state from cnl_get_dpll() (2cf9cd82) · Commits · 戴 / test

drivers/gpu/drm/i915/intel_dpll_mgr.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -2307,8 +2307,7 @@ static bool cnl_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state)
		}

		static bool
		cnl_ddi_dp_set_dpll_hw_state(struct intel_crtc_state *crtc_state,
		struct intel_dpll_hw_state *dpll_hw_state)
		cnl_ddi_dp_set_dpll_hw_state(struct intel_crtc_state *crtc_state)
		{
		u32 cfgcr0;

		@@ -2344,7 +2343,11 @@ cnl_ddi_dp_set_dpll_hw_state(struct intel_crtc_state *crtc_state,
		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;
		}

		@@ -2354,9 +2357,6 @@ cnl_get_dpll(struct intel_crtc_state *crtc_state,
		{
		struct intel_shared_dpll *pll;
		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)) {
		bret = cnl_ddi_hdmi_pll_dividers(crtc_state);
		@@ -2365,12 +2365,11 @@ cnl_get_dpll(struct intel_crtc_state *crtc_state,
		return NULL;
		}
		} 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) {
		DRM_DEBUG_KMS("Could not set DP dpll HW state.\n");
		return NULL;
		}
		crtc_state->dpll_hw_state = dpll_hw_state;
		} else {
		DRM_DEBUG_KMS("Skip DPLL setup for output_types 0x%x\n",
		crtc_state->output_types);