Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2900290pxb; Tue, 24 Aug 2021 10:10:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkUleKEl9KXTkyLA7tiL1x8uCIkEcm+SW35/PKnd8rIfmXKKLPUTXKjG8SZNweNCWpzxU+ X-Received: by 2002:a6b:e70f:: with SMTP id b15mr17112688ioh.140.1629825041482; Tue, 24 Aug 2021 10:10:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629825041; cv=none; d=google.com; s=arc-20160816; b=YxxdlgvmA82iVGZPIB5zZRqz/cCcpe38+LJpqZ/hIAY//c2XRxBVuI2P1OZgDnIsAh HkEy0gOn3PtSVfmoqXCVvesfTd8qAmUw6DTZAGdpkZdf2dS4ZL/RN1QbnGxAVouguho8 1Fkas1lHVPY1scMqvgXwzxXdX9E6AGoVRu7DCxC4JsUFMsigxAtl4YKSXSbTR8UE3OGR lEMVQ1FZREK4ivB4DFi4tIDY31eQelvntGyad50HnlYNkdaQSphjv38yRv1D7nH6G+0a +xcA887tMntLI3lC/uMAUjCvuvGI43PfY8nwVVY6hStRzMxl0KxGJ+Ny6Vwtdw+YP8ET aV+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nHQmNriKWn1z73dHI6D66SCbX16grgjIDK4w4vkWgDM=; b=m6HHWMxWs7qwHAnWLg2Hh6uJhunhIY3dOAkkXVvHNV7oUTG5corKYG07OQ7Brfmhlq Dh3KNqgIHqQ0vu+t9boqY3SdAl4AlGPyD9Vuu1SVhhA0DqnpmhXialToYkXaCtxkxJ+l 95ZUw9ue8rNQXq8qDJDmSvvNt+03PUrwb0dHCzXiX4OFgt4RvVltWvMVHBQLl0a+3b23 UfNTpp3j+kzteBbMw95sGg7YxTvSxGYPRC0BPrneh98Gtw7TPBlqb1802t37woHlmTTC eeZPW/mZHdPhh2UB2wmWmzMQN0HrJlkdlrLBiFqRiO0v55t24CS+c0ev1xlqFHpLeV2/ 9cqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HTY9q+DS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k11si18750004ili.81.2021.08.24.10.10.29; Tue, 24 Aug 2021 10:10:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HTY9q+DS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239896AbhHXRJn (ORCPT + 99 others); Tue, 24 Aug 2021 13:09:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:46436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239425AbhHXRHC (ORCPT ); Tue, 24 Aug 2021 13:07:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1ED246197A; Tue, 24 Aug 2021 16:59:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824394; bh=AoWyMluNeaCL3kO3ZFSabppZLDdX4zCUwKige57Upz0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HTY9q+DSr0YVTKUQrDwt8ppQxUa6f9SYYmFQzllDajavIz9NuKTII+tm4DpANzKu/ hJbaV8+QUuqSZdpYcJutTbegZcOIIIs7fp9eg13h37fRfCMdw0COpmz5/nNnA7RVK5 86YuD6Xx8+UNtJwkAt9hls+lPc/naqKCmAPG2eSfbzA1ApthFctPeRmrd72kkVgWcq eoIRhj7iypa8tSsP+TGD8/NhurRdVhMOM8/vzVmV52hQamDSeGu5x9Jl/AJUjyzfe/ glscTjM2Mazdk/oOJEeKiCKfOoUu4dPrRLja4tvb6uMEt6/7ex5CEggX1fVjf9QFXV 4iOnOEqjRIgLw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yongqiang Niu , Enric Balletbo i Serra , Chun-Kuang Hu , Matthias Brugger , Sasha Levin Subject: [PATCH 5.10 45/98] soc / drm: mediatek: Move DDP component defines into mtk-mmsys.h Date: Tue, 24 Aug 2021 12:58:15 -0400 Message-Id: <20210824165908.709932-46-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824165908.709932-1-sashal@kernel.org> References: <20210824165908.709932-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.61-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.10.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.10.61-rc1 X-KernelTest-Deadline: 2021-08-26T16:58+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yongqiang Niu [ Upstream commit 51c0e618b219c025ddaaf14baea8942cb7e2105b ] MMSYS is the driver which controls the routing of these DDP components, so the definition of the mtk_ddp_comp_id enum should be placed in mtk-mmsys.h Signed-off-by: Yongqiang Niu Signed-off-by: Enric Balletbo i Serra Reviewed-by: Chun-Kuang Hu Link: https://lore.kernel.org/r/20201006193320.405529-2-enric.balletbo@collabora.com Signed-off-by: Matthias Brugger Signed-off-by: Sasha Levin --- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 34 +-------------------- drivers/soc/mediatek/mtk-mmsys.c | 4 +-- include/linux/soc/mediatek/mtk-mmsys.h | 33 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h index 1d9e00b69462..5aa52b7afeec 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h @@ -7,6 +7,7 @@ #define MTK_DRM_DDP_COMP_H #include +#include struct device; struct device_node; @@ -35,39 +36,6 @@ enum mtk_ddp_comp_type { MTK_DDP_COMP_TYPE_MAX, }; -enum mtk_ddp_comp_id { - DDP_COMPONENT_AAL0, - DDP_COMPONENT_AAL1, - DDP_COMPONENT_BLS, - DDP_COMPONENT_CCORR, - DDP_COMPONENT_COLOR0, - DDP_COMPONENT_COLOR1, - DDP_COMPONENT_DITHER, - DDP_COMPONENT_DPI0, - DDP_COMPONENT_DPI1, - DDP_COMPONENT_DSI0, - DDP_COMPONENT_DSI1, - DDP_COMPONENT_DSI2, - DDP_COMPONENT_DSI3, - DDP_COMPONENT_GAMMA, - DDP_COMPONENT_OD0, - DDP_COMPONENT_OD1, - DDP_COMPONENT_OVL0, - DDP_COMPONENT_OVL_2L0, - DDP_COMPONENT_OVL_2L1, - DDP_COMPONENT_OVL1, - DDP_COMPONENT_PWM0, - DDP_COMPONENT_PWM1, - DDP_COMPONENT_PWM2, - DDP_COMPONENT_RDMA0, - DDP_COMPONENT_RDMA1, - DDP_COMPONENT_RDMA2, - DDP_COMPONENT_UFOE, - DDP_COMPONENT_WDMA0, - DDP_COMPONENT_WDMA1, - DDP_COMPONENT_ID_MAX, -}; - struct mtk_ddp_comp; struct cmdq_pkt; struct mtk_ddp_comp_funcs { diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c index a55f25511173..36ad66bb221b 100644 --- a/drivers/soc/mediatek/mtk-mmsys.c +++ b/drivers/soc/mediatek/mtk-mmsys.c @@ -5,13 +5,11 @@ */ #include +#include #include #include #include -#include "../../gpu/drm/mediatek/mtk_drm_ddp.h" -#include "../../gpu/drm/mediatek/mtk_drm_ddp_comp.h" - #define DISP_REG_CONFIG_DISP_OVL0_MOUT_EN 0x040 #define DISP_REG_CONFIG_DISP_OVL1_MOUT_EN 0x044 #define DISP_REG_CONFIG_DISP_OD_MOUT_EN 0x048 diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h index 7bab5d9a3d31..2228bf6133da 100644 --- a/include/linux/soc/mediatek/mtk-mmsys.h +++ b/include/linux/soc/mediatek/mtk-mmsys.h @@ -9,6 +9,39 @@ enum mtk_ddp_comp_id; struct device; +enum mtk_ddp_comp_id { + DDP_COMPONENT_AAL0, + DDP_COMPONENT_AAL1, + DDP_COMPONENT_BLS, + DDP_COMPONENT_CCORR, + DDP_COMPONENT_COLOR0, + DDP_COMPONENT_COLOR1, + DDP_COMPONENT_DITHER, + DDP_COMPONENT_DPI0, + DDP_COMPONENT_DPI1, + DDP_COMPONENT_DSI0, + DDP_COMPONENT_DSI1, + DDP_COMPONENT_DSI2, + DDP_COMPONENT_DSI3, + DDP_COMPONENT_GAMMA, + DDP_COMPONENT_OD0, + DDP_COMPONENT_OD1, + DDP_COMPONENT_OVL0, + DDP_COMPONENT_OVL_2L0, + DDP_COMPONENT_OVL_2L1, + DDP_COMPONENT_OVL1, + DDP_COMPONENT_PWM0, + DDP_COMPONENT_PWM1, + DDP_COMPONENT_PWM2, + DDP_COMPONENT_RDMA0, + DDP_COMPONENT_RDMA1, + DDP_COMPONENT_RDMA2, + DDP_COMPONENT_UFOE, + DDP_COMPONENT_WDMA0, + DDP_COMPONENT_WDMA1, + DDP_COMPONENT_ID_MAX, +}; + void mtk_mmsys_ddp_connect(struct device *dev, enum mtk_ddp_comp_id cur, enum mtk_ddp_comp_id next); -- 2.30.2