drm: remove drm_init.c it is no longer needed (3f9df54d) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/char/drm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

		drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
		drm_drv.o drm_fops.o drm_init.o drm_ioctl.o drm_irq.o \
		drm_drv.o drm_fops.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

drivers/char/drm/drmP.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -770,7 +770,6 @@ static inline int drm_core_has_MTRR(struct drm_device *dev)
		/* Misc. support (drm_init.h) */
		extern int drm_flags;
		extern void drm_parse_options(char *s);
		extern int drm_cpu_valid(void);

		/* Driver support (drm_drv.h) */
		extern int drm_init(struct drm_driver *driver);

drivers/char/drm/drm_fops.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,23 @@ int drm_release(struct inode inode, struct file filp)

		EXPORT_SYMBOL(drm_release);

		/**
		* Check whether DRI will run on this CPU.
		*
		* \return non-zero if the DRI will run on this CPU, or zero otherwise.
		*/
		static int drm_cpu_valid(void)
		{
		#if defined(__i386__)
		if (boot_cpu_data.x86 == 3)
		return 0; /* No cmpxchg on a 386 */
		#endif
		#if defined(__sparc__) && !defined(__sparc_v9__)
		return 0; /* No cmpxchg before v9 sparc. */
		#endif
		return 1;
		}

		/**
		* Called whenever a process opens /dev/drm.
		*

drivers/char/drm/drm_init.c

deleted100644 → 0

+0 −53

Original line number	Diff line number	Diff line
		/**
		* \file drm_init.c
		* Setup/Cleanup for DRM
		*
		* \author Rickard E. (Rik) Faith <faith@valinux.com>
		* \author Gareth Hughes <gareth@valinux.com>
		*/

		/*
		* Created: Mon Jan 4 08:58:31 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 "drmP.h"

		/**
		* Check whether DRI will run on this CPU.
		*
		* \return non-zero if the DRI will run on this CPU, or zero otherwise.
		*/
		int drm_cpu_valid(void)
		{
		#if defined(__i386__)
		if (boot_cpu_data.x86 == 3)
		return 0; /* No cmpxchg on a 386 */
		#endif
		#if defined(__sparc__) && !defined(__sparc_v9__)
		return 0; /* No cmpxchg before v9 sparc. */
		#endif
		return 1;
		}