diff options
| author | Chris Wilson | 2016-07-20 14:31:52 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-07-20 14:40:11 +0200 |
| commit | 25dc556a2a0a2747cf3651462076d86410bd6b90 (patch) | |
| tree | e48f36530c46ad98d2049f11eedaac1f90f5695c /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Wrap drm_gem_object_lookup in i915_gem_object_lookup (diff) | |
| download | kernel-qcow2-linux-25dc556a2a0a2747cf3651462076d86410bd6b90.tar.gz kernel-qcow2-linux-25dc556a2a0a2747cf3651462076d86410bd6b90.tar.xz kernel-qcow2-linux-25dc556a2a0a2747cf3651462076d86410bd6b90.zip | |
drm/i915: Wrap drm_gem_object_reference in i915_gem_object_get
Ultimately wraps kref_get(), so adopt its nomenclature for consistency
with other subsystems.
s/drm_gem_object_reference/i915_gem_object_get/
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-5-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-4-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 77d320584478..84904a2d3fcd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11649,7 +11649,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, /* Reference the objects for the scheduled work. */ drm_framebuffer_reference(work->old_fb); - drm_gem_object_reference(&obj->base); crtc->primary->fb = fb; update_state_fb(crtc->primary); @@ -11657,7 +11656,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, intel_fbc_pre_update(intel_crtc, intel_crtc->config, to_intel_plane_state(primary->state)); - work->pending_flip_obj = obj; + work->pending_flip_obj = i915_gem_object_get(obj); ret = i915_mutex_lock_interruptible(dev); if (ret) |