drm: Remove the obsolete driver-sis (20efabc2) · Commits · jan.koester / Linux

drivers/gpu/drm/Kconfig

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -405,15 +405,6 @@ config DRM_TDFX
	Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),		Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
	graphics card. If M is selected, the module will be called tdfx.		graphics card. If M is selected, the module will be called tdfx.

	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
	support is required for this driver to work.

	config DRM_VIA		config DRM_VIA
	tristate "Via unichrome video cards"		tristate "Via unichrome video cards"
	depends on DRM && PCI		depends on DRM && PCI

drivers/gpu/drm/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -141,7 +141,6 @@ obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb/
	obj-$(CONFIG_DRM_MGAG200) += mgag200/		obj-$(CONFIG_DRM_MGAG200) += mgag200/
	obj-$(CONFIG_DRM_V3D) += v3d/		obj-$(CONFIG_DRM_V3D) += v3d/
	obj-$(CONFIG_DRM_VC4) += vc4/		obj-$(CONFIG_DRM_VC4) += vc4/
	obj-$(CONFIG_DRM_SIS) += sis/
	obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/		obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
	obj-$(CONFIG_DRM_VIA) +=via/		obj-$(CONFIG_DRM_VIA) +=via/
	obj-$(CONFIG_DRM_VGEM) += vgem/		obj-$(CONFIG_DRM_VGEM) += vgem/

drivers/gpu/drm/sis/Makefile

deleted100644 → 0

+0 −10

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0-only
	#
	# Makefile for the drm device driver. This driver provides support for the
	# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

	sis-y := sis_drv.o sis_mm.o

	obj-$(CONFIG_DRM_SIS) += sis.o

drivers/gpu/drm/sis/sis_drv.c

deleted100644 → 0

+0 −143

Original line number	Original line	Diff line number	Diff line
	/* sis.c -- sis driver -- linux-c --
	*
	* 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
	* PRECISION INSIGHT 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/module.h>
	#include <linux/pci.h>

	#include <drm/drm_drv.h>
	#include <drm/drm_file.h>
	#include <drm/drm_pciids.h>
	#include <drm/sis_drm.h>

	#include "sis_drv.h"

	static struct pci_device_id pciidlist[] = {
	sisdrv_PCI_IDS
	};

	static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
	{
	struct pci_dev *pdev = to_pci_dev(dev->dev);
	drm_sis_private_t *dev_priv;

	pci_set_master(pdev);

	dev_priv = kzalloc(sizeof(drm_sis_private_t), GFP_KERNEL);
	if (dev_priv == NULL)
	return -ENOMEM;

	idr_init_base(&dev_priv->object_idr, 1);
	dev->dev_private = (void *)dev_priv;
	dev_priv->chipset = chipset;

	return 0;
	}

	static void sis_driver_unload(struct drm_device *dev)
	{
	drm_sis_private_t *dev_priv = dev->dev_private;

	idr_destroy(&dev_priv->object_idr);

	kfree(dev_priv);
	}

	static const struct file_operations sis_driver_fops = {
	.owner = THIS_MODULE,
	.open = drm_open,
	.release = drm_release,
	.unlocked_ioctl = drm_ioctl,
	.mmap = drm_legacy_mmap,
	.poll = drm_poll,
	.compat_ioctl = drm_compat_ioctl,
	.llseek = noop_llseek,
	};

	static int sis_driver_open(struct drm_device dev, struct drm_file file)
	{
	struct sis_file_private *file_priv;

	DRM_DEBUG_DRIVER("\n");
	file_priv = kmalloc(sizeof(*file_priv), GFP_KERNEL);
	if (!file_priv)
	return -ENOMEM;

	file->driver_priv = file_priv;

	INIT_LIST_HEAD(&file_priv->obj_list);

	return 0;
	}

	static void sis_driver_postclose(struct drm_device dev, struct drm_file file)
	{
	struct sis_file_private *file_priv = file->driver_priv;

	kfree(file_priv);
	}

	static struct drm_driver driver = {
	.driver_features = DRIVER_USE_AGP \| DRIVER_LEGACY,
	.load = sis_driver_load,
	.unload = sis_driver_unload,
	.open = sis_driver_open,
	.preclose = sis_reclaim_buffers_locked,
	.postclose = sis_driver_postclose,
	.dma_quiescent = sis_idle,
	.lastclose = sis_lastclose,
	.ioctls = sis_ioctls,
	.fops = &sis_driver_fops,
	.name = DRIVER_NAME,
	.desc = DRIVER_DESC,
	.date = DRIVER_DATE,
	.major = DRIVER_MAJOR,
	.minor = DRIVER_MINOR,
	.patchlevel = DRIVER_PATCHLEVEL,
	};

	static struct pci_driver sis_pci_driver = {
	.name = DRIVER_NAME,
	.id_table = pciidlist,
	};

	static int __init sis_init(void)
	{
	driver.num_ioctls = sis_max_ioctl;
	return drm_legacy_pci_init(&driver, &sis_pci_driver);
	}

	static void __exit sis_exit(void)
	{
	drm_legacy_pci_exit(&driver, &sis_pci_driver);
	}

	module_init(sis_init);
	module_exit(sis_exit);

	MODULE_AUTHOR(DRIVER_AUTHOR);
	MODULE_DESCRIPTION(DRIVER_DESC);
	MODULE_LICENSE("GPL and additional rights");

drivers/gpu/drm/sis/sis_drv.h

deleted100644 → 0

+0 −80

Original line number	Original line	Diff line number	Diff line
	/* sis_drv.h -- Private header for sis driver -- linux-c -- */
	/*
	* 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
	* PRECISION INSIGHT 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.
	*
	*/

	#ifndef _SIS_DRV_H_
	#define _SIS_DRV_H_

	#include <drm/drm_ioctl.h>
	#include <drm/drm_legacy.h>
	#include <drm/drm_mm.h>

	/* General customization:
	*/

	#define DRIVER_AUTHOR "SIS, Tungsten Graphics"
	#define DRIVER_NAME "sis"
	#define DRIVER_DESC "SIS 300/630/540 and XGI V3XE/V5/V8"
	#define DRIVER_DATE "20070626"
	#define DRIVER_MAJOR 1
	#define DRIVER_MINOR 3
	#define DRIVER_PATCHLEVEL 0

	enum sis_family {
	SIS_OTHER = 0,
	SIS_CHIP_315 = 1,
	};

	#define SIS_READ(reg) readl(((void __iomem *)dev_priv->mmio->handle) + (reg))
	#define SIS_WRITE(reg, val) writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))

	typedef struct drm_sis_private {
	drm_local_map_t *mmio;
	unsigned int idle_fault;
	unsigned int chipset;
	int vram_initialized;
	int agp_initialized;
	unsigned long vram_offset;
	unsigned long agp_offset;
	struct drm_mm vram_mm;
	struct drm_mm agp_mm;
	/** Mapping of userspace keys to mm objects */
	struct idr object_idr;
	} drm_sis_private_t;

	struct sis_file_private {
	struct list_head obj_list;
	};

	extern int sis_idle(struct drm_device *dev);
	extern void sis_reclaim_buffers_locked(struct drm_device *dev,
	struct drm_file *file_priv);
	extern void sis_lastclose(struct drm_device *dev);

	extern const struct drm_ioctl_desc sis_ioctls[];
	extern int sis_max_ioctl;

	#endif