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

Commit 9084e7d2 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: re-layout intel_panel.c to obey 80 char limit 



Especially intel_gmch_panel_fitting was shifting way too much over the
right edge and also was way too long. So extract two helpers, one for
gen4+ and one for gen2/3. Now the entire thing is again almost
readable ...

Spurred by checkpatch freaking out about a Ville's pipeconfig rework
in intel_panel.c

Otherwise just two lines that needed appropriate breaking.

Not functional change in this patch.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 37327abd

drivers/gpu/drm/i915/intel_panel.c

+88 −64
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc, 
	case DRM_MODE_SCALE_ASPECT:

		/* Scale but preserve the aspect ratio */

		{

			u32 scaled_width = adjusted_mode->hdisplay * pipe_config->pipe_src_h;

			u32 scaled_height = pipe_config->pipe_src_w * adjusted_mode->vdisplay;

			u32 scaled_width = adjusted_mode->hdisplay

				* pipe_config->pipe_src_h;

			u32 scaled_height = pipe_config->pipe_src_w

				* adjusted_mode->vdisplay;

			if (scaled_width > scaled_height) { /* pillar */

				width = scaled_height / pipe_config->pipe_src_h;

				if (width & 1)
@@ -169,34 +171,10 @@ static inline u32 panel_fitter_scaling(u32 source, u32 target) 
	return (FACTOR * ratio + FACTOR/2) / FACTOR;

}



void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,

			      struct intel_crtc_config *pipe_config,

			      int fitting_mode)

static void i965_scale_aspect(struct intel_crtc_config *pipe_config,

			      u32 *pfit_control)

{

	struct drm_device *dev = intel_crtc->base.dev;

	u32 pfit_control = 0, pfit_pgm_ratios = 0, border = 0;

	struct drm_display_mode *adjusted_mode;



	adjusted_mode = &pipe_config->adjusted_mode;



	/* Native modes don't need fitting */

	if (adjusted_mode->hdisplay == pipe_config->pipe_src_w &&

	    adjusted_mode->vdisplay == pipe_config->pipe_src_h)

		goto out;



	switch (fitting_mode) {

	case DRM_MODE_SCALE_CENTER:

		/*

		 * For centered modes, we have to calculate border widths &

		 * heights and modify the values programmed into the CRTC.

		 */

		centre_horizontally(adjusted_mode, pipe_config->pipe_src_w);

		centre_vertically(adjusted_mode, pipe_config->pipe_src_h);

		border = LVDS_BORDER_ENABLE;

		break;

	case DRM_MODE_SCALE_ASPECT:

		/* Scale but preserve the aspect ratio */

		if (INTEL_INFO(dev)->gen >= 4) {

	struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;

	u32 scaled_width = adjusted_mode->hdisplay *

		pipe_config->pipe_src_h;

	u32 scaled_height = pipe_config->pipe_src_w *
@@ -204,18 +182,26 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, 


	/* 965+ is easy, it does everything in hw */

	if (scaled_width > scaled_height)

				pfit_control |= PFIT_ENABLE |

		*pfit_control |= PFIT_ENABLE |

			PFIT_SCALING_PILLAR;

	else if (scaled_width < scaled_height)

				pfit_control |= PFIT_ENABLE |

		*pfit_control |= PFIT_ENABLE |

			PFIT_SCALING_LETTER;

	else if (adjusted_mode->hdisplay != pipe_config->pipe_src_w)

				pfit_control |= PFIT_ENABLE | PFIT_SCALING_AUTO;

		} else {

		*pfit_control |= PFIT_ENABLE | PFIT_SCALING_AUTO;

}



static void i9xx_scale_aspect(struct intel_crtc_config *pipe_config,

			      u32 *pfit_control, u32 *pfit_pgm_ratios,

			      u32 *border)

{

	struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;

	u32 scaled_width = adjusted_mode->hdisplay *

		pipe_config->pipe_src_h;

	u32 scaled_height = pipe_config->pipe_src_w *

		adjusted_mode->vdisplay;

	u32 bits;



	/*

	 * For earlier chips we have to calculate the scaling

	 * ratio by hand and program it into the
@@ -226,12 +212,14 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, 
				    scaled_height /

				    pipe_config->pipe_src_h);



				border = LVDS_BORDER_ENABLE;

		*border = LVDS_BORDER_ENABLE;

		if (pipe_config->pipe_src_h != adjusted_mode->vdisplay) {

					u32 bits = panel_fitter_scaling(pipe_config->pipe_src_h, adjusted_mode->vdisplay);

					pfit_pgm_ratios |= (bits << PFIT_HORIZ_SCALE_SHIFT |

			bits = panel_fitter_scaling(pipe_config->pipe_src_h,

						    adjusted_mode->vdisplay);



			*pfit_pgm_ratios |= (bits << PFIT_HORIZ_SCALE_SHIFT |

					     bits << PFIT_VERT_SCALE_SHIFT);

					pfit_control |= (PFIT_ENABLE |

			*pfit_control |= (PFIT_ENABLE |

					  VERT_INTERP_BILINEAR |

					  HORIZ_INTERP_BILINEAR);

		}
@@ -240,23 +228,58 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, 
				  scaled_width /

				  pipe_config->pipe_src_w);



				border = LVDS_BORDER_ENABLE;

		*border = LVDS_BORDER_ENABLE;

		if (pipe_config->pipe_src_w != adjusted_mode->hdisplay) {

					u32 bits = panel_fitter_scaling(pipe_config->pipe_src_w, adjusted_mode->hdisplay);

					pfit_pgm_ratios |= (bits << PFIT_HORIZ_SCALE_SHIFT |

			bits = panel_fitter_scaling(pipe_config->pipe_src_w,

						    adjusted_mode->hdisplay);



			*pfit_pgm_ratios |= (bits << PFIT_HORIZ_SCALE_SHIFT |

					     bits << PFIT_VERT_SCALE_SHIFT);

					pfit_control |= (PFIT_ENABLE |

			*pfit_control |= (PFIT_ENABLE |

					  VERT_INTERP_BILINEAR |

					  HORIZ_INTERP_BILINEAR);

		}

	} else {

		/* Aspects match, Let hw scale both directions */

				pfit_control |= (PFIT_ENABLE |

		*pfit_control |= (PFIT_ENABLE |

				  VERT_AUTO_SCALE | HORIZ_AUTO_SCALE |

				  VERT_INTERP_BILINEAR |

				  HORIZ_INTERP_BILINEAR);

	}

}



void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,

			      struct intel_crtc_config *pipe_config,

			      int fitting_mode)

{

	struct drm_device *dev = intel_crtc->base.dev;

	u32 pfit_control = 0, pfit_pgm_ratios = 0, border = 0;

	struct drm_display_mode *adjusted_mode;



	adjusted_mode = &pipe_config->adjusted_mode;



	/* Native modes don't need fitting */

	if (adjusted_mode->hdisplay == pipe_config->pipe_src_w &&

	    adjusted_mode->vdisplay == pipe_config->pipe_src_h)

		goto out;



	switch (fitting_mode) {

	case DRM_MODE_SCALE_CENTER:

		/*

		 * For centered modes, we have to calculate border widths &

		 * heights and modify the values programmed into the CRTC.

		 */

		centre_horizontally(adjusted_mode, pipe_config->pipe_src_w);

		centre_vertically(adjusted_mode, pipe_config->pipe_src_h);

		border = LVDS_BORDER_ENABLE;

		break;

	case DRM_MODE_SCALE_ASPECT:

		/* Scale but preserve the aspect ratio */

		if (INTEL_INFO(dev)->gen >= 4)

			i965_scale_aspect(pipe_config, &pfit_control);

		else

			i9xx_scale_aspect(pipe_config, &pfit_control,

					  &pfit_pgm_ratios, &border);

		break;

	case DRM_MODE_SCALE_FULLSCREEN:

		/*
@@ -438,7 +461,8 @@ static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level) 
	I915_WRITE(BLC_PWM_CPU_CTL, val | level);

}



static void intel_panel_actually_set_backlight(struct drm_device *dev, u32 level)

static void intel_panel_actually_set_backlight(struct drm_device *dev,

					       u32 level)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 tmp;