From patchwork Wed Apr 10 17:50:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 2422701 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 26DCA3FD8C for ; Wed, 10 Apr 2013 18:04:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E2A81E6499 for ; Wed, 10 Apr 2013 11:04:01 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by gabe.freedesktop.org (Postfix) with ESMTP id C0016E62B4 for ; Wed, 10 Apr 2013 10:51:07 -0700 (PDT) Received: by mail-la0-f50.google.com with SMTP id el20so711319lab.37 for ; Wed, 10 Apr 2013 10:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=JJH069hrjkp0Ocdphm0dlSPjWCGi8FyB3E1ftCmpr9o=; b=PItMN2/dVXBleantVWOtxzlMc1cA78IQlf5jP/OuDdkeE0dwRAxt1cwi283tBuK8dy hCMFLjp8OYgo7AbxIvnQwoSLhnx2O+0j6jwnnr5NFmSiQyUZ/oI68F3OwAXc5vRaJq8c VOl/cCfX9gPJJF/CkiJUUa+SlB0U06vtOLcpzKW44p14fkMKFmlGJdASQp/ypnNVbbGx QhSxhSA1iUQhyco+ovuKHpUPdbKWf2JutdOo03vePvmhcEgwldFhImIttYJ1bQO3MzF1 H/rDV5GKtr3bnoRoKLUpSRFJqxQKynT7wwrhQFgNgLQ3lSUTDVM1FF4rwbKJZfc0XW8x gXCw== X-Received: by 10.112.73.70 with SMTP id j6mr1714518lbv.39.1365616266875; Wed, 10 Apr 2013 10:51:06 -0700 (PDT) Received: from patrik-desktop.lan (h138n8-oer-a32.ias.bredband.telia.com. [2.248.103.138]) by mx.google.com with ESMTPS id iq6sm309626lab.10.2013.04.10.10.51.05 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Apr 2013 10:51:05 -0700 (PDT) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH 15/15] gma500:fix build failure for 3.9-rc5 Date: Wed, 10 Apr 2013 19:50:00 +0200 Message-Id: <1365616200-26312-16-git-send-email-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Xiong Zhou X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org From: Xiong Zhou Last version of this patch is not clear enough and X86 duplicated. This patch fixes build failure of v3.9-rc5 and rc6. When config ACPI_VIDEO as m, DRM_GMA500 as y, here comes the failure. GMA5/600 needs acpi_video just like nouveau. And some tab type fix by the way. Failure message: drivers/built-in.o: In function `psb_driver_load': kernel-3.9-rc5/drivers/gpu/drm/gma500/psb_drv.c:340: \ undefined reference to `acpi_video_register' make: *** [vmlinux] Error 1 Signed-off-by: Xiong Zhou Signed-off-by: Patrik Jakobsson --- drivers/gpu/drm/gma500/Kconfig | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig index 42e665c..92760ff 100644 --- a/drivers/gpu/drm/gma500/Kconfig +++ b/drivers/gpu/drm/gma500/Kconfig @@ -2,10 +2,15 @@ config DRM_GMA500 tristate "Intel GMA5/600 KMS Framebuffer" depends on DRM && PCI && X86 && EXPERIMENTAL select FB_CFB_COPYAREA - select FB_CFB_FILLRECT - select FB_CFB_IMAGEBLIT - select DRM_KMS_HELPER - select DRM_TTM + select FB_CFB_FILLRECT + select FB_CFB_IMAGEBLIT + select DRM_KMS_HELPER + select DRM_TTM + # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915 + select ACPI_VIDEO if ACPI + select BACKLIGHT_CLASS_DEVICE if ACPI + select VIDEO_OUTPUT_CONTROL if ACPI + select INPUT if ACPI help Say yes for an experimental 2D KMS framebuffer driver for the Intel GMA500 ('Poulsbo') and other Intel IMG based graphics