Commit 525b9311 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass intel_crtc to intel_crtc_active() 



Unify our approach to things by passing around intel_crtc instead of
drm_crtc.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477946245-14134-4-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 65edccce

drivers/gpu/drm/i915/intel_display.c

+3 −5
Original line number Diff line number Diff line
@@ -1008,10 +1008,8 @@ bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock, 
				  target_clock, refclk, NULL, best_clock);

}



bool intel_crtc_active(struct drm_crtc *crtc)

bool intel_crtc_active(struct intel_crtc *crtc)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	/* Be paranoid as we can arrive here with only partial

	 * state retrieved from the hardware during setup.

	 *
@@ -1025,8 +1023,8 @@ bool intel_crtc_active(struct drm_crtc *crtc) 
	 * crtc->state->active once we have proper CRTC states wired up

	 * for atomic.

	 */

	return intel_crtc->active && crtc->primary->state->fb &&

		intel_crtc->config->base.adjusted_mode.crtc_clock;

	return crtc->active && crtc->base.primary->state->fb &&

		crtc->config->base.adjusted_mode.crtc_clock;

}



enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock, 
			struct dpll *best_clock);

int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);



bool intel_crtc_active(struct drm_crtc *crtc);

bool intel_crtc_active(struct intel_crtc *crtc);

void hsw_enable_ips(struct intel_crtc *crtc);

void hsw_disable_ips(struct intel_crtc *crtc);

enum intel_display_power_domain

drivers/gpu/drm/i915/intel_fbc.c

+1 −1
Original line number Diff line number Diff line
@@ -1306,7 +1306,7 @@ void intel_fbc_init_pipe_state(struct drm_i915_private *dev_priv) 
		return;



	for_each_intel_crtc(&dev_priv->drm, crtc)

		if (intel_crtc_active(&crtc->base) &&

		if (intel_crtc_active(crtc) &&

		    to_intel_plane_state(crtc->base.primary->state)->base.visible)

			dev_priv->fbc.visible_pipes_mask |= (1 << crtc->pipe);

}

drivers/gpu/drm/i915/intel_pm.c

+4 −4
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static struct drm_crtc *single_enabled_crtc(struct drm_device *dev) 
	struct drm_crtc *crtc, *enabled = NULL;



	for_each_crtc(dev, crtc) {

		if (intel_crtc_active(crtc)) {

		if (intel_crtc_active(to_intel_crtc(crtc))) {

			if (enabled)

				return NULL;

			enabled = crtc;
@@ -725,7 +725,7 @@ static bool g4x_compute_wm0(struct drm_device *dev, 
	int entries, tlb_miss;



	crtc = intel_get_crtc_for_plane(dev, plane);

	if (!intel_crtc_active(crtc)) {

	if (!intel_crtc_active(to_intel_crtc(crtc))) {

		*cursor_wm = cursor->guard_size;

		*plane_wm = display->guard_size;

		return false;
@@ -1538,7 +1538,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) 


	fifo_size = dev_priv->display.get_fifo_size(dev, 0);

	crtc = intel_get_crtc_for_plane(dev, 0);

	if (intel_crtc_active(crtc)) {

	if (intel_crtc_active(to_intel_crtc(crtc))) {

		const struct drm_display_mode *adjusted_mode;

		int cpp = drm_format_plane_cpp(crtc->primary->state->fb->pixel_format, 0);

		if (IS_GEN2(dev_priv))
@@ -1560,7 +1560,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) 


	fifo_size = dev_priv->display.get_fifo_size(dev, 1);

	crtc = intel_get_crtc_for_plane(dev, 1);

	if (intel_crtc_active(crtc)) {

	if (intel_crtc_active(to_intel_crtc(crtc))) {

		const struct drm_display_mode *adjusted_mode;

		int cpp = drm_format_plane_cpp(crtc->primary->state->fb->pixel_format, 0);

		if (IS_GEN2(dev_priv))