From patchwork Sat Dec 3 10:22:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cai Huoqing X-Patchwork-Id: 29264 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1306281wrr; Sat, 3 Dec 2022 02:47:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf4y/rKJ1tMk17XiBk6b/hKqCe1dzBAp28GpKMbBugTVMuHrcE4EvYqCVNQU9UvWQ09rRz0p X-Received: by 2002:a17:906:2bd9:b0:7ad:934e:d542 with SMTP id n25-20020a1709062bd900b007ad934ed542mr53123541ejg.20.1670064431711; Sat, 03 Dec 2022 02:47:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670064431; cv=none; d=google.com; s=arc-20160816; b=xHDxI6hZlK5bL7CEUqgMkadSM3S4tBXXyrkdtSxV2LkluQDr5EMH3xhxWb5tWQeAhu HwUk41AQ//A+wvprel33YOlMMRYJk+HxIoeNqypcohjCd7nCTxeVXVEKedm5VXrpJqoJ MY6q5pRjfbabJVwynI3UF+glTwSWbocJPgT5q00IcvHvxFj2+1E0scIU15Sw1ahkbZE9 QYa5nnjalFtiLOJj9YJM1ywd8drdBw1lxwHfeU/GbgJZfqgzOKYTh3kqlnag0G/y1CVT yQMtwjtiVRXiqboziFelovMx+wphPon067dXRMj7U48OlOVV3Pu0Q5MXcDJj9icT0/Vq T3VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/JPYiBbSVMnruEeNKBfFmoLr+cv12l5P6JDa/2Es+dY=; b=xk/61td9ApOYL1AqQOoSJkvPOs4lbgNeqLM0Di4btQGAEF1i+SoeVBY519o1nJubjS vA/4MdzX9xzNdixhHJ78ywF/EHuBhEIYPHwg19yxAge1quoI59sytbR5Pdk/DHQ7cvYY qjzViZkSR2THUoUtsWdFEnnt087j1gSKZ2SAYLtrZdv+jWItrQRyXVqfPks8XLfnK3Lb 6TyT3BMkV7C8AgT0SZ6Ubo8LCWB9iaOyXsaG6pAcPAE5aqgh85zZf1pQL9C6biVCegt+ M5oj+7WoHNF8vV8E8dCBQTDImzd70FXSWHV8IdsZ99ZX7Lxw6crJVdBKqUlRSMVbnWCV R7/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=RrfUvF8z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sa27-20020a1709076d1b00b007c0daaa5060si683579ejc.699.2022.12.03.02.46.48; Sat, 03 Dec 2022 02:47:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=RrfUvF8z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229718AbiLCKd3 (ORCPT + 99 others); Sat, 3 Dec 2022 05:33:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229705AbiLCKd1 (ORCPT ); Sat, 3 Dec 2022 05:33:27 -0500 Received: from out-91.mta0.migadu.com (out-91.mta0.migadu.com [91.218.175.91]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F96E140D0 for ; Sat, 3 Dec 2022 02:33:24 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1670063602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/JPYiBbSVMnruEeNKBfFmoLr+cv12l5P6JDa/2Es+dY=; b=RrfUvF8zipRwCeZncWfqkdw37dekkA4OMqhAZn3IAu6K/JDm3xvlXD6wMGA25R5DEdVazV mBVfYPjFaReojA1KcXlT9323Zwvjc/QEBTMLMjXgpDHDQNJtdCUmrs4WXUvGpYCKW2xPtR qKdQdwYwg0tXILhWzrReuVb+mjdf2e8= From: Cai Huoqing To: tzimmermann@suse.de Cc: Cai Huoqing , Maarten Lankhorst , Maxime Ripard , David Airlie , Daniel Vetter , Borislav Petkov , Randy Dunlap , Danilo Krummrich , Sam Ravnborg , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [RESEND PATCH linux-next v2 06/10] drm: Remove the obsolete driver-tdfx Date: Sat, 3 Dec 2022 18:22:57 +0800 Message-Id: <20221203102502.3185-7-cai.huoqing@linux.dev> In-Reply-To: <20221203102502.3185-1-cai.huoqing@linux.dev> References: <20221203102502.3185-1-cai.huoqing@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751189481600254021?= X-GMAIL-MSGID: =?utf-8?q?1751189481600254021?= Commit 399516ab0fee ("MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers") marked tdfx driver obsolete 7 years ago. And the mesa UMD of this drm driver already in deprecated list in the link: https://docs.mesa3d.org/systems.html 3dfx Glide-->driver/gpu/drm/tdfx It's time to remove this driver. Signed-off-by: Cai Huoqing --- drivers/gpu/drm/Kconfig | 7 --- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/tdfx/Makefile | 8 --- drivers/gpu/drm/tdfx/tdfx_drv.c | 90 --------------------------------- drivers/gpu/drm/tdfx/tdfx_drv.h | 47 ----------------- 5 files changed, 153 deletions(-) delete mode 100644 drivers/gpu/drm/tdfx/Makefile delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.c delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.h diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index dbe51b65e481..a70a87798894 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -392,13 +392,6 @@ menuconfig DRM_LEGACY if DRM_LEGACY -config DRM_TDFX - tristate "3dfx Banshee/Voodoo3+" - depends on DRM && PCI - help - 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. - config DRM_VIA tristate "Via unichrome video cards" depends on DRM && PCI diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index c4e3cdf814ce..489fadf19507 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -134,7 +134,6 @@ obj-y += arm/ obj-y += display/ obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_SCHED) += scheduler/ -obj-$(CONFIG_DRM_TDFX) += tdfx/ obj-$(CONFIG_DRM_RADEON)+= radeon/ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ obj-$(CONFIG_DRM_I915) += i915/ diff --git a/drivers/gpu/drm/tdfx/Makefile b/drivers/gpu/drm/tdfx/Makefile deleted file mode 100644 index 03b7d0f087b0..000000000000 --- a/drivers/gpu/drm/tdfx/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# 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. - -tdfx-y := tdfx_drv.o - -obj-$(CONFIG_DRM_TDFX) += tdfx.o diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c deleted file mode 100644 index 58c185c299f4..000000000000 --- a/drivers/gpu/drm/tdfx/tdfx_drv.c +++ /dev/null @@ -1,90 +0,0 @@ -/* tdfx_drv.c -- tdfx driver -*- linux-c -*- - * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.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 - * 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. - * - * Authors: - * Rickard E. (Rik) Faith - * Daryll Strauss - * Gareth Hughes - */ - -#include -#include - -#include -#include -#include -#include -#include - -#include "tdfx_drv.h" - -static struct pci_device_id pciidlist[] = { - tdfx_PCI_IDS -}; - -static const struct file_operations tdfx_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 const struct drm_driver driver = { - .driver_features = DRIVER_LEGACY, - .fops = &tdfx_driver_fops, - .name = DRIVER_NAME, - .desc = DRIVER_DESC, - .date = DRIVER_DATE, - .major = DRIVER_MAJOR, - .minor = DRIVER_MINOR, - .patchlevel = DRIVER_PATCHLEVEL, -}; - -static struct pci_driver tdfx_pci_driver = { - .name = DRIVER_NAME, - .id_table = pciidlist, -}; - -static int __init tdfx_init(void) -{ - return drm_legacy_pci_init(&driver, &tdfx_pci_driver); -} - -static void __exit tdfx_exit(void) -{ - drm_legacy_pci_exit(&driver, &tdfx_pci_driver); -} - -module_init(tdfx_init); -module_exit(tdfx_exit); - -MODULE_AUTHOR(DRIVER_AUTHOR); -MODULE_DESCRIPTION(DRIVER_DESC); -MODULE_LICENSE("GPL and additional rights"); diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.h b/drivers/gpu/drm/tdfx/tdfx_drv.h deleted file mode 100644 index 84204ec1b046..000000000000 --- a/drivers/gpu/drm/tdfx/tdfx_drv.h +++ /dev/null @@ -1,47 +0,0 @@ -/* tdfx.h -- 3dfx DRM template customization -*- linux-c -*- - * Created: Wed Feb 14 12:32:32 2001 by gareth@valinux.com - */ -/* - * 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. - * - * Authors: - * Gareth Hughes - */ - -#ifndef __TDFX_H__ -#define __TDFX_H__ - -/* General customization: - */ - -#define DRIVER_AUTHOR "VA Linux Systems Inc." - -#define DRIVER_NAME "tdfx" -#define DRIVER_DESC "3dfx Banshee/Voodoo3+" -#define DRIVER_DATE "20010216" - -#define DRIVER_MAJOR 1 -#define DRIVER_MINOR 0 -#define DRIVER_PATCHLEVEL 0 - -#endif