From patchwork Wed Oct 11 11:59:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13417266 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B60E1CD6E60 for ; Wed, 11 Oct 2023 11:59:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 12FA210E1F0; Wed, 11 Oct 2023 11:59:37 +0000 (UTC) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 15EA410E105 for ; Wed, 11 Oct 2023 11:59:34 +0000 (UTC) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-32d80ae19f8so998053f8f.2 for ; Wed, 11 Oct 2023 04:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697025572; x=1697630372; darn=lists.freedesktop.org; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=2ot7f93Hp27r8qDVUnK9M/4a8sldkjXGML24/ocHHa0=; b=I3b7RMFbuk2Sij+wxsN1reXeMad5jB91HJThHiq7WkMl73Jbwel1JU+MmoL9f4rmWJ kHDAIBfccgeb0huIeDwxzXjFZOlkKUaTqoGxguN3oSQQvt5jylxZAo15A1s1xFv/C/dS 7ctBJdqcYCxIfDBuX4DSFcy7gIRB3QlcmQxuwo5Ay5zFDdfNNoVMI9aTNioqNToZJzOi MGQan8u4YuRh3TyQFdpjkvICQ3QPwk+m/wu2C+PnaVifk1RCuQybNwb8x7JgsjshJOA8 q+uJmuBc4K5/NjSbrpOdO5vD2M+1IGQMlYb5lmxaK011V9G3rDOXDLTNUIErKaBxJFIh KAIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697025572; x=1697630372; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2ot7f93Hp27r8qDVUnK9M/4a8sldkjXGML24/ocHHa0=; b=UMQMz71r4CqUMm6jBDIXdcvML0JRqKGSL6A9ZFQoiAsYp8jKYNNN9ViaThSK5ggzEW 11V2Su4ElgHGUfF4S+OssskEJyYtu67hG1HF3Q6r6ehJ6h7rrxaVbY0F2dfP2L9z20kQ 5cbwyzQ84aqJMtg0iQRtbC0FNKz1qGW6wdT+tycf1+3L4morpi5GfG3+kwH/nNUHyc7r ysZa451CqXi6HEw7lSNqQDQg4gnVMZ7t5r7BF6Jbx2f6GLl07G3aId0dnSWJ/vh0qoJ7 C2CIU7PuKZ/4O6BjdnSg1q/TKHrkqqqEWHJT1TIoWz8UBYqSGsMTbxEzc++NnmkrQvLg YUSA== X-Gm-Message-State: AOJu0YxWdlBgMaji0SmQbGqqyxkCV4sVRrJ6AtJic6xenUPevc2TEkf8 zdwLBRZ6FNQ364XHWKYOCAbMaQ== X-Google-Smtp-Source: AGHT+IFvb4wQ7UoKHHqPU5Z1zSsGTL3s+VszjaFbAitgWa03jJE1oir8cPoJz9cdsQrlfvSOMExq6w== X-Received: by 2002:a5d:456f:0:b0:31a:e744:1297 with SMTP id a15-20020a5d456f000000b0031ae7441297mr18257419wrc.50.1697025572317; Wed, 11 Oct 2023 04:59:32 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id x11-20020adff0cb000000b00323293bd023sm15447805wro.6.2023.10.11.04.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 04:59:31 -0700 (PDT) From: Neil Armstrong Subject: [PATCH v2 0/5] drm/msm/dpu: correctly implement SSPP & WB Clock Control Split Date: Wed, 11 Oct 2023 13:59:20 +0200 Message-Id: <20231011-topic-sm8550-graphics-sspp-split-clk-v2-0-b219c945df53@linaro.org> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIABiOJmUC/5XNQQ6CMBCF4auQrh0ztIDoynsYFrWMMBHbpkOIh nB3Kzdw+b/F+1YllJhEXYpVJVpYOPgc+lAoN1o/EHCfW2nUpkQ8wxwiO5BXW9cIQ7JxZCcgEiN InHgGNz2hMs5oMqd7Y63KVzHRg987c+tyjyxzSJ9dXcrf+iewlIDQYuOwJ6qoMteJvU3hGNKgu m3bvr8cjavZAAAA To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2125; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=joBcCYvrr2YjxuEEXxOdU1twtKRFCTePE37s1QUybRI=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBlJo4g2CKQ7ubfvzj0hhrQwGQnuVMtuiepqig177fs ofm/zTqJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZSaOIAAKCRB33NvayMhJ0bM7EA DHv7nTNQ1a57fU//Fy6d2Uw9rd/ryhaKQTzT/j9Za2XG2zyrMGgW76JxShYe4Euy1nL2U9ATL4vPkg PtTL9315D6Of2aoG0BRxGeW1jLi8ekmJ2kz6tI6rgUZffXIaC8xn/m62ftvlyMKL86dWg4dc4WiICm 79bR7hHRZxa7STbVgumFtU3OT+ctrNeuukEA2VQgA3/EkLrO7lWL2dp1UZP0eNZOOnNjahKx39XpHP podQbv62AncujQEkp9gh2aOmZ+omfOkCTiKNwMWCWpuhCE1XVNGV475xQxLFidB/TRoG6cMnGdNEhK /7b80QP7PMLMGSxBcGbzeMd+YqNUdoT9P6kYSEzD+DcN0CMGWp8bJcE9BQgbOBtIxTSLA03kiZ9fq7 gM6fv6kfIvXtI+rpckps4hFGbvT3DyyRnG2x7rV+JL8hdacIBnTB3LNlte2qCHTYVauK/hGGZxZfwe kS/PrJXZ2BciNIpuRfSWv2Z0uAcBatz5SMiD8CwxsIF2FuaOmfRO9nsMO1BNxm1tHG5IA4jtS1BdBF z1x1qF8GAoMTxzVVkOgU2FCun6l6lRqge08QWpKaZCqj6Zx9LBf4r8/9s4xACDYomuOVmZysvfJZkP oHGszs0ah8hBX9HxEf5SZYR+Pceo3wjY6pliIo/DUVBKW4F6nkyV0yjtBxyg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE 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: , Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Neil Armstrong Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Starting with the SM8550 platform, the SSPP & WB Clock Controls are no more in the MDP TOP registers, but in the SSPP & WB register space. Add the corresponding SSPP & WB ops and use them before/after calling the QoS and OT limit setup functions. Signed-off-by: Neil Armstrong --- Changes in v2: - moved all force_clk_ctrl code out of vbif - use major ver test to add force_clk_ctrl op - do not add clk_ctrl reg into sspp/wb cap struct - add WB2 on sm8550 - Link to v1: https://lore.kernel.org/r/20231009-topic-sm8550-graphics-sspp-split-clk-v1-0-806c0dee4e43@linaro.org --- Neil Armstrong (5): drm/msm/dpu: create a dpu_hw_clk_force_ctrl() helper drm/msm/dpu: add setup_clk_force_ctrl() op to sspp & wb drm/msm/dpu: move setup_force_clk_ctrl handling into plane and wb drm/msm/dpu: sm8550: remove unused VIG and DMA clock controls entries drm/msm/dpu: enable writeback on SM8550 .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 36 +++++++++---------- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 37 +++++++++++++++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 21 +++++++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 12 ++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 23 +----------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 21 +++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 4 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 20 +++++++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h | 7 +++- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 42 +++++++++++++++++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 4 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 30 +++------------- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h | 4 --- 13 files changed, 173 insertions(+), 88 deletions(-) --- base-commit: 9119cf579b4432b36be9d33a92f4331922067d92 change-id: 20231009-topic-sm8550-graphics-sspp-split-clk-43c32e37b6aa Best regards,