From patchwork Wed Oct 13 14:42:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 515725 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp6605896ime; Wed, 13 Oct 2021 07:43:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzh7p4E9oc62zH2up3siXAbyq2mQuLk9qU1KBcyisI0TYxuG/0f43SAJ2dhvoIyWi52Ivua X-Received: by 2002:a17:90b:188b:: with SMTP id mn11mr14099566pjb.170.1634136196852; Wed, 13 Oct 2021 07:43:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634136196; cv=none; d=google.com; s=arc-20160816; b=aSu5mm+Dbf+G6JIS7cxzOKaXgYsBS44HeaJwRIV+fMhm64AZUSGfqDk/e2z06NeklS j3IDLcNyVE3Ki1phPFxlIhKLp1AOeWAN3IqcAMEFCBLEUOXuow3ePSmyH+Ont3HRpOK5 6e73l/+rjhgTFihULsUULTMdfAAyzlbMWNrb3qu4rVyP52TdFRuEalUi0lXQUPGPcWh9 SdmLvxMNVrMcaxoSehdbVOEeeLnj9CZpD26CNeJo1tcon/bN7we0Y/d3uthVeCNo3RGJ B3Y0wdfy/v7tYQkMAu6WEdRIkqFsmpnhaEXTSR6XDtG/67ZMiWVN+iJVwvWH4SwOqARQ /urg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :delivered-to; bh=TAFDkluXMcJhrWb8r0thIGnerPBrxbGRxBx0vyVsdec=; b=KCZlVVGIXhSt8fVdOkyijqoGCkjVnhpAK494LJ5bh2vjA38PPANOCV8uGc3VDsWs2E 1TPkxMpBITNyZD/7hNOtVK2GQoRpsRWQIRSF0lyLoHWahvyiIIrDVwBX0dyaeqrC5i+A DFiICMayobrqvc9OidTnUKJsR9JJ0TKPWdd0cYj4DEoBda1r0W4F+mmJJ5ESygtXRCBv BZaiwrqf19wlrfHdpA5Pb8+BNTyuDd9Nkpy7fldqFjYF/9MC99ds5/wkAxwOcVlUowDk SsjL67ywVheaJ3AJApyfn+HymNqxkuYb59NQQeMpcS7/KBJ3JS59WtZETTQYOqKl0lsE kExw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ioHRl71J; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id g131si17873415pfb.68.2021.10.13.07.43.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Oct 2021 07:43:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ioHRl71J; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67CF96EA09; Wed, 13 Oct 2021 14:43:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1CA0C6EA09; Wed, 13 Oct 2021 14:43:14 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id E667661166; Wed, 13 Oct 2021 14:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634136193; bh=3YOpUj7zJIjHOwNL7dHDpxdkIPlsudzfvv538+Bhka0=; h=From:To:Cc:Subject:Date:From; b=ioHRl71JgzZ0mbftYm/WArKiGSk5dzcVQvzsXVP7zv2nWL4M22qfgruxeGeqOkzHO +u7kIJ7Af439F+wP9OuveVQDGGLgnD1nwQc3CmOlSsyLO8t4AiyWj0DzN6eZwWTCal tnuHzV/3oZaLuOHeGuB0wpxSoNmTRYNA9GHWnA0Qp3uh+p5iaLH6j6Ez/ldAjVxHS1 vmL2is+oMpacdVpqgx0ymn1tCl+Gx0KEVSnalG5F5eDYtceNwRNUSkLc45R5hdO0Sr Udc8D60oJar4TuxLNhJnjjoS391ykJf7K2SswEs6zjPZkTxWxRvvtL0XwgaHQKjDal DxliTR8fRQprw== From: Arnd Bergmann To: Rob Clark , Sean Paul , David Airlie , Daniel Vetter Cc: Arnd Bergmann , Randy Dunlap , Geert Uytterhoeven , Dmitry Baryshkov , Alex Elder , =?utf-8?q?Christian_K=C3=B6nig?= , Akhil P Oommen , Rajeev Nandan , Abhinav Kumar , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm: msm: fix building without CONFIG_COMMON_CLK Date: Wed, 13 Oct 2021 16:42:56 +0200 Message-Id: <20211013144308.2248978-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann When CONFIG_COMMON_CLOCK is disabled, the 8996 specific phy code is left out, which results in a link failure: ld: drivers/gpu/drm/msm/hdmi/hdmi_phy.o:(.rodata+0x3f0): undefined reference to `msm_hdmi_phy_8996_cfg' This was only exposed after it became possible to build test the driver without the clock interfaces. Make COMMON_CLK a hard dependency for compile testing, and simplify it a little based on that. Fixes: b3ed524f84f5 ("drm/msm: allow compile_test on !ARM") Reported-by: Randy Dunlap Suggested-by: Geert Uytterhoeven Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/Kconfig | 2 +- drivers/gpu/drm/msm/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.29.2 Reviewed-by: Dmitry Baryshkov diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index f5107b6ded7b..cb204912e0f4 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -4,8 +4,8 @@ config DRM_MSM tristate "MSM DRM" depends on DRM depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST + depends on COMMON_CLK depends on IOMMU_SUPPORT - depends on (OF && COMMON_CLK) || COMPILE_TEST depends on QCOM_OCMEM || QCOM_OCMEM=n depends on QCOM_LLCC || QCOM_LLCC=n depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 904535eda0c4..bbee22b54b0c 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -23,8 +23,10 @@ msm-y := \ hdmi/hdmi_i2c.o \ hdmi/hdmi_phy.o \ hdmi/hdmi_phy_8960.o \ + hdmi/hdmi_phy_8996.o \ hdmi/hdmi_phy_8x60.o \ hdmi/hdmi_phy_8x74.o \ + hdmi/hdmi_pll_8960.o \ edp/edp.o \ edp/edp_aux.o \ edp/edp_bridge.o \ @@ -37,6 +39,7 @@ msm-y := \ disp/mdp4/mdp4_dtv_encoder.o \ disp/mdp4/mdp4_lcdc_encoder.o \ disp/mdp4/mdp4_lvds_connector.o \ + disp/mdp4/mdp4_lvds_pll.o \ disp/mdp4/mdp4_irq.o \ disp/mdp4/mdp4_kms.o \ disp/mdp4/mdp4_plane.o \ @@ -117,9 +120,6 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \ dp/dp_audio.o msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o -msm-$(CONFIG_COMMON_CLK) += disp/mdp4/mdp4_lvds_pll.o -msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_pll_8960.o -msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_phy_8996.o msm-$(CONFIG_DRM_MSM_HDMI_HDCP) += hdmi/hdmi_hdcp.o