Skip to content

Commit

Permalink
drm/i915/overlay: Refactor do_wait_request()
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Chris Wilson committed Sep 8, 2010
1 parent 9f7c3f4 commit b6c028e
Showing 1 changed file with 37 additions and 80 deletions.
117 changes: 37 additions & 80 deletions drivers/gpu/drm/i915/intel_overlay.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,41 +241,51 @@ static void intel_overlay_unmap_regs(struct intel_overlay *overlay)
return;
}

/* overlay needs to be disable in OCMD reg */
static int intel_overlay_on(struct intel_overlay *overlay)
static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
bool interruptible,
int stage)
{
struct drm_device *dev = overlay->dev;
int ret;
drm_i915_private_t *dev_priv = dev->dev_private;

BUG_ON(overlay->active);

overlay->active = 1;
overlay->hw_wedged = NEEDS_WAIT_FOR_FLIP;

BEGIN_LP_RING(4);
OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_ON);
OUT_RING(overlay->flip_addr | OFC_UPDATE);
OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
OUT_RING(MI_NOOP);
ADVANCE_LP_RING();
int ret;

overlay->last_flip_req =
i915_add_request(dev, NULL, &dev_priv->render_ring);
if (overlay->last_flip_req == 0)
return -ENOMEM;

overlay->hw_wedged = stage;
ret = i915_do_wait_request(dev,
overlay->last_flip_req, true,
&dev_priv->render_ring);
if (ret != 0)
if (ret)
return ret;

overlay->hw_wedged = 0;
overlay->last_flip_req = 0;
return 0;
}

/* overlay needs to be disable in OCMD reg */
static int intel_overlay_on(struct intel_overlay *overlay)
{
struct drm_device *dev = overlay->dev;

BUG_ON(overlay->active);

overlay->active = 1;

BEGIN_LP_RING(4);
OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_ON);
OUT_RING(overlay->flip_addr | OFC_UPDATE);
OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
OUT_RING(MI_NOOP);
ADVANCE_LP_RING();

return intel_overlay_do_wait_request(overlay, true,
NEEDS_WAIT_FOR_FLIP);
}

/* overlay needs to be enabled in OCMD reg */
static void intel_overlay_continue(struct intel_overlay *overlay,
bool load_polyphase_filter)
Expand Down Expand Up @@ -326,35 +336,19 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay)
}

/* synchronous slowpath */
overlay->hw_wedged = RELEASE_OLD_VID;

BEGIN_LP_RING(2);
OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
OUT_RING(MI_NOOP);
ADVANCE_LP_RING();

overlay->last_flip_req =
i915_add_request(dev, NULL, &dev_priv->render_ring);
if (overlay->last_flip_req == 0)
return -ENOMEM;

ret = i915_do_wait_request(dev,
overlay->last_flip_req, true,
&dev_priv->render_ring);
if (ret != 0)
return ret;

overlay->hw_wedged = 0;
overlay->last_flip_req = 0;
return 0;
return intel_overlay_do_wait_request(overlay, true, RELEASE_OLD_VID);
}

/* overlay needs to be disabled in OCMD reg */
static int intel_overlay_off(struct intel_overlay *overlay)
{
u32 flip_addr = overlay->flip_addr;
struct drm_device *dev = overlay->dev;
drm_i915_private_t *dev_priv = dev->dev_private;
int ret;

BUG_ON(!overlay->active);
Expand All @@ -366,50 +360,28 @@ static int intel_overlay_off(struct intel_overlay *overlay)
flip_addr |= OFC_UPDATE;

/* wait for overlay to go idle */
overlay->hw_wedged = SWITCH_OFF_STAGE_1;

BEGIN_LP_RING(4);
OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_CONTINUE);
OUT_RING(flip_addr);
OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
OUT_RING(MI_NOOP);
ADVANCE_LP_RING();

overlay->last_flip_req =
i915_add_request(dev, NULL, &dev_priv->render_ring);
if (overlay->last_flip_req == 0)
return -ENOMEM;

ret = i915_do_wait_request(dev,
overlay->last_flip_req, true,
&dev_priv->render_ring);
if (ret != 0)
ret = intel_overlay_do_wait_request(overlay, true,
SWITCH_OFF_STAGE_1);
if (ret)
return ret;

/* turn overlay off */
overlay->hw_wedged = SWITCH_OFF_STAGE_2;

BEGIN_LP_RING(4);
OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_OFF);
OUT_RING(flip_addr);
OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
OUT_RING(MI_NOOP);
ADVANCE_LP_RING();

overlay->last_flip_req =
i915_add_request(dev, NULL, &dev_priv->render_ring);
if (overlay->last_flip_req == 0)
return -ENOMEM;

ret = i915_do_wait_request(dev,
overlay->last_flip_req, true,
&dev_priv->render_ring);
if (ret != 0)
return ret;

overlay->hw_wedged = 0;
overlay->last_flip_req = 0;
return ret;
return intel_overlay_do_wait_request(overlay, true,
SWITCH_OFF_STAGE_2);
}

static void intel_overlay_off_tail(struct intel_overlay *overlay)
Expand Down Expand Up @@ -443,16 +415,9 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
if (overlay->hw_wedged == HW_WEDGED)
return -EIO;

if (overlay->last_flip_req == 0) {
overlay->last_flip_req =
i915_add_request(dev, NULL, &dev_priv->render_ring);
if (overlay->last_flip_req == 0)
return -ENOMEM;
}

ret = i915_do_wait_request(dev, overlay->last_flip_req,
interruptible, &dev_priv->render_ring);
if (ret != 0)
if (ret)
return ret;

switch (overlay->hw_wedged) {
Expand All @@ -462,29 +427,21 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
drm_gem_object_unreference(obj);
overlay->old_vid_bo = NULL;
break;

case SWITCH_OFF_STAGE_1:
flip_addr = overlay->flip_addr;
flip_addr |= OFC_UPDATE;

overlay->hw_wedged = SWITCH_OFF_STAGE_2;

BEGIN_LP_RING(4);
OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_OFF);
OUT_RING(flip_addr);
OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
OUT_RING(MI_NOOP);
ADVANCE_LP_RING();

overlay->last_flip_req =
i915_add_request(dev, NULL,
&dev_priv->render_ring);
if (overlay->last_flip_req == 0)
return -ENOMEM;

ret = i915_do_wait_request(dev, overlay->last_flip_req,
interruptible,
&dev_priv->render_ring);
if (ret != 0)
ret = intel_overlay_do_wait_request(overlay, interruptible,
SWITCH_OFF_STAGE_2);
if (ret)
return ret;

case SWITCH_OFF_STAGE_2:
Expand Down

0 comments on commit b6c028e

Please sign in to comment.