diff options
author | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2017-02-23 02:15:59 -0500 |
---|---|---|
committer | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2017-02-23 07:56:51 -0500 |
commit | 6ebc69238df36bc61380a68f607a1c2039af134f (patch) | |
tree | fe464ef65826475cb8064ae7a8be8524e818773a /drivers/gpu/drm/i915/intel_atomic.c | |
parent | 5b7280f03cdcfcc8af7f087771bb3e49c4caa81b (diff) |
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: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170223071600.14356-4-ander.conselvan.de.oliveira@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_atomic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index aa9160e7f1d8..58916e32c6c4 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c | |||
@@ -121,7 +121,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc, | |||
121 | 121 | ||
122 | /** | 122 | /** |
123 | * intel_atomic_setup_scalers() - setup scalers for crtc per staged requests | 123 | * intel_atomic_setup_scalers() - setup scalers for crtc per staged requests |
124 | * @dev: DRM device | 124 | * @dev_priv: i915 device |
125 | * @crtc: intel crtc | 125 | * @crtc: intel crtc |
126 | * @crtc_state: incoming crtc_state to validate and setup scalers | 126 | * @crtc_state: incoming crtc_state to validate and setup scalers |
127 | * | 127 | * |
@@ -136,9 +136,9 @@ intel_crtc_destroy_state(struct drm_crtc *crtc, | |||
136 | * 0 - scalers were setup succesfully | 136 | * 0 - scalers were setup succesfully |
137 | * error code - otherwise | 137 | * error code - otherwise |
138 | */ | 138 | */ |
139 | int intel_atomic_setup_scalers(struct drm_device *dev, | 139 | int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, |
140 | struct intel_crtc *intel_crtc, | 140 | struct intel_crtc *intel_crtc, |
141 | struct intel_crtc_state *crtc_state) | 141 | struct intel_crtc_state *crtc_state) |
142 | { | 142 | { |
143 | struct drm_plane *plane = NULL; | 143 | struct drm_plane *plane = NULL; |
144 | struct intel_plane *intel_plane; | 144 | struct intel_plane *intel_plane; |
@@ -199,7 +199,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev, | |||
199 | */ | 199 | */ |
200 | if (!plane) { | 200 | if (!plane) { |
201 | struct drm_plane_state *state; | 201 | struct drm_plane_state *state; |
202 | plane = drm_plane_from_index(dev, i); | 202 | plane = drm_plane_from_index(&dev_priv->drm, i); |
203 | state = drm_atomic_get_plane_state(drm_state, plane); | 203 | state = drm_atomic_get_plane_state(drm_state, plane); |
204 | if (IS_ERR(state)) { | 204 | if (IS_ERR(state)) { |
205 | DRM_DEBUG_KMS("Failed to add [PLANE:%d] to drm_state\n", | 205 | DRM_DEBUG_KMS("Failed to add [PLANE:%d] to drm_state\n", |