Commit aa5f8021 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Use unsigned long for obj->user_pin_count

At least on linux sizeof(long) == sizeof(void*) and the thinking
is that you can grab about as many references as there's memory.

Doesn't really matter, just a bit of OCD since the fixed size data
type in a pure in-kernel datastructure look off.

v2: Ville asked for an overflow check since no one prevents userspace
from incrementing the pin count forever.

v3: s/INT/LONG/, noticed by Chris.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 80075d49
...@@ -1604,7 +1604,7 @@ struct drm_i915_gem_object { ...@@ -1604,7 +1604,7 @@ struct drm_i915_gem_object {
unsigned long *bit_17; unsigned long *bit_17;
/** User space pin count and filp owning the pin */ /** User space pin count and filp owning the pin */
uint32_t user_pin_count; unsigned long user_pin_count;
struct drm_file *pin_filp; struct drm_file *pin_filp;
/** for phy allocated objects */ /** for phy allocated objects */
......
...@@ -3931,6 +3931,11 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, ...@@ -3931,6 +3931,11 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
goto out; goto out;
} }
if (obj->user_pin_count == ULONG_MAX) {
ret = -EBUSY;
goto out;
}
if (obj->user_pin_count == 0) { if (obj->user_pin_count == 0) {
ret = i915_gem_obj_ggtt_pin(obj, args->alignment, true, false); ret = i915_gem_obj_ggtt_pin(obj, args->alignment, true, false);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment