From patchwork Wed Nov 14 22:24:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 10683191 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3B53214DB for ; Wed, 14 Nov 2018 22:27:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D69027F85 for ; Wed, 14 Nov 2018 22:27:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 215AC2BE9E; Wed, 14 Nov 2018 22:27:53 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B78D27F85 for ; Wed, 14 Nov 2018 22:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389514AbeKOIct (ORCPT ); Thu, 15 Nov 2018 03:32:49 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:38918 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389238AbeKOIct (ORCPT ); Thu, 15 Nov 2018 03:32:49 -0500 Received: by mail-qk1-f193.google.com with SMTP id q70so11280992qkh.6 for ; Wed, 14 Nov 2018 14:27:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vK3k5i7adfxi/vPlBXMS1H9r3A7WHRxwZ+r5fGAERMs=; b=A4jHMD2WQj/jD5FJVavjmVMIOLUqjDlU9iRjwlD31lHGw/tlMEAvnsCNRZSFA/Ngl6 X3gta/Wt+d6xUqFT6Uh3ulDgMTa5eorct2r2DKys8pq3bO+SCKWFjw+zzI9SxsEg01qp lzVghCHlgMgPQdPivU1w+SsY9VRsJr8hRJLzabtx7GldBElOkP7sG3FsRa5w3Q6bXcn6 n5tCLUDrw0tCtjBDR9cAOqaqHeFH8a+sUcTb4+UEd6YhME9xE2qPI/WZ7Q63UiTbzTwz 6FxxFIrNJJHt2kMgeniFr6/2hqXAOKIIyP8zuOhF8ZwJguryVnBk8qzH7x1KYmf2zSdW FB3w== 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=vK3k5i7adfxi/vPlBXMS1H9r3A7WHRxwZ+r5fGAERMs=; b=aAHkzkKv8fHA2qCGybmHmrkriLtAHqYm0ZJtt2pilEqDZQ8fgC+ff1J4Bbn/gM+i4F qx0HqvjdWh5zmRukbUXfi+lxQuHWfYLzAnRqqMc6RoqaxuQccK7wOYvv8usWqwS4QyZ4 +xyK/7p8kSxxfypKedaJc4G5Tc2m0jDSKSyf9bmU4Nd5HupKQt6/c8w0/7xnoaaurpZt axYe1AFFRGCWhQwTWXvsvVN7P+T8J6aq/5a8Oj0Rz/uPMdIZJ9M4+gUJjgc6vigxh/KX FvQDeON50pmcqxNCMpa2G9/d8PAm6P8Ot2LDt04H608gMuH1cOqQ/vnLEqbaMmIWYW4i 6L1Q== X-Gm-Message-State: AGRZ1gKp0lQd6Xw4oApoTNNqDo97CiHL2yc193xvGLJB9Maylv84zVoQ /O0aydA9kEOP/M5wyCoZWV2ZRHH3xJ7dMg== X-Google-Smtp-Source: AJdET5cFE1J3Sf3SpKhk2CmFxAKgMYNbIGjeHMFa3IH7plsjFhB+YdObVZAj6gD/Ur0zTddKFTrcow== X-Received: by 2002:a37:7e86:: with SMTP id z128mr3536676qkc.20.1542234462986; Wed, 14 Nov 2018 14:27:42 -0800 (PST) Received: from localhost.localdomain (modemcable014.247-57-74.mc.videotron.ca. [74.57.247.14]) by smtp.gmail.com with ESMTPSA id 24sm24067595qkp.65.2018.11.14.14.27.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 14:27:42 -0800 (PST) From: Jonathan Marek To: freedreno@lists.freedesktop.org Cc: Rob Clark , David Airlie , Bjorn Andersson , Niklas Cassel , Andy Gross , Jordan Crouse , Govind Singh , linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), dri-devel@lists.freedesktop.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 5/9] drm/msm: add headless gpu device (for imx5) Date: Wed, 14 Nov 2018 17:24:12 -0500 Message-Id: <20181114222418.15960-5-jonathan@marek.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181114222418.15960-1-jonathan@marek.ca> References: <20181114222418.15960-1-jonathan@marek.ca> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jonathan Marek --- drivers/gpu/drm/msm/Kconfig | 4 ++-- drivers/gpu/drm/msm/msm_debugfs.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 15 +++++++++++---- include/linux/qcom_scm.h | 3 +++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 843a9d40c05e..cf549f1ed403 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -2,7 +2,7 @@ config DRM_MSM tristate "MSM DRM" depends on DRM - depends on ARCH_QCOM || (ARM && COMPILE_TEST) + depends on ARCH_QCOM || SOC_IMX5 || (ARM && COMPILE_TEST) depends on OF && COMMON_CLK depends on MMU select QCOM_MDT_LOADER if ARCH_QCOM @@ -11,7 +11,7 @@ config DRM_MSM select DRM_PANEL select SHMEM select TMPFS - select QCOM_SCM + select QCOM_SCM if ARCH_QCOM select WANT_DEV_COREDUMP select SND_SOC_HDMI_CODEC if SND_SOC select SYNC_FILE diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c index f0da0d3c8a80..1ca99ca356a4 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -235,7 +235,7 @@ int msm_debugfs_init(struct drm_minor *minor) debugfs_create_file("gpu", S_IRUSR, minor->debugfs_root, dev, &msm_gpu_fops); - if (priv->kms->funcs->debugfs_init) { + if (priv->kms && priv->kms->funcs->debugfs_init) { ret = priv->kms->funcs->debugfs_init(priv->kms, minor); if (ret) return ret; diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 9f219e02f3c7..a10cc0298d38 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -344,6 +344,7 @@ static int msm_drm_uninit(struct device *dev) return 0; } +#define KMS_HEADLESS 1 #define KMS_MDP4 4 #define KMS_MDP5 5 #define KMS_DPU 3 @@ -495,6 +496,9 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) msm_gem_shrinker_init(ddev); switch (get_mdp_ver(pdev)) { + case KMS_HEADLESS: + priv->kms = kms = NULL; + break; case KMS_MDP4: kms = mdp4_kms_init(ddev); priv->kms = kms; @@ -633,7 +637,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) drm_mode_config_reset(ddev); #ifdef CONFIG_DRM_FBDEV_EMULATION - if (fbdev) + if (kms && fbdev) priv->fbdev = msm_fbdev_init(ddev); #endif @@ -1315,9 +1319,11 @@ static int msm_pdev_probe(struct platform_device *pdev) struct component_match *match = NULL; int ret; - ret = add_display_components(&pdev->dev, &match); - if (ret) - return ret; + if (get_mdp_ver(pdev) != KMS_HEADLESS) { + ret = add_display_components(&pdev->dev, &match); + if (ret) + return ret; + } ret = add_gpu_components(&pdev->dev, &match); if (ret) @@ -1342,6 +1348,7 @@ static int msm_pdev_remove(struct platform_device *pdev) } static const struct of_device_id dt_match[] = { + { .compatible = "qcom,adreno-headless", .data = (void *)KMS_HEADLESS }, { .compatible = "qcom,mdp4", .data = (void *)KMS_MDP4 }, { .compatible = "qcom,mdss", .data = (void *)KMS_MDP5 }, { .compatible = "qcom,sdm845-mdss", .data = (void *)KMS_DPU }, diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h index 06996ad4f2bc..1637385bcc17 100644 --- a/include/linux/qcom_scm.h +++ b/include/linux/qcom_scm.h @@ -67,6 +67,9 @@ extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare); extern int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val); extern int qcom_scm_io_writel(phys_addr_t addr, unsigned int val); #else + +#include + static inline int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) {