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

Commit 22fd0fab authored by Jesse Barnes's avatar Jesse Barnes Committed by Eric Anholt
Browse files

drm/i915: pageflip fixes 



This patch brings the tree up to date with some fixes that were in a
more recent version of the page flipping patch you applied.  It fixes
pre-965 flip support, removes a leftover hack that forced alignment,
and initializes the pipe & plane CRTC mappings.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 6e36595a

drivers/gpu/drm/i915/intel_display.c

+13 −3
Original line number Original line Diff line number Diff line
@@ -1213,7 +1213,6 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj) 
		BUG();

		BUG();

	}

	}





	alignment = 256 * 1024;

	ret = i915_gem_object_pin(obj, alignment);

	ret = i915_gem_object_pin(obj, alignment);

	if (ret != 0)

	if (ret != 0)

		return ret;

		return ret;
@@ -4227,8 +4226,13 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, 
	OUT_RING(MI_DISPLAY_FLIP |

	OUT_RING(MI_DISPLAY_FLIP |

		 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));

		 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));

	OUT_RING(fb->pitch);

	OUT_RING(fb->pitch);

	if (IS_I965G(dev)) {

		OUT_RING(obj_priv->gtt_offset | obj_priv->tiling_mode);

		OUT_RING(obj_priv->gtt_offset | obj_priv->tiling_mode);

		OUT_RING((fb->width << 16) | fb->height);

		OUT_RING((fb->width << 16) | fb->height);

	} else {

		OUT_RING(obj_priv->gtt_offset);

		OUT_RING(MI_NOOP);

	}

	ADVANCE_LP_RING();

	ADVANCE_LP_RING();





	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->struct_mutex);
@@ -4258,6 +4262,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = { 




static void intel_crtc_init(struct drm_device *dev, int pipe)

static void intel_crtc_init(struct drm_device *dev, int pipe)

{

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc;

	struct intel_crtc *intel_crtc;

	int i;

	int i;
@@ -4284,6 +4289,11 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) 
		intel_crtc->plane = ((pipe == 0) ? 1 : 0);

		intel_crtc->plane = ((pipe == 0) ? 1 : 0);

	}

	}





	BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||

	       dev_priv->plane_to_crtc_mapping[intel_crtc->plane] != NULL);

	dev_priv->plane_to_crtc_mapping[intel_crtc->plane] = &intel_crtc->base;

	dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = &intel_crtc->base;



	intel_crtc->cursor_addr = 0;

	intel_crtc->cursor_addr = 0;

	intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;

	intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;

	drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);

	drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);