drm: merge drm_memory.h into drm_memory.c (d6db6564) · Commits · 戴 / test

drivers/gpu/drm/drm_memory.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,17 @@
		#include "drm_legacy.h"

		#if __OS_HAS_AGP

		#ifdef HAVE_PAGE_AGP
		# include <asm/agp.h>
		#else
		# ifdef __powerpc__
		# define PAGE_AGP __pgprot(_PAGE_KERNEL \| _PAGE_NO_CACHE)
		# else
		# define PAGE_AGP PAGE_KERNEL
		# endif
		#endif

		static void *agp_remap(unsigned long offset, unsigned long size,
		struct drm_device * dev)
		{

include/drm/drmP.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -58,6 +58,8 @@
		#include <linux/agp_backend.h>
		#include <linux/workqueue.h>
		#include <linux/poll.h>
		#include <linux/highmem.h>
		#include <linux/vmalloc.h>
		#include <asm/pgalloc.h>
		#include <drm/drm.h>
		#include <drm/drm_sarea.h>
		@@ -1127,10 +1129,6 @@ extern void drm_vm_open_locked(struct drm_device dev, struct vm_area_struct vm
		extern void drm_vm_close_locked(struct drm_device dev, struct vm_area_struct vma);
		extern unsigned int drm_poll(struct file filp, struct poll_table_struct wait);

		/* Memory management support (drm_memory.h) */
		#include <drm/drm_memory.h>


		/* Misc. IOCTL support (drm_ioctl.h) */
		extern int drm_irq_by_busid(struct drm_device dev, void data,
		struct drm_file *file_priv);

include/drm/drm_memory.h

deleted100644 → 0

+0 −59

Original line number	Diff line number	Diff line
		/**
		* \file drm_memory.h
		* Memory management wrappers for DRM
		*
		* \author Rickard E. (Rik) Faith <faith@valinux.com>
		* \author Gareth Hughes <gareth@valinux.com>
		*/

		/*
		* Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com
		*
		* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
		* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
		* 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, sublicense,
		* 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 NONINFRINGEMENT. IN NO EVENT SHALL
		* VA LINUX SYSTEMS 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.
		*/

		#include <linux/highmem.h>
		#include <linux/vmalloc.h>
		#include <drm/drmP.h>

		/**
		* Cut down version of drm_memory_debug.h, which used to be called
		* drm_memory.h.
		*/

		#if __OS_HAS_AGP

		#ifdef HAVE_PAGE_AGP
		#include <asm/agp.h>
		#else
		# ifdef __powerpc__
		# define PAGE_AGP __pgprot(_PAGE_KERNEL \| _PAGE_NO_CACHE)
		# else
		# define PAGE_AGP PAGE_KERNEL
		# endif
		#endif

		#else /* __OS_HAS_AGP */

		#endif

Admin message