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

Commit 446d2183 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/overlay: Tidy update_pfit_vscale_ratio() 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7340ea7d

drivers/gpu/drm/i915/intel_overlay.c

+10 −9
Original line number Diff line number Diff line
@@ -937,19 +937,20 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay) 
{

	struct drm_device *dev = overlay->dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	u32 ratio;

	u32 pfit_control = I915_READ(PFIT_CONTROL);

	u32 ratio;



	/* XXX: This is not the same logic as in the xorg driver, but more in

	 * line with the intel documentation for the i965 */

	if (!IS_I965G(dev) && (pfit_control & VERT_AUTO_SCALE)) {

		ratio = I915_READ(PFIT_AUTO_RATIOS) >> PFIT_VERT_SCALE_SHIFT;

	} else { /* on i965 use the PGM reg to read out the autoscaler values */

		ratio = I915_READ(PFIT_PGM_RATIOS);

		if (IS_I965G(dev))

			ratio >>= PFIT_VERT_SCALE_SHIFT_965;

	 * line with the intel documentation for the i965

	 */

	if (!IS_I965G(dev)) {

		if (pfit_control & VERT_AUTO_SCALE)

			ratio = I915_READ(PFIT_AUTO_RATIOS);

		else

			ratio = I915_READ(PFIT_PGM_RATIOS);

		ratio >>= PFIT_VERT_SCALE_SHIFT;

	} else { /* on i965 use the PGM reg to read out the autoscaler values */

		ratio = I915_READ(PFIT_PGM_RATIOS) >> PFIT_VERT_SCALE_SHIFT_965;

	}



	overlay->pfit_vscale_ratio = ratio;