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: 9607535 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 E68B3602B4 for ; Mon, 6 Mar 2017 20:28:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D16F52840E for ; Mon, 6 Mar 2017 20:28:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C63BA28419; Mon, 6 Mar 2017 20:28:15 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 232CD2840E for ; Mon, 6 Mar 2017 20:28:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C0E76E19F; Mon, 6 Mar 2017 20:28:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x232.google.com (mail-qk0-x232.google.com [IPv6:2607:f8b0:400d:c09::232]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1266C6E19F for ; Mon, 6 Mar 2017 20:28:12 +0000 (UTC) Received: by mail-qk0-x232.google.com with SMTP id 1so173791875qkl.3 for ; Mon, 06 Mar 2017 12:28:12 -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=pjsHssPt2VDArNGAIIOFVpvg/wTeh2yOxPT59ZkcHGRA81tb6lLfl3pb0DANveOJy0 /bB3mSkTFTQLqFpFskR6QRR1Zd+Nba+Wd4GrFJBfhKzfXK4v+hU40s2jU9wi6DqdtAWV 7yOncqQ35GjcrH7XQ2y96JfGeK23rYX8fSoE+oGWiutLv+vOtQOyW6c9CLsTKXEqIvEU 02Jd3ixQYvt9hSsXA3Vy0pWUYe1G2IuGYsYYTufffElWk0RkhEuf/mLavt09slmbWBIz QgKRxrU/sE1dZxi7b6Gba0fPHOgOHCzL1cCk0yKSL+gCd8aDmGTqLy7pDWg3vTLhgMpc ouaA== X-Gm-Message-State: AMke39mLGP5NOrJ4bnGdCUvEPLpbX0OK9MsCbpHmGbcCd5C3sa+SpLdOPzj62AIkHPk6F0dB 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> Cc: Tomeu Vizoso , Emil Velikov , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-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,