From patchwork Mon Mar 6 20:27:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9607545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5016C602B4 for ; Mon, 6 Mar 2017 20:29:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D555283F9 for ; Mon, 6 Mar 2017 20:29:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31A3728419; Mon, 6 Mar 2017 20:29:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AAF45283F9 for ; Mon, 6 Mar 2017 20:29:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=YCYid3NFCpAY+k+lRpo2IaXgm7oidbMAknBwFALl7NY=; b=WoXDhC5evGH5s6quMSfsLx5uml 4Yw4upaxxv5TVSXez1isuQ/M3r7qSEN5kTUHhqXHYxIY1pAi1AmpGJ/t3Q9DgIc7mVihk99O8f0Nw Dpr7tC2o+kt2g+LBUl54AnNdrtJyMjIqArPFYOHsrwFq+Ky+bPCDd6jj3vtGU++0xmsRwfArtO3EX gg0UDVz3pyDjzl77KGcscYlyOI+V++1gjm3OtLmsWLgfr6vZw6X76oRoiVZKLQgZmpXhMbBwM08bw it5Y4IqhcZzmEAWg5LiLhexrsCr8rCp27Ic04MSSD+vQV/BEY2kGfpODAH0xjXWJPheWqUqoIiM/B +8+E+GLg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ckzFd-0007Ld-ES; Mon, 06 Mar 2017 20:29:01 +0000 Received: from mail-qk0-x235.google.com ([2607:f8b0:400d:c09::235]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ckzFB-0006lU-HI for linux-arm-kernel@lists.infradead.org; Mon, 06 Mar 2017 20:28:38 +0000 Received: by mail-qk0-x235.google.com with SMTP id v125so111569980qkh.2 for ; Mon, 06 Mar 2017 12:28:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YTkPpa2TSGPWDRBLRFhg3ENnWOwL8coVnfXRF/HvCpQ=; b=nHdEwb5XDpy0/SKTRKKAhzVStpQEd8TqIqVcZEjXVBlTGaPZcpFNrUbJgW1O/zk5Hu ORWyCSmfJtfHYtNkM0jOsf6YvyZPt/E87f6YHBN/jgd7WiOeYixEUoLnCfq0CBaQWRFb Pq0We9mF0+yA3QhSJPiL1zFdGl3cGCH/1Ot/8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YTkPpa2TSGPWDRBLRFhg3ENnWOwL8coVnfXRF/HvCpQ=; b=G1UR8VETWtF1A2ao1wUWgjIy1pivZsvgK1R1HQNP3MYH1j+Z85/Rg+/MpfzA+i9FxR Yp8xR1ZjMHyqGwT54XOJRT7Bd20SajAN2a09OrWy6oyfNAWUW7SAfVBb3TlRbG/3/CLQ ofKFbSqxcQiW+egz/9DxT2KRAsWjToIklK5h7rJ3dCf72fb8XLnNeK19TcMYGfBbdVai K7IfLSxmlAI+Gq3r3zkv2kKR91L3Ol5pfgR59LR8IVwbcvdzcL5tjCBny4zEI4TvTZ+i BbETp6VYAbNn8gvBmqsg3aWUVLVpc2mm5bG/l1aE76EmmZqVDHbnovOzks3WvDe2JdIl k7AQ== X-Gm-Message-State: AMke39mECOpXPF9UMd44FIW6Jtjl81LysgGjJQB6yUnFDY6IU1e48MqpuQUbGqEJ3xMZ1KSY X-Received: by 10.55.170.68 with SMTP id t65mr16382855qke.303.1488832091230; Mon, 06 Mar 2017 12:28:11 -0800 (PST) Received: from boxwood.roam.corp.google.com (cpe-75-189-128-87.nc.res.rr.com. [75.189.128.87]) by smtp.gmail.com with ESMTPSA id t30sm14084837qtt.56.2017.03.06.12.28.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Mar 2017 12:28:10 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined Date: Mon, 6 Mar 2017 15:27:14 -0500 Message-Id: <20170306202722.9301-3-seanpaul@chromium.org> X-Mailer: git-send-email 2.12.0.rc1.440.g5b76565f74-goog In-Reply-To: <20170306202722.9301-1-seanpaul@chromium.org> References: <20170306202722.9301-1-seanpaul@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170306_122833_808344_A5C413A9 X-CRM114-Status: GOOD ( 11.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , Tomeu Vizoso , David Airlie , Emil Velikov , linux-rockchip@lists.infradead.org, Sean Paul , linux-arm-kernel@lists.infradead.org, Mark Yao MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Fixes the following link error when CONFIG_DRM_ANALOGIX_DP is not defined: ERROR: "analogix_dp_start_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! ERROR: "analogix_dp_stop_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! Fixes: 3190e58dafaf ("drm/rockchip: Implement CRC debugfs API") Reported-by: Emil Velikov Cc: Tomeu Vizoso Cc: Mark Yao Cc: Sean Paul Cc: Heiko Stuebner Cc: dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: Emil Velikov Signed-off-by: Sean Paul Reviewed-by: Emil Velikov --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 17ab16c4b922..2151e1cee4b4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -19,7 +19,9 @@ #include #include #include +#ifdef CONFIG_DRM_ANALOGIX_DP #include +#endif #include #include @@ -1112,6 +1114,7 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc, kfree(s); } +#ifdef CONFIG_DRM_ANALOGIX_DP static struct drm_connector *vop_get_edp_connector(struct vop *vop) { struct drm_crtc *crtc = &vop->crtc; @@ -1150,6 +1153,13 @@ static int vop_crtc_set_crc_source(struct drm_crtc *crtc, return ret; } +#else +static int vop_crtc_set_crc_source(struct drm_crtc *crtc, + const char *source_name, size_t *values_cnt) +{ + return -ENODEV; +} +#endif static const struct drm_crtc_funcs vop_crtc_funcs = { .set_config = drm_atomic_helper_set_config,