From patchwork Tue Jun 3 13:38:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 4288881 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E2D9F9F1D6 for ; Tue, 3 Jun 2014 13:39:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D35720260 for ; Tue, 3 Jun 2014 13:39:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 884E0202C8 for ; Tue, 3 Jun 2014 13:39:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 60B4E6E70B; Tue, 3 Jun 2014 06:39:15 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 016816E70B for ; Tue, 3 Jun 2014 06:39:13 -0700 (PDT) Received: by mail-wi0-f172.google.com with SMTP id hi2so6499586wib.17 for ; Tue, 03 Jun 2014 06:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=K2fqdwoPU5suHX2pgVwUaZ7FdRMPvqgeHNyYQq9BbFs=; b=Dz1D2cfTA5a/GJr4YC6P5Lg0ADJ5n22916bXrbD/wWojm+vSidhGk/lGGBoARvrGs7 hmQ74E/1y3KaOeXAR3rVNSFxsboW9jg5y8+ZORzfeOsLzpAaWvJ2nxAVawNZOm293gK+ Jx6ZJHRTXa9zlKgqQhG9LzMWC90Y1635xsppo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=K2fqdwoPU5suHX2pgVwUaZ7FdRMPvqgeHNyYQq9BbFs=; b=R7jwNsUbhnxeHUb1nwZ2f0p1s7nDD+Rkv7Xeq1qdhG2dWnk2sL8bxO5I0eR3jTkyqT Q+fx9ml/9CHAeT9Z2+lIJZMEXuSD76NUhkYx6nH4Al/Fh72//wKbf4wnKb3Nq13fega6 nMo4I8ZwAgWFQ6krLNiJ/v+5O+sqQ9tr0MMy08zSaHMNorRM11hc4dotyUUlgAcW3qU4 jw00759ysdf3hIQ4eq3ixH0IUqfAcwxAIIAqm0XjhUoq3w5y06x8w+WMpOb+lEVN9lj1 7XiBegEAl9Iy0NHmiM4gNZmVGb0e9WF6AGxrjD2bzr9ZmWkW4JplPP5Bwb4PqugwsTTv SjxQ== X-Gm-Message-State: ALoCoQnTEEqUecQBS4/dsm0saTFs0NqIPLNfvpQaT+IaOtuBh4H3ucIt4pPdJigRd+4LFLPAFojB X-Received: by 10.194.91.175 with SMTP id cf15mr61061082wjb.5.1401802749549; Tue, 03 Jun 2014 06:39:09 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id gp6sm3023259wib.12.2014.06.03.06.39.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Jun 2014 06:39:08 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm: Move plane helpers into drm_kms_helper.ko Date: Tue, 3 Jun 2014 15:38:56 +0200 Message-Id: <1401802736-32065-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.0.0 Cc: Daniel Vetter , Intel Graphics Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The drm core shouldn't depend upon any helpers, and we make sure this doesn't accidentally happen by moving them into the helper-only drm_kms_helper.ko module. Cc: Matt Roper Signed-off-by: Daniel Vetter Reviewed-by: Matt Roper --- drivers/gpu/drm/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 48e38ba22783..863db8415c22 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -13,8 +13,7 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ drm_crtc.o drm_modes.o drm_edid.o \ drm_info.o drm_debugfs.o drm_encoder_slave.o \ drm_trace_points.o drm_global.o drm_prime.o \ - drm_rect.o drm_vma_manager.o drm_flip_work.o \ - drm_plane_helper.o + drm_rect.o drm_vma_manager.o drm_flip_work.o drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o @@ -23,7 +22,8 @@ drm-$(CONFIG_DRM_PANEL) += drm_panel.o drm-usb-y := drm_usb.o -drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o +drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \ + drm_plane_helper.o drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o drm_kms_helper-$(CONFIG_DRM_KMS_FB_HELPER) += drm_fb_helper.o drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o