iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/overlay: Use VMA as the primary tracker for images

Browse Source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471254551-25805-22-git-send-email-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2016-08-15 10:49:01 +01:00
parent 57f275a22b
commit 9b3b7841b8
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,8 +171,8 @@ struct overlay_registers {
struct intel_overlay { struct intel_overlay {
struct drm_i915_private *i915; struct drm_i915_private *i915;
struct intel_crtc *crtc; struct intel_crtc *crtc;
struct drm_i915_gem_object *vid_bo; struct i915_vma *vma;
struct drm_i915_gem_object *old_vid_bo; struct i915_vma *old_vma;
bool active; bool active;
bool pfit_active; bool pfit_active;
u32 pfit_vscale_ratio; /* shifted-point number, (1<<12) == 1.0 */ u32 pfit_vscale_ratio; /* shifted-point number, (1<<12) == 1.0 */
@ -317,15 +317,17 @@ static void intel_overlay_release_old_vid_tail(struct i915_gem_active *active,
{ {
struct intel_overlay *overlay = struct intel_overlay *overlay =
container_of(active, typeof(*overlay), last_flip); container_of(active, typeof(*overlay), last_flip);
struct drm_i915_gem_object *obj = overlay->old_vid_bo; struct i915_vma *vma;
i915_gem_track_fb(obj, NULL, vma = fetch_and_zero(&overlay->old_vma);
if (WARN_ON(!vma))
return;
i915_gem_track_fb(vma->obj, NULL,
INTEL_FRONTBUFFER_OVERLAY(overlay->crtc->pipe)); INTEL_FRONTBUFFER_OVERLAY(overlay->crtc->pipe));
i915_gem_object_ggtt_unpin(obj); i915_gem_object_unpin_from_display_plane(vma->obj, &i915_ggtt_view_normal);
i915_gem_object_put(obj); i915_vma_put(vma);
overlay->old_vid_bo = NULL;
} }
static void intel_overlay_off_tail(struct i915_gem_active *active, static void intel_overlay_off_tail(struct i915_gem_active *active,
@ -333,15 +335,15 @@ static void intel_overlay_off_tail(struct i915_gem_active *active,
{ {
struct intel_overlay *overlay = struct intel_overlay *overlay =
container_of(active, typeof(*overlay), last_flip); container_of(active, typeof(*overlay), last_flip);
struct drm_i915_gem_object *obj = overlay->vid_bo; struct i915_vma *vma;
/* never have the overlay hw on without showing a frame */ /* never have the overlay hw on without showing a frame */
if (WARN_ON(!obj)) vma = fetch_and_zero(&overlay->vma);
if (WARN_ON(!vma))
return; return;
i915_gem_object_ggtt_unpin(obj); i915_gem_object_unpin_from_display_plane(vma->obj, &i915_ggtt_view_normal);
i915_gem_object_put(obj); i915_vma_put(vma);
overlay->vid_bo = NULL;
overlay->crtc->overlay = NULL; overlay->crtc->overlay = NULL;
overlay->crtc = NULL; overlay->crtc = NULL;
@ -421,7 +423,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
/* Only wait if there is actually an old frame to release to /* Only wait if there is actually an old frame to release to
* guarantee forward progress. * guarantee forward progress.
*/ */
if (!overlay->old_vid_bo) if (!overlay->old_vma)
return 0; return 0;
if (I915_READ(ISR) & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT) { if (I915_READ(ISR) & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT) {
@ -744,6 +746,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
struct drm_i915_private *dev_priv = overlay->i915; struct drm_i915_private *dev_priv = overlay->i915;
u32 swidth, swidthsw, sheight, ostride; u32 swidth, swidthsw, sheight, ostride;
enum pipe pipe = overlay->crtc->pipe; enum pipe pipe = overlay->crtc->pipe;
struct i915_vma *vma;
lockdep_assert_held(&dev_priv->drm.struct_mutex); lockdep_assert_held(&dev_priv->drm.struct_mutex);
WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex)); WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));
@ -757,6 +760,8 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
if (ret != 0) if (ret != 0)
return ret; return ret;
vma = i915_gem_obj_to_ggtt_view(new_bo, &i915_ggtt_view_normal);
ret = i915_gem_object_put_fence(new_bo); ret = i915_gem_object_put_fence(new_bo);
if (ret) if (ret)
goto out_unpin; goto out_unpin;
@ -834,11 +839,11 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
if (ret) if (ret)
goto out_unpin; goto out_unpin;
i915_gem_track_fb(overlay->vid_bo, new_bo, i915_gem_track_fb(overlay->vma->obj, new_bo,
INTEL_FRONTBUFFER_OVERLAY(pipe)); INTEL_FRONTBUFFER_OVERLAY(pipe));
overlay->old_vid_bo = overlay->vid_bo; overlay->old_vma = overlay->vma;
overlay->vid_bo = new_bo; overlay->vma = vma;
intel_frontbuffer_flip(dev_priv, INTEL_FRONTBUFFER_OVERLAY(pipe)); intel_frontbuffer_flip(dev_priv, INTEL_FRONTBUFFER_OVERLAY(pipe));