Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2678d9d6 authored by Keith Packard's avatar Keith Packard Committed by Dave Airlie
Browse files

drm/i915: Subtract total pinned bytes from available aperture size 



The old code was wandering through the active list looking for pinned
buffers; there may be other pinned buffers around. Fortunately, we keep a
count of the total amount of pinned memory and can use that instead.

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 28dfe52a

drivers/gpu/drm/i915/i915_gem.c

+2 −8
Original line number Diff line number Diff line
@@ -85,20 +85,14 @@ int 
i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,

			    struct drm_file *file_priv)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_gem_get_aperture *args = data;

	struct drm_i915_gem_object *obj_priv;



	if (!(dev->driver->driver_features & DRIVER_GEM))

		return -ENODEV;



	args->aper_size = dev->gtt_total;

	args->aper_available_size = args->aper_size;



	list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) {

		if (obj_priv->pin_count > 0)

			args->aper_available_size -= obj_priv->obj->size;

	}

	args->aper_available_size = (args->aper_size -

				     atomic_read(&dev->pin_memory));



	return 0;

}