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

Commit 673a394b authored by Eric Anholt's avatar Eric Anholt Committed by Dave Airlie
Browse files

drm: Add GEM ("graphics execution manager") to i915 driver. 



GEM allows the creation of persistent buffer objects accessible by the
graphics device through new ioctls for managing execution of commands on the
device.  The userland API is almost entirely driver-specific to ensure that
any driver building on this model can easily map the interface to individual
driver requirements.

GEM is used by the 2d driver for managing its internal state allocations and
will be used for pixmap storage to reduce memory consumption and enable
zero-copy GLX_EXT_texture_from_pixmap, and in the 3d driver is used to enable
GL_EXT_framebuffer_object and GL_ARB_pixel_buffer_object.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d1d8c925

drivers/gpu/drm/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ 


ccflags-y := -Iinclude/drm



drm-y       :=	drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \

		drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \

drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \

		drm_context.o drm_dma.o drm_drawable.o \

		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \

		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \

		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \

		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o

drivers/gpu/drm/drm_agpsupport.c

+50 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include "drmP.h"

#include <linux/module.h>

#include <asm/agp.h>



#if __OS_HAS_AGP
@@ -452,4 +453,52 @@ int drm_agp_unbind_memory(DRM_AGP_MEM * handle) 
	return agp_unbind_memory(handle);

}



/**

 * Binds a collection of pages into AGP memory at the given offset, returning

 * the AGP memory structure containing them.

 *

 * No reference is held on the pages during this time -- it is up to the

 * caller to handle that.

 */

DRM_AGP_MEM *

drm_agp_bind_pages(struct drm_device *dev,

		   struct page **pages,

		   unsigned long num_pages,

		   uint32_t gtt_offset)

{

	DRM_AGP_MEM *mem;

	int ret, i;



	DRM_DEBUG("\n");



	mem = drm_agp_allocate_memory(dev->agp->bridge, num_pages,

				      AGP_USER_MEMORY);

	if (mem == NULL) {

		DRM_ERROR("Failed to allocate memory for %ld pages\n",

			  num_pages);

		return NULL;

	}



	for (i = 0; i < num_pages; i++)

		mem->memory[i] = phys_to_gart(page_to_phys(pages[i]));

	mem->page_count = num_pages;



	mem->is_flushed = true;

	ret = drm_agp_bind_memory(mem, gtt_offset / PAGE_SIZE);

	if (ret != 0) {

		DRM_ERROR("Failed to bind AGP memory: %d\n", ret);

		agp_free_memory(mem);

		return NULL;

	}



	return mem;

}

EXPORT_SYMBOL(drm_agp_bind_pages);



void drm_agp_chipset_flush(struct drm_device *dev)

{

	agp_flush_chipset(dev->agp->bridge);

}

EXPORT_SYMBOL(drm_agp_chipset_flush);



#endif /* __OS_HAS_AGP */

drivers/gpu/drm/drm_cache.c

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/**************************************************************************

 *

 * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA

 * All Rights Reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the

 * "Software"), to deal in the Software without restriction, including

 * without limitation the rights to use, copy, modify, merge, publish,

 * distribute, sub license, and/or sell copies of the Software, and to

 * permit persons to whom the Software is furnished to do so, subject to

 * the following conditions:

 *

 * The above copyright notice and this permission notice (including the

 * next paragraph) shall be included in all copies or substantial portions

 * of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL

 * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,

 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

 * USE OR OTHER DEALINGS IN THE SOFTWARE.

 *

 **************************************************************************/

/*

 * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>

 */



#include "drmP.h"



#if defined(CONFIG_X86)

static void

drm_clflush_page(struct page *page)

{

	uint8_t *page_virtual;

	unsigned int i;



	if (unlikely(page == NULL))

		return;



	page_virtual = kmap_atomic(page, KM_USER0);

	for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)

		clflush(page_virtual + i);

	kunmap_atomic(page_virtual, KM_USER0);

}

#endif



static void

drm_clflush_ipi_handler(void *null)

{

	wbinvd();

}



void

drm_clflush_pages(struct page *pages[], unsigned long num_pages)

{



#if defined(CONFIG_X86)

	if (cpu_has_clflush) {

		unsigned long i;



		mb();

		for (i = 0; i < num_pages; ++i)

			drm_clflush_page(*pages++);

		mb();



		return;

	}

#endif



	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)

		DRM_ERROR("Timed out waiting for cache flush.\n");

}

EXPORT_SYMBOL(drm_clflush_pages);

drivers/gpu/drm/drm_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ static struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_MODESET_CTL, drm_modeset_ctl, 0),



	DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),



	DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, 0),

	DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH),

};



#define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )

drivers/gpu/drm/drm_fops.c

+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,9 @@ static int drm_open_helper(struct inode *inode, struct file *filp, 


	INIT_LIST_HEAD(&priv->lhead);



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

		drm_gem_open(dev, priv);



	if (dev->driver->open) {

		ret = dev->driver->open(dev, priv);

		if (ret < 0)
@@ -400,6 +403,9 @@ int drm_release(struct inode *inode, struct file *filp) 
		dev->driver->reclaim_buffers(dev, file_priv);

	}



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

		drm_gem_release(dev, file_priv);



	drm_fasync(-1, filp, 0);



	mutex_lock(&dev->ctxlist_mutex);