From patchwork Fri Dec 14 07:14:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 1877571 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5336CDF230 for ; Fri, 14 Dec 2012 07:16:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754871Ab2LNHP6 (ORCPT ); Fri, 14 Dec 2012 02:15:58 -0500 Received: from mail-ia0-f174.google.com ([209.85.210.174]:62079 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754222Ab2LNHP4 (ORCPT ); Fri, 14 Dec 2012 02:15:56 -0500 Received: by mail-ia0-f174.google.com with SMTP id y25so2843054iay.19 for ; Thu, 13 Dec 2012 23:15:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=EGWQ+eoIwyZ4uUsmO/IJrIDKQOlPes6OZf2zLLgJlyg=; b=f7NlJHIp9K4yiYnb58W3EA7I6ueR3Be9nVEz5CB3N5ph/imzlOC4//Jc/YnrzckXxl /06Ab6lw2eKwUm78oIiO6J/ZMbjx8xRsFyrVn9mWOMvUmPY8oEpH7xfDu6KrKwzsrhDY IazQxpnSzmpc2sg2rf25ZJyPdkXntsxeb+vGKFwA5KP/SVM7TaYsvbdVXFRh4OzJV6oQ iS1mV8TUyaQSor9zWPh1swbE84ybdPT4v4rHV7KKS9kdnA/ppLv/CUfbLoTeaDPkFgtq 0QSxk9ER4lGfvSZBKSYWF6dltjj0o+byrcqOmLXKGSTk5pHhBG755Z9h94gY0G6zIwW5 zgTw== Received: by 10.50.173.103 with SMTP id bj7mr746211igc.47.1355469355912; Thu, 13 Dec 2012 23:15:55 -0800 (PST) Received: from localhost.localdomain ([130.57.30.250]) by mx.google.com with ESMTPS id az6sm6249009igb.11.2012.12.13.23.15.48 (version=SSLv3 cipher=OTHER); Thu, 13 Dec 2012 23:15:55 -0800 (PST) From: "Lee, Chun-Yi" To: dri-devel@lists.freedesktop.org Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" , randy.dunlap@oracle.com, trenn@suse.de, Valdis.Kletnieks@vt.edu, Dennis.Jansen@web.de, airlied@redhat.com, eric@anholt.net, alexdeucher@gmail.com, bskeggs@redhat.com, chris@chris-wilson.co.uk, Alan Cox Subject: [RESEND][PATCH] gpu: remove gma500 stub driver Date: Fri, 14 Dec 2012 15:14:37 +0800 Message-Id: <1355469277-5519-1-git-send-email-jlee@suse.com> X-Mailer: git-send-email 1.6.0.2 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org In v3.3, the gma500 drm driver moved from staging to drm group by Alan Cox's 3abcf41fb patch. the gma500 drm driver should control brightness well and don't need gma500 stub driver anymore. Reference: http://lists.freedesktop.org/archives/dri-devel/2012-May/023426.html http://lists.freedesktop.org/archives/dri-devel/2012-May/023467.html Cc: randy.dunlap@oracle.com Cc: trenn@suse.de Cc: Valdis.Kletnieks@vt.edu Cc: Dennis.Jansen@web.de Cc: airlied@redhat.com Cc: eric@anholt.net Cc: alexdeucher@gmail.com Cc: bskeggs@redhat.com Cc: chris@chris-wilson.co.uk Cc: Alan Cox Acked-by: Matthew Garrett Acked-by: Greg Kroah-Hartman Signed-off-by: Lee, Chun-Yi --- drivers/gpu/Makefile | 2 +- drivers/gpu/stub/Kconfig | 18 ------------ drivers/gpu/stub/Makefile | 1 - drivers/gpu/stub/poulsbo.c | 64 -------------------------------------------- drivers/video/Kconfig | 2 - 5 files changed, 1 insertions(+), 86 deletions(-) delete mode 100644 drivers/gpu/stub/Kconfig delete mode 100644 drivers/gpu/stub/Makefile delete mode 100644 drivers/gpu/stub/poulsbo.c diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index cc92778..30879df 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1 +1 @@ -obj-y += drm/ vga/ stub/ +obj-y += drm/ vga/ diff --git a/drivers/gpu/stub/Kconfig b/drivers/gpu/stub/Kconfig deleted file mode 100644 index 4199179..0000000 --- a/drivers/gpu/stub/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -config STUB_POULSBO - tristate "Intel GMA500 Stub Driver" - depends on PCI - depends on NET # for THERMAL - # Poulsbo stub depends on ACPI_VIDEO when ACPI is enabled - # but for select to work, need to select ACPI_VIDEO's dependencies, ick - select BACKLIGHT_CLASS_DEVICE if ACPI - select VIDEO_OUTPUT_CONTROL if ACPI - select INPUT if ACPI - select ACPI_VIDEO if ACPI - select THERMAL if ACPI - help - Choose this option if you have a system that has Intel GMA500 - (Poulsbo) integrated graphics. If M is selected, the module will - be called Poulsbo. This driver is a stub driver for Poulsbo that - will call poulsbo.ko to enable the acpi backlight control sysfs - entry file because there have no poulsbo native driver can support - intel opregion. diff --git a/drivers/gpu/stub/Makefile b/drivers/gpu/stub/Makefile deleted file mode 100644 index cd940cc..0000000 --- a/drivers/gpu/stub/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_STUB_POULSBO) += poulsbo.o diff --git a/drivers/gpu/stub/poulsbo.c b/drivers/gpu/stub/poulsbo.c deleted file mode 100644 index 7edfd27..0000000 --- a/drivers/gpu/stub/poulsbo.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Intel Poulsbo Stub driver - * - * Copyright (C) 2010 Novell - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - */ - -#include -#include -#include -#include - -#define DRIVER_NAME "poulsbo" - -enum { - CHIP_PSB_8108 = 0, - CHIP_PSB_8109 = 1, -}; - -static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { - {0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PSB_8108}, \ - {0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PSB_8109}, \ - {0, 0, 0} -}; - -static int poulsbo_probe(struct pci_dev *pdev, const struct pci_device_id *id) -{ - return acpi_video_register(); -} - -static void poulsbo_remove(struct pci_dev *pdev) -{ - acpi_video_unregister(); -} - -static struct pci_driver poulsbo_driver = { - .name = DRIVER_NAME, - .id_table = pciidlist, - .probe = poulsbo_probe, - .remove = poulsbo_remove, -}; - -static int __init poulsbo_init(void) -{ - return pci_register_driver(&poulsbo_driver); -} - -static void __exit poulsbo_exit(void) -{ - pci_unregister_driver(&poulsbo_driver); -} - -module_init(poulsbo_init); -module_exit(poulsbo_exit); - -MODULE_AUTHOR("Lee, Chun-Yi "); -MODULE_DESCRIPTION("Poulsbo Stub Driver"); -MODULE_LICENSE("GPL"); - -MODULE_DEVICE_TABLE(pci, pciidlist); diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index d08d799..cc99f41 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -21,8 +21,6 @@ source "drivers/gpu/vga/Kconfig" source "drivers/gpu/drm/Kconfig" -source "drivers/gpu/stub/Kconfig" - config VGASTATE tristate default n