From patchwork Fri Mar 10 00:56:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 662496 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CB00C61DA4 for ; Fri, 10 Mar 2023 00:57:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229732AbjCJA5V (ORCPT ); Thu, 9 Mar 2023 19:57:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229601AbjCJA5U (ORCPT ); Thu, 9 Mar 2023 19:57:20 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9814108233 for ; Thu, 9 Mar 2023 16:57:07 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id r27so4588009lfe.10 for ; Thu, 09 Mar 2023 16:57:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678409826; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CXNBgv/8op414iizCH0rh4TOGJ7vEdMfvzdSc2r1T1c=; b=nx/ycAonEUAVdYOGPd8u6RnMS3v3ENtNCLCSwY8ytdVWHTXDZ5owbUqSz6T9mq7YCH 9SW3Zfn2x8RjBte20OOLHld++6vGh4E/LE2niLhoiVHjHTjvuSFpMn8FQ2U1xMwgbSjM VbXb6Uvb20c3tI0VNDQpX+Q8bJXHfg0DQ3CJBvwAh7Z3Y4eL8/19wG5l6q3GMVgLjO7j Gs13gRJcb890shvqHWKThNhA/6U40ZmdLm8p1fDTbrkst2Xj990KtBU0ASzbUdBaFig4 ML5GDK6rn9KVlbiymqpWGgIVjozjNHpyquixSw6iMzQgvyYTAUG4tVYiC6bEhnNyiRxn 3Blg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678409826; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CXNBgv/8op414iizCH0rh4TOGJ7vEdMfvzdSc2r1T1c=; b=mOSfDvS6LexRttYUZOzRkJrajSNcbuGwr3E83VyJOdexmovxG3AWGdHfrOe0e9lFdL v2vy0Ky48N7wnXW+IAK5kSIz8Hu35w6AFVcmbSySU96dKjJ4c75irz12ZvWWQBqqvMgE fS2lt0fbjuVia6hUm76Ph4jLxP4K2fROMy0mhrOQAGm2JF0G4D2bwRDY5BeMVbQg/uLr Rhnd2b7b23SNbbqFuC6OkemPAwx2lvfjtNXKNzUntAn7kT0OngquKrbVvOLJFSVhD6Mm uUYETG+rcHM5W4u0xV5oG0NXOoA8xF2Sma57Ifb5Q1gOJgdW4AHXla0HBxkPQ8AdlzK1 Fahg== X-Gm-Message-State: AO0yUKUyvNv4cR1PCWcM60hdlP0NB5GQf8l1ADnAGlO8WECulgXn5M4D uhPtPic5gRmbibhTkSRcF35ufg== X-Google-Smtp-Source: AK7set8BHBG4JGAhw+8FCyzCZSSM8JyIhuJefCX4JI45/CKh/fCvvn+/3WqOAj3kllZ8TvhlexKjyw== X-Received: by 2002:ac2:5283:0:b0:4de:21c9:8a37 with SMTP id q3-20020ac25283000000b004de21c98a37mr7541874lfm.1.1678409825915; Thu, 09 Mar 2023 16:57:05 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id m13-20020ac2428d000000b004d8540b947asm75280lfh.56.2023.03.09.16.57.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 16:57:05 -0800 (PST) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Cc: Stephen Boyd , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v5 00/32] drm/msm/dpu: wide planes support Date: Fri, 10 Mar 2023 02:56:32 +0200 Message-Id: <20230310005704.1332368-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This patchset brings in multirect usage to support using two SSPP rectangles for a single plane. Full virtual planes support is omitted from this pull request, it will come later. Changes since v4: - Incorporate two fixes and two cleanup patches from Abhinav Changes since v3: - moved if (!pipe->sspp) checks back to the calling site, the caller should know if there is a backing SSPP or not. - Restored state_idx argument of trace_dpu_crtc_setup_mixer trace point - Removed .smart_dma_rev from dpu_caps - Added cleaning of multirect to _dpu_plane_atomic_disable() - Per Abhinavs request split the SmartDMA enablement patch into the "verified by me" and "the rest of the platforms" patches, which is not supposed to be merged in. Users of other platforms are supposed to verify multirect support on their platforms and then send patches enabling SmartDMA for their SoC. - Expanded several commit messages Changes since v2: - Renamed dpu_hw_pipe_cfg to dpu_hw_sspp_cfg - Added a patch to clean up src add / layout for the solid fill planes - Fixed several comments and commit messages which caused confusion - Added documentation for new dpu_plane_state members - Slightly reworked dpu_plane_atomic_check() to make it more logical and obvious. Changes since v1 (which was ages ago): - Rebased on top of 6.2-rc1 - Dropped the controversial _dpu_crtc_blend_setup() split patch - Renamed dpu_hw_pipe to dpu_hw_sspp - Other misc changes Abhinav Kumar (2): drm/msm/dpu: log the multirect_index in _dpu_crtc_blend_setup_pipe drm/msm/dpu: remove unused dpu_plane_validate_multirect_v2 function Dmitry Baryshkov (30): drm/msm/dpu: rename struct dpu_hw_pipe(_cfg) to dpu_hw_sspp(_cfg) drm/msm/dpu: move SSPP allocation to the RM drm/msm/dpu: move SSPP debugfs creation to dpu_kms.c drm/msm/dpu: drop EAGAIN check from dpu_format_populate_layout drm/msm/dpu: move pipe_hw to dpu_plane_state drm/msm/dpu: drop dpu_plane_pipe function drm/msm/dpu: introduce struct dpu_sw_pipe drm/msm/dpu: use dpu_sw_pipe for dpu_hw_sspp callbacks drm/msm/dpu: pass dpu_format to _dpu_hw_sspp_setup_scaler3() drm/msm/dpu: clean up SRC addresses when setting up SSPP for solid fill drm/msm/dpu: move stride programming to dpu_hw_sspp_setup_sourceaddress drm/msm/dpu: remove dpu_hw_fmt_layout from struct dpu_hw_sspp_cfg drm/msm/dpu: rename dpu_hw_sspp_cfg to dpu_sw_pipe_cfg drm/msm/dpu: drop src_split and multirect check from dpu_crtc_atomic_check drm/msm/dpu: don't use unsupported blend stages drm/msm/dpu: move the rest of plane checks to dpu_plane_atomic_check() drm/msm/dpu: drop redundant plane dst check from dpu_crtc_atomic_check() drm/msm/dpu: rewrite plane's QoS-related functions to take dpu_sw_pipe and dpu_format drm/msm/dpu: make _dpu_plane_calc_clk accept mode directly drm/msm/dpu: add dpu_hw_sspp_cfg to dpu_plane_state drm/msm/dpu: simplify dpu_plane_validate_src() drm/msm/dpu: rework dpu_plane_sspp_atomic_update() drm/msm/dpu: rework dpu_plane_atomic_check() drm/msm/dpu: rework plane CSC setting drm/msm/dpu: rework static color fill code drm/msm/dpu: split pipe handling from _dpu_crtc_blend_setup_mixer drm/msm/dpu: add support for wide planes drm/msm/dpu: populate SmartDMA features in hw catalog drm/msm/dpu: enable SmartDMA for the rest of the platforms drm/msm/dpu: drop smart_dma_rev from dpu_caps drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 290 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 10 +- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 23 +- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 169 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 111 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 849 +++++++++--------- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 30 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 22 + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 12 + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 19 +- 12 files changed, 711 insertions(+), 844 deletions(-)