diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2014-10-30 16:39:38 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-07 18:41:51 +0100 |
| commit | 850c4cdc6c223d02748f20c8ee1b677fb42da1aa (patch) | |
| tree | b5c1eb2e503891201ffa81495fc5bd6ffaeafca6 /drivers/gpu/drm/i915/intel_sprite.c | |
| parent | 1df06b75f0235c6c4f836e5c03fb499ba70a54bd (diff) | |
| download | op-kernel-dev-850c4cdc6c223d02748f20c8ee1b677fb42da1aa.zip op-kernel-dev-850c4cdc6c223d02748f20c8ee1b677fb42da1aa.tar.gz | |
drm/i915: Make intel_pin_and_fence_fb_obj take plane and framebuffer
It will help future code if this function knows something about of the context
of the display setup object is being pinned for.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index bf1eb15..8c70c54 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1256,7 +1256,7 @@ intel_prepare_sprite_plane(struct drm_plane *plane, * the sprite planes only require 128KiB alignment and 32 PTE * padding. */ - ret = intel_pin_and_fence_fb_obj(dev, obj, NULL); + ret = intel_pin_and_fence_fb_obj(plane, fb, NULL); if (ret == 0) i915_gem_track_fb(old_obj, obj, INTEL_FRONTBUFFER_SPRITE(pipe)); |
