summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorMichel Thierry <michel.thierry@intel.com>2015-07-29 17:23:59 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-14 18:16:26 +0200
commitaf98714e5d05fcbf7638ea4b53d158d96d693bf2 (patch)
tree7a77516a38d034d78c2f3941be7d0a047d7003f0 /drivers/gpu/drm
parent65bd342ff2f1f9f3ca4a17691a825935d2aa13c9 (diff)
downloadtalos-obmc-linux-af98714e5d05fcbf7638ea4b53d158d96d693bf2.tar.gz
talos-obmc-linux-af98714e5d05fcbf7638ea4b53d158d96d693bf2.zip
drm/i915: batch_obj vm offset must be u64
Otherwise it can overflow in 48-bit mode, and cause an incorrect exec_start. Before commit 5f19e2bffa63a91cd4ac1adcec648e14a44277ce ("drm/i915: Merged the many do_execbuf() parameters into a structure"), it was already an u64. Signed-off-by: Michel Thierry <michel.thierry@intel.com> Reviewed-by: Akash Goel <akash.goel@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 91bd77864181..cefb6e96a941 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1686,7 +1686,7 @@ struct i915_execbuffer_params {
struct drm_file *file;
uint32_t dispatch_flags;
uint32_t args_batch_start_offset;
- uint32_t batch_obj_vm_offset;
+ uint64_t batch_obj_vm_offset;
struct intel_engine_cs *ring;
struct drm_i915_gem_object *batch_obj;
struct intel_context *ctx;
OpenPOWER on IntegriCloud