From patchwork Thu Oct 31 21:44:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 839903 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A56B01CC8AF for ; Thu, 31 Oct 2024 21:44:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730411062; cv=none; b=VBSYriqGJdsmQU53uqhSesPl96/KXRr9McMpDfJCF59ir1Hh9RJFEL0M/jsYxCihswmjQX9O7jqrfdza/TJFFy4qs/0I6A9f26jH4y2a0Y2LjrL+kgFXKf194q/ZVxSOhhVFhDUYINV5m0udN3jZCVyFUyz/88zND3Cmm5wP/LA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730411062; c=relaxed/simple; bh=3gmgqvAjzCSSavAjV5jJg0GKqDw6X9/s8Cl9bedoQdA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JYdoYqi79L+Y5kXr0gnL59qjWcWgUw1oj9rgCQmbRczfvQSVRdXfaEp1r6j2OAj3XUgffIJp0EHn4gR4FziDKnS3NB8FZrZt6FZcfJg9jykKQPWTlJnLVxN+mLMU//AwUinzknW7O0t2gBVc62AQdYfasQsvTvKZ0emfKR48prM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Y/BvgOIJ; arc=none smtp.client-ip=209.85.167.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Y/BvgOIJ" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-539f72c913aso2254967e87.1 for ; Thu, 31 Oct 2024 14:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730411055; x=1731015855; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=OqNSFMIgIgV5OpXdR/7l7nRGQJoQyaD3983y+et4GC4=; b=Y/BvgOIJLnvOsl4cAAb4ak9WGwkknmEMc+7k4WtKvxtSm1YHH6wUTtS4xJDU6eErQL MsQtIY5UiDlwBXiNKsttvgN+sVCtqx1TmhpJP5IZRGUdSx/z6bDpTmysCV8r/YbZPBf9 edlNDBlmpPJZCGqRcFyOH4x3pS3laXKQxbI0I0XQrNlozfr6TIiRJMgcWyXB0b5SfHuy 4KkkUyP5zBLSKHNklFLc4+8CMT3V2CppASEYbt0ZG8nSoyuBR/iBwzkCBQqT3Qhlkb+G L1FFRtzfQc6ox2bJMSEOJ0UXq+SNWdUVBEnLFDlM9dZvOawL8rD9TdXqymYhftNKgOe4 DA0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730411055; x=1731015855; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OqNSFMIgIgV5OpXdR/7l7nRGQJoQyaD3983y+et4GC4=; b=kR+9eX4o+/tQmBSbM4cUINIZVsLLbTniUPrdK6BBx4iL6wrIPoXvh3SrjBuoj9Bgfv JUKLL8QXosy0VwxILsCdsJ7sX1bCi5kS2MW0Ms8wWuuh+GMCNMLpJQ5HO7cBf3YZrSOD GNitEH6yak+/T/M2xEaWoqm26iGTEDkIDrv6zHjEk1kcTRSkFhW6fpiecHL03DU0pfLW 8kOE9cm3/qYpE8Y7ciw4yAYywm8ieMCkImpJcN7xfhNbEJJANzysII+uoANnnUAMvtXs HjtAS0fybmtLIIM64KYETXQw+iemJaT/ckd8liTCUSOStXbpHupBRDvdh/2amkAJ+wsn 8+CQ== X-Gm-Message-State: AOJu0Yym7kL0uwpZWobXCALYs+/dA7E1uF9lhlInFyUX8fY8omRamw8v wVZWqU/0sTfEVNf/+cp73MkcNsUy6UIaTbg6Yken/AoXwpWdAjfllj1CDovG8Ms= X-Google-Smtp-Source: AGHT+IHwHI39pMLKJYKB/wJbzqMugbwMOcaMVOgXGw6qMYzh2l8oGIsERY8Roc/3xeyAXemPUVpnHw== X-Received: by 2002:a05:6512:3b1e:b0:539:f37f:bed9 with SMTP id 2adb3069b0e04-53b348c38d4mr10744771e87.8.1730411054650; Thu, 31 Oct 2024 14:44:14 -0700 (PDT) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53c7bc9c162sm339567e87.96.2024.10.31.14.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2024 14:44:13 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 31 Oct 2024 23:44:06 +0200 Subject: [PATCH 1/3] drm/msm: move msm_display_topology to the DPU driver Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241031-dpu-move-topology-v1-1-8ffa8122d3b6@linaro.org> References: <20241031-dpu-move-topology-v1-0-8ffa8122d3b6@linaro.org> In-Reply-To: <20241031-dpu-move-topology-v1-0-8ffa8122d3b6@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2272; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=3gmgqvAjzCSSavAjV5jJg0GKqDw6X9/s8Cl9bedoQdA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnI/opyJCRQfXjqH5VCLGGgyhtrc2f1DqM69JuU HJU3VI5uniJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZyP6KQAKCRCLPIo+Aiko 1f+jCACrvoUEvzZiGZj7CBTSY3ijv0NmWwvH4XePIES1czqYUu6Z+pxY1CCBpm1SLUQZd1qDCC3 dDcLfo7lktlCYzwkNA/N0fiycFu8tzXvBKIiKQ/MBlbdOdcUok+NkoeP3KsvEctlWeBei9QB2U4 r+zSJD2mRsj81j3kxzDwgoG0GvsOtfOJ4Ph+TKn4a/steVHjOijVUMJNJit7mo9sjIt6hZ81jp4 xy763WiGofpM9ofjrzNQMo9ut3d43pWs00jd7RknOTmg9pujEGu1TsmU/W6pPcbIQyqpk1Dii+9 jWLamaVNSz59rGQUbw0kwUzjftva87JP8IS6i/jZBqNf1rtc X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The struct msm_display_topology is only used by the DPU driver. Remove it from the global header and move it to DPU-specific header. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 16 ++++++++++++++++ drivers/gpu/drm/msm/msm_drv.h | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h index e63db8ace6b9..14220ba04a78 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h @@ -37,6 +37,22 @@ struct dpu_rm { struct dpu_hw_blk *cdm_blk; }; +/** + * struct msm_display_topology - defines a display topology pipeline + * @num_lm: number of layer mixers used + * @num_intf: number of interfaces the panel is mounted on + * @num_dspp: number of dspp blocks used + * @num_dsc: number of Display Stream Compression (DSC) blocks used + * @needs_cdm: indicates whether cdm block is needed for this display topology + */ +struct msm_display_topology { + u32 num_lm; + u32 num_intf; + u32 num_dspp; + u32 num_dsc; + bool needs_cdm; +}; + /** * dpu_rm_init - Read hardware catalog and create reservation tracking objects * for all HW blocks. diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 133e47bea7d5..ae3adb0f68a8 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -73,22 +73,6 @@ enum msm_dsi_controller { #define MSM_GPU_MAX_RINGS 4 #define MAX_H_TILES_PER_DISPLAY 2 -/** - * struct msm_display_topology - defines a display topology pipeline - * @num_lm: number of layer mixers used - * @num_intf: number of interfaces the panel is mounted on - * @num_dspp: number of dspp blocks used - * @num_dsc: number of Display Stream Compression (DSC) blocks used - * @needs_cdm: indicates whether cdm block is needed for this display topology - */ -struct msm_display_topology { - u32 num_lm; - u32 num_intf; - u32 num_dspp; - u32 num_dsc; - bool needs_cdm; -}; - /* Commit/Event thread specific structure */ struct msm_drm_thread { struct drm_device *dev; From patchwork Thu Oct 31 21:44:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 839902 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B4DD1CEEBE for ; Thu, 31 Oct 2024 21:44:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730411067; cv=none; b=DR+XeUMy8k976SWhq16Bs5sJfqjz4eRhO41HBvG295Z+X9ioAJR6TSJ0mUwCfdlNGXi+yvA6jhZUAlmD+Rez/x08lgUqHItb0rkFDS7G3ID0l7V10Ue6e07zL5AtM1dWQESduiPJqsVnw7DsT327xJmPJW0fwF5QDj4wEIJ8tUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730411067; c=relaxed/simple; bh=kwRkgGoOjzZgmKn1Q7SGF0bYYDkMueTmYikFdU7ocIQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HtRw36/zLFqxAbVOXjhYJOpap2L2YlG6KwMa2HHvpGUfaDaDt6wTT85K0OxNPApEL+N4rI8DIUIj59CUvRTiXXbm/i4G+BZAmPfGiYbBdXoh91VGi+uGsE++UF5f5MF06V4az22/EV8jXEB4NPxFv+L7Q4SVMiwGTfEwyr865N8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=vpyZ2df0; arc=none smtp.client-ip=209.85.208.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="vpyZ2df0" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2fb5fa911aaso21509111fa.2 for ; Thu, 31 Oct 2024 14:44:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730411060; x=1731015860; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Jw811QvSxkKlTSi13fRKJUYPt91Pu2RmLTiZSYENA0A=; b=vpyZ2df0k9sKY5/hWxmK3VPowrV7r3kWo+xbB3ekoSXEqjGEFnsF7aGJWDF2qK9Tea CJjNyr5RwS/Qta+IY4BzQCRvTsD2IsUpK/J2l8YkuqcVW2wlYk6f2rXJilULbIBnQSh+ 89IgfkpiF0T2bplH3OmCYLe5prYQYAHCsv+Yd7EjgDpORK/bjSC93U0uvXgzm1BLqPdC hNFTjUMApR43YriTZUnoS3lHChLxfMUJA5mOsm7gCvcjd6fttkoTCpMsW22CMZ72qBIg lQ7Oi/RAMmioKFPCQc+Q/Iqbr0fCMMHksvdfTpQ2y7aKumhnoDhEppG+jgh9eiJ+efiP rM5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730411060; x=1731015860; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jw811QvSxkKlTSi13fRKJUYPt91Pu2RmLTiZSYENA0A=; b=l3rZVn7UMoEeF3LmUpmVFwrO4ZpwzvaVMlrv62ZjJuZfxAnEpe1eboGQzgR0Ilg8hA svWIyGzjPhewz9Fd1ZEzrQZAZuzgUX4eJuW5PEC/Z3GbEqso4So/94KbkLhDXILwA07l 1INFNCBElrkjNYEY1KuY13bXkjE/CqDb4CJ+ygF7cfQSPug0suzw/I8LHkz9iUca76Ux rXVlFVQyQA2anm9xtM+QXxUaoXTSZnfBB+Yynon+kLiXKPCiGTP3lH8WnMLirUHqvk/I NV9tvs8wO0iR4WkeziFEWD2xfkBl+5qX/3PPkZHq2B5dUngbFu/Je09dizemmGVelc+i S+iw== X-Gm-Message-State: AOJu0Yw9jc+Jn+lti04JsrJJ6y1WrJmgDf1De5r2hWESBBBMXRHzNb1F STNbrw9ejxyvQhrt0EmjeE5u60o2bQH7YQervq6mKg30x2C7u2d7fFnvgtLQrrQ= X-Google-Smtp-Source: AGHT+IHHauso5gw92N1K625tiIBh5li6TkbAZXQxxn6Vk07CDy0EXyPPBPtOf/csQkc5zctsYe1C1g== X-Received: by 2002:a05:6512:3f09:b0:539:901c:e2e with SMTP id 2adb3069b0e04-53d65e1634fmr1394608e87.58.1730411059664; Thu, 31 Oct 2024 14:44:19 -0700 (PDT) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53c7bc9c162sm339567e87.96.2024.10.31.14.44.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2024 14:44:18 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 31 Oct 2024 23:44:08 +0200 Subject: [PATCH 3/3] drm/msm: drop MAX_BRIDGES define Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241031-dpu-move-topology-v1-3-8ffa8122d3b6@linaro.org> References: <20241031-dpu-move-topology-v1-0-8ffa8122d3b6@linaro.org> In-Reply-To: <20241031-dpu-move-topology-v1-0-8ffa8122d3b6@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=664; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=kwRkgGoOjzZgmKn1Q7SGF0bYYDkMueTmYikFdU7ocIQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnI/opEO4nZnJKudYd5VJNkM81POL5z8Lk8UCtt VL/KX7M452JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZyP6KQAKCRCLPIo+Aiko 1cprB/sEXHm98G7GhObz4/5yVDFNvTe00LSqFqAxgVssZBeqVE1wpljTMyaLDeW8j1/MuMs5aeI qv1qfeR8geOzJDZUsileUt7Hk2uWaLTpYcVAJqY4FCcctOq1LntrRX334wYzenxOFEdrnrGxUMu +Ku9Vmho3rB2mxEeBrI/frE5DtUsoC1sYRFlEAtgWjJ4qdE36JcUm7tr4vugAknz94xD4lNbouz o8kNdVF0pudl7ZZgrso5LFZSc1AqClTnXcMHceeb0mqMC3g2dKkxkBkfgLUJiHyNlMfh+CPIB/e LOfxjc++UkGDLVp0nVea20hvKveOQ4jOjQoue27okFvu/iLh X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The const MAX_BRIDGES is unused after the commit 4d1a1e4686bd ("drm/msm: remove msm_drm_private::bridges field"), drop it now. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_drv.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 1dc161d9bf51..d8c9a1b19263 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -52,7 +52,6 @@ struct msm_gem_vma; struct msm_disp_state; #define MAX_CRTCS 8 -#define MAX_BRIDGES 8 #define FRAC_16_16(mult, div) (((mult) << 16) / (div))