Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ebc6923 authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira
Browse files

drm/i915/glk: Pass dev_priv to intel_atomic_setup_scalers() 



Pass dev_priv to intel_atomic_setup_scalers(). The next patch will need
a dev_priv pointer.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170223071600.14356-4-ander.conselvan.de.oliveira@intel.com
parent 5b7280f0

drivers/gpu/drm/i915/intel_atomic.c

+5 −5
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc, 


/**

 * intel_atomic_setup_scalers() - setup scalers for crtc per staged requests

 * @dev: DRM device

 * @dev_priv: i915 device

 * @crtc: intel crtc

 * @crtc_state: incoming crtc_state to validate and setup scalers

 *
@@ -136,7 +136,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc, 
 *         0 - scalers were setup succesfully

 *         error code - otherwise

 */

int intel_atomic_setup_scalers(struct drm_device *dev,

int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,

			       struct intel_crtc *intel_crtc,

			       struct intel_crtc_state *crtc_state)

{
@@ -199,7 +199,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev, 
			 */

			if (!plane) {

				struct drm_plane_state *state;

				plane = drm_plane_from_index(dev, i);

				plane = drm_plane_from_index(&dev_priv->drm, i);

				state = drm_atomic_get_plane_state(drm_state, plane);

				if (IS_ERR(state)) {

					DRM_DEBUG_KMS("Failed to add [PLANE:%d] to drm_state\n",

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -11036,7 +11036,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, 
			ret = skl_update_scaler_crtc(pipe_config);



		if (!ret)

			ret = intel_atomic_setup_scalers(dev, intel_crtc,

			ret = intel_atomic_setup_scalers(dev_priv, intel_crtc,

							 pipe_config);

	}

drivers/gpu/drm/i915/intel_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -1894,7 +1894,7 @@ intel_atomic_get_existing_plane_state(struct drm_atomic_state *state, 
	return to_intel_plane_state(plane_state);

}



int intel_atomic_setup_scalers(struct drm_device *dev,

int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,

			       struct intel_crtc *intel_crtc,

			       struct intel_crtc_state *crtc_state);