drm/i915: Relocate intel_crtc_active() (04da7b9f) · Commits · 戴 / test

drivers/gpu/drm/i915/display/intel_display.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -1045,25 +1045,6 @@ bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state,
		NULL, best_clock);
		}

		bool intel_crtc_active(struct intel_crtc *crtc)
		{
		/* Be paranoid as we can arrive here with only partial
		* state retrieved from the hardware during setup.
		*
		* We can ditch the adjusted_mode.crtc_clock check as soon
		* as Haswell has gained clock readout/fastboot support.
		*
		* We can ditch the crtc->primary->state->fb check as soon as we can
		* properly reconstruct framebuffers.
		*
		* FIXME: The intel_crtc->active here should be switched to
		* crtc->state->active once we have proper CRTC states wired up
		* for atomic.
		*/
		return crtc->active && crtc->base.primary->state->fb &&
		crtc->config->hw.adjusted_mode.crtc_clock;
		}

		enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,
		enum pipe pipe)
		{

+0 −1

Original line number	Diff line number	Diff line
		@@ -565,7 +565,6 @@ bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state,
		struct dpll *best_clock);
		int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);

		bool intel_crtc_active(struct intel_crtc *crtc);
		bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state);
		void hsw_enable_ips(const struct intel_crtc_state *crtc_state);
		void hsw_disable_ips(const struct intel_crtc_state *crtc_state);

+19 −0

Original line number	Diff line number	Diff line
		@@ -814,6 +814,25 @@ static bool intel_wm_plane_visible(const struct intel_crtc_state *crtc_state,
		return plane_state->uapi.visible;
		}

		static bool intel_crtc_active(struct intel_crtc *crtc)
		{
		/* Be paranoid as we can arrive here with only partial
		* state retrieved from the hardware during setup.
		*
		* We can ditch the adjusted_mode.crtc_clock check as soon
		* as Haswell has gained clock readout/fastboot support.
		*
		* We can ditch the crtc->primary->state->fb check as soon as we can
		* properly reconstruct framebuffers.
		*
		* FIXME: The intel_crtc->active here should be switched to
		* crtc->state->active once we have proper CRTC states wired up
		* for atomic.
		*/
		return crtc->active && crtc->base.primary->state->fb &&
		crtc->config->hw.adjusted_mode.crtc_clock;
		}

		static struct intel_crtc single_enabled_crtc(struct drm_i915_private dev_priv)
		{
		struct intel_crtc crtc, enabled = NULL;