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

drm/i915: Pass dev_priv to intel_get_crtc_for_pipe() 



Unify our approach to things by passing around dev_priv instead of dev.

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


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

drivers/gpu/drm/i915/i915_debugfs.c

+1 −2
Original line number Diff line number Diff line
@@ -4131,9 +4131,8 @@ static int pipe_crc_set_source(struct drm_i915_private *dev_priv, 
			       enum pipe pipe,

			       enum intel_pipe_crc_source source)

{

	struct drm_device *dev = &dev_priv->drm;

	struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev, pipe);

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	enum intel_display_power_domain power_domain;

	u32 val = 0; /* shut up gcc */

	int ret;

drivers/gpu/drm/i915/i915_irq.c

+3 −2
Original line number Diff line number Diff line
@@ -965,15 +965,16 @@ static int i915_get_vblank_timestamp(struct drm_device *dev, unsigned int pipe, 
			      struct timeval *vblank_time,

			      unsigned flags)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_crtc *crtc;



	if (pipe >= INTEL_INFO(dev)->num_pipes) {

	if (pipe >= INTEL_INFO(dev_priv)->num_pipes) {

		DRM_ERROR("Invalid crtc %u\n", pipe);

		return -EINVAL;

	}



	/* Get drm_crtc to timestamp: */

	crtc = intel_get_crtc_for_pipe(dev, pipe);

	crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	if (crtc == NULL) {

		DRM_ERROR("Invalid crtc %u\n", pipe);

		return -EINVAL;

drivers/gpu/drm/i915/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -7072,7 +7072,7 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe, 
		if (pipe_config->fdi_lanes <= 2)

			return 0;



		other_crtc = intel_get_crtc_for_pipe(dev, PIPE_C);

		other_crtc = intel_get_crtc_for_pipe(dev_priv, PIPE_C);

		other_crtc_state =

			intel_atomic_get_crtc_state(state, other_crtc);

		if (IS_ERR(other_crtc_state))
@@ -7091,7 +7091,7 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe, 
			return -EINVAL;

		}



		other_crtc = intel_get_crtc_for_pipe(dev, PIPE_B);

		other_crtc = intel_get_crtc_for_pipe(dev_priv, PIPE_B);

		other_crtc_state =

			intel_atomic_get_crtc_state(state, other_crtc);

		if (IS_ERR(other_crtc_state))
@@ -8106,7 +8106,7 @@ static void chv_prepare_pll(struct intel_crtc *crtc, 
int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,

		     const struct dpll *dpll)

{

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(&dev_priv->drm, pipe);

	struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

	struct intel_crtc_state *pipe_config;



	pipe_config = kzalloc(sizeof(*pipe_config), GFP_KERNEL);

drivers/gpu/drm/i915/intel_drv.h

+3 −5
Original line number Diff line number Diff line
@@ -1029,16 +1029,14 @@ vlv_pipe_to_channel(enum pipe pipe) 
}



static inline struct intel_crtc *

intel_get_crtc_for_pipe(struct drm_device *dev, int pipe)

intel_get_crtc_for_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	return dev_priv->pipe_to_crtc_mapping[pipe];

}



static inline struct intel_crtc *

intel_get_crtc_for_plane(struct drm_device *dev, int plane)

intel_get_crtc_for_plane(struct drm_i915_private *dev_priv, enum plane plane)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	return dev_priv->plane_to_crtc_mapping[plane];

}
@@ -1251,7 +1249,7 @@ intel_wait_for_vblank(struct drm_i915_private *dev_priv, enum pipe pipe) 
static inline void

intel_wait_for_vblank_if_active(struct drm_i915_private *dev_priv, int pipe)

{

	const struct intel_crtc *crtc = intel_get_crtc_for_pipe(&dev_priv->drm, pipe);

	const struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);



	if (crtc->active)

		intel_wait_for_vblank(dev_priv, pipe);

drivers/gpu/drm/i915/intel_dvo.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ intel_dvo_get_current_mode(struct drm_connector *connector) 
		struct intel_crtc *crtc;

		int pipe = (dvo_val & DVO_PIPE_B_SELECT) ? 1 : 0;



		crtc = intel_get_crtc_for_pipe(dev, pipe);

		crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

		if (crtc) {

			mode = intel_crtc_mode_get(dev, &crtc->base);

			if (mode) {