lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/i915: overlay: extract some duplicated code

Browse Source 
I've suspected some bug there wrt to suspend, but that was not
the case. Clean up the code anyway.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Daniel Vetter
2037-04-25 10:08:26 +02:00
committed by Eric Anholt
parent 2644487781
commit 12ca45fea9
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/gpu/drm/i915/intel_overlay.c
View File

@@ -375,12 +375,28 @@ static int intel_overlay_off(struct intel_overlay *overlay)
if (ret != 0) if (ret != 0)
return ret; return ret;
overlay->active = 0;
overlay->hw_wedged = 0; overlay->hw_wedged = 0;
overlay->last_flip_req = 0; overlay->last_flip_req = 0;
return ret; return ret;
} }
static void intel_overlay_off_tail(struct intel_overlay *overlay)
{
struct drm_gem_object *obj;
/* never have the overlay hw on without showing a frame */
BUG_ON(!overlay->vid_bo);
obj = overlay->vid_bo->obj;
i915_gem_object_unpin(obj);
drm_gem_object_unreference(obj);
overlay->vid_bo = NULL;
overlay->crtc->overlay = NULL;
overlay->crtc = NULL;
overlay->active = 0;
}
/* recover from an interruption due to a signal /* recover from an interruption due to a signal
* We have to be careful not to repeat work forever an make forward progess. */ * We have to be careful not to repeat work forever an make forward progess. */
int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
@@ -438,17 +454,7 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
return ret; return ret;
case SWITCH_OFF_STAGE_2: case SWITCH_OFF_STAGE_2:
BUG_ON(!overlay->vid_bo); intel_overlay_off_tail(overlay);
obj = overlay->vid_bo->obj;
i915_gem_object_unpin(obj);
drm_gem_object_unreference(obj);
overlay->vid_bo = NULL;
overlay->crtc->overlay = NULL;
overlay->crtc = NULL;
overlay->active = 0;
break; break;
default: default:
BUG_ON(overlay->hw_wedged != NEEDS_WAIT_FOR_FLIP); BUG_ON(overlay->hw_wedged != NEEDS_WAIT_FOR_FLIP);
@@ -831,7 +837,6 @@ int intel_overlay_switch_off(struct intel_overlay *overlay)
{ {
int ret; int ret;
struct overlay_registers *regs; struct overlay_registers *regs;
struct drm_gem_object *obj;
struct drm_device *dev = overlay->dev; struct drm_device *dev = overlay->dev;
BUG_ON(!mutex_is_locked(&dev->struct_mutex)); BUG_ON(!mutex_is_locked(&dev->struct_mutex));
@@ -855,16 +860,7 @@ int intel_overlay_switch_off(struct intel_overlay *overlay)
if (ret != 0) if (ret != 0)
return ret; return ret;
/* never have the overlay hw on without showing a frame */ intel_overlay_off_tail(overlay);
BUG_ON(!overlay->vid_bo);
obj = overlay->vid_bo->obj;
i915_gem_object_unpin(obj);
drm_gem_object_unreference(obj);
overlay->vid_bo = NULL;
overlay->crtc->overlay = NULL;
overlay->crtc = NULL;
return 0; return 0;
} }