Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (f7ea4a4b) · Commits · e / devices / android_kernel_sony_msm8994

arch/x86/mm/highmem_32.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,7 @@ void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)

		return (void*) vaddr;
		}
		EXPORT_SYMBOL_GPL(kmap_atomic_pfn); /* temporarily in use by i915 GEM until vmap */

		struct page kmap_atomic_to_page(void ptr)
		{

drivers/gpu/drm/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		#
		menuconfig DRM
		tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
		depends on (AGP \|\| AGP=n) && PCI && !EMULATED_CMPXCHG
		depends on (AGP \|\| AGP=n) && PCI && !EMULATED_CMPXCHG && SHMEM
		help
		Kernel-level support for the Direct Rendering Infrastructure (DRI)
		introduced in XFree86 4.0. If you say Y here, you need to select
		@@ -87,6 +87,7 @@ config DRM_MGA
		config DRM_SIS
		tristate "SiS video cards"
		depends on DRM && AGP
		depends on FB_SIS \|\| FB_SIS=n
		help
		Choose this option if you have a SiS 630 or compatible video
		chipset. If M is selected the module will be called sis. AGP

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

+51 −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,53 @@ 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,
		u32 type)
		{
		DRM_AGP_MEM *mem;
		int ret, i;

		DRM_DEBUG("\n");

		mem = drm_agp_allocate_memory(dev->agp->bridge, num_pages,
		type);
		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

+69 −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

		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;
		}

		wbinvd();
		#endif
		}
		EXPORT_SYMBOL(drm_clflush_pages);