]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915/gtt: Allow >= 4GB offsets in X86_32
authorMichel Thierry <michel.thierry@intel.com>
Fri, 7 Aug 2015 16:40:17 +0000 (17:40 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 14 Aug 2015 16:16:30 +0000 (18:16 +0200)
commitf6562435036864a007b0ba457269b5e65e67ae91
tree7b0bc3389499945c59e9293dda95a78518865b32
parent33a55a0ee9c727a251c68cf60e7b4bfa8a2bd384
drm/i915/gtt: Allow >= 4GB offsets in X86_32

Similar to commit 058379fd1036cd60ae4576d7f3c70583247d45cc ("drm/i915/gtt:
Allow >= 4GB sizes for vm"), i915_gem_obj_offset and i915_gem_obj_ggtt_offset
return an unsigned long, which in only 4-bytes long in 32-bit kernels.

Change return type (and other related offset variables) to u64.

Since Global GTT is always limited to 4GB, this change would not be required
in i915_gem_obj_ggtt_offset, but this is done for consistency.

v2: Remove unnecessary offset variable in do_pin, as we already have
    vma->node.start (Chris).
    Update GGTT offset too (Tvrtko).

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_fence.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gem_gtt.h
drivers/gpu/drm/i915/intel_fbdev.c