From patchwork Wed Apr 10 12:37:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murphy Zhou X-Patchwork-Id: 2421101 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 9C433DF2E5 for ; Wed, 10 Apr 2013 13:02:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9AD63E6420 for ; Wed, 10 Apr 2013 06:02:51 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-da0-f41.google.com (mail-da0-f41.google.com [209.85.210.41]) by gabe.freedesktop.org (Postfix) with ESMTP id B90DDE630E for ; Wed, 10 Apr 2013 05:38:32 -0700 (PDT) Received: by mail-da0-f41.google.com with SMTP id w4so199558dam.28 for ; Wed, 10 Apr 2013 05:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:x-x-sender:to:cc:subject:message-id:user-agent :mime-version:content-type; bh=E2xvGjEMzDg5ayTdfoFDbe81oQtJwFa6WwXj44VfGCA=; b=j4IBfA++B9lWr2Eu/ePbjj6ktEXjsD8C8b2o2K+e+4JPa1DXDbVJf0nUj+swH5Zusq j1DO4cXEEqw1cnxNAzWypO5W8Sc2MhQkVSomCH01wz5OtLhK1HcBewYGwbn5jnZLN/Ff UfOzjLUKjX2YqH5gObBODhWnn8zSodOq/q1GiHcpYZ90w4WYZLfXmQyVWLyqzgttC8ss hjjXiuXl7VG0raBNIh1otbElNx+Ouehul7Iq9W8xhf1eXb1JVL7dNOYJO8yW+FN76juh zySAE1VXxVm9XIJ4D0aGjg+FkhNDnjdYy1Im/uH2Y8V7kUMywXBA1Pssk+88l+jRC52x oDcw== X-Received: by 10.68.204.71 with SMTP id kw7mr2721374pbc.40.1365597512455; Wed, 10 Apr 2013 05:38:32 -0700 (PDT) Received: from M2420.local ([123.127.250.67]) by mx.google.com with ESMTPS id ce16sm336611pac.5.2013.04.10.05.38.25 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Apr 2013 05:38:31 -0700 (PDT) Date: Wed, 10 Apr 2013 20:37:52 +0800 (CST) From: Xiong Zhou X-X-Sender: zx@M2420 To: airlied@redhat.com, alan@linux.intel.com, dri-devel@lists.freedesktop.org, patrik.r.jakobsson@gmail.com Subject: [PATCH v2] gma500:fix build failure for 3.9-rc5 Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 10 Apr 2013 05:57:59 -0700 Cc: jencce.kernel@gmail.com, linux-kernel@vger.kernel.org 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: , 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 --- 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 1188f0f..1f6e2df 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 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