diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 4d63839bd9b4..c3c5ed416a73 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c | |||
@@ -98,7 +98,7 @@ intel_find_panel_downclock(struct drm_device *dev, | |||
98 | /* adjusted_mode has been preset to be the panel's fixed mode */ | 98 | /* adjusted_mode has been preset to be the panel's fixed mode */ |
99 | void | 99 | void |
100 | intel_pch_panel_fitting(struct intel_crtc *intel_crtc, | 100 | intel_pch_panel_fitting(struct intel_crtc *intel_crtc, |
101 | struct intel_crtc_config *pipe_config, | 101 | struct intel_crtc_state *pipe_config, |
102 | int fitting_mode) | 102 | int fitting_mode) |
103 | { | 103 | { |
104 | struct drm_display_mode *adjusted_mode; | 104 | struct drm_display_mode *adjusted_mode; |
@@ -223,7 +223,7 @@ static inline u32 panel_fitter_scaling(u32 source, u32 target) | |||
223 | return (FACTOR * ratio + FACTOR/2) / FACTOR; | 223 | return (FACTOR * ratio + FACTOR/2) / FACTOR; |
224 | } | 224 | } |
225 | 225 | ||
226 | static void i965_scale_aspect(struct intel_crtc_config *pipe_config, | 226 | static void i965_scale_aspect(struct intel_crtc_state *pipe_config, |
227 | u32 *pfit_control) | 227 | u32 *pfit_control) |
228 | { | 228 | { |
229 | struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; | 229 | struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; |
@@ -243,7 +243,7 @@ static void i965_scale_aspect(struct intel_crtc_config *pipe_config, | |||
243 | *pfit_control |= PFIT_ENABLE | PFIT_SCALING_AUTO; | 243 | *pfit_control |= PFIT_ENABLE | PFIT_SCALING_AUTO; |
244 | } | 244 | } |
245 | 245 | ||
246 | static void i9xx_scale_aspect(struct intel_crtc_config *pipe_config, | 246 | static void i9xx_scale_aspect(struct intel_crtc_state *pipe_config, |
247 | u32 *pfit_control, u32 *pfit_pgm_ratios, | 247 | u32 *pfit_control, u32 *pfit_pgm_ratios, |
248 | u32 *border) | 248 | u32 *border) |
249 | { | 249 | { |
@@ -301,7 +301,7 @@ static void i9xx_scale_aspect(struct intel_crtc_config *pipe_config, | |||
301 | } | 301 | } |
302 | 302 | ||
303 | void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, | 303 | void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, |
304 | struct intel_crtc_config *pipe_config, | 304 | struct intel_crtc_state *pipe_config, |
305 | int fitting_mode) | 305 | int fitting_mode) |
306 | { | 306 | { |
307 | struct drm_device *dev = intel_crtc->base.dev; | 307 | struct drm_device *dev = intel_crtc->base.dev; |