From patchwork Fri Jan 21 21:06:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 533830 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp1054631imr; Fri, 21 Jan 2022 13:06:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJw7IU4G65gArSF80aIe8Z2zqled9mhgRBRyPhZ5L527SWw/IF4nRVh9D4ttU1cxQc8Heq7U X-Received: by 2002:a17:902:bb87:b0:148:a2e8:2798 with SMTP id m7-20020a170902bb8700b00148a2e82798mr5051129pls.159.1642799186345; Fri, 21 Jan 2022 13:06:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642799186; cv=none; d=google.com; s=arc-20160816; b=Tk4ZeHoEWBYcRI2MpnjoQ7Z1s2mLzemLJ0MYHs6I0UTKQviocpShAtsyNG1bnPmwba 93napjEVBbz0WjI78hs7/ikwzUJDeFlp3md7lho/uAoUcAFaUlzZDDv6quMwnPwPUMpY r2VK1D9H3QThpKsFUGVKpqnVCAEUDFXIKGSbVDhyyeK6G9HqRrIm2I2shCseAYcRalSs s2ctv0Gadi/TRIZfHc0ZfJF+XDWvcS48MmmrH7a6qZ0kEYg14xlLGHzvykIhZrOA49S4 dr0o1wyhD2QREZqswxCokzMJsGRMlQjGZAQEiRLlp9N9ruOfoJd9mlBiN69ENsgJthbu at5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :delivered-to; bh=0vJ8DhwvnCQdnTeYuE3CkWRZJOO1ip2uJNFoaTJPamw=; b=d0Gk5wsZhdO2HRgrpft9ml2JXmlRDowfzoB+JUp7GuaMlSeK+4abaK6/DfURjAtpTX rB1oIIpZDojVr1hWswvTw9kHkOd7q1lPys//kQLK7V9EoJvR2F3bvUzPnEpUSq1dmQ5P brU4t4oEeH+khe+p9Q2kIKU76VLGTKZLsz29y5wpNl2uLbHJbzh2Oelz8ZnfVIB288nu V19wWjDbx7ibhsHN71VI5g2ojprE2YxHnRy/z3SZ0M9hNefLFFxeMlEbm/vS4iJ/TDVt N2KRdGDgsuT4aJ1DmR8kltD0vKjRT8CO55jX++CekA6AYwrDeufD6JmfVeJXu+DdLSf9 8KfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rtY6myzx; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id d36si6758238pgm.703.2022.01.21.13.06.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:06:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rtY6myzx; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 35F4410E647; Fri, 21 Jan 2022 21:06:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDC3410E69A for ; Fri, 21 Jan 2022 21:06:21 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id m3so36592046lfu.0 for ; Fri, 21 Jan 2022 13:06:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0vJ8DhwvnCQdnTeYuE3CkWRZJOO1ip2uJNFoaTJPamw=; b=rtY6myzx7rzb+2+xk/btRkYOxuVjnX/xNvgZHq4099bqiiGiiF3worWSzctzRLrHSh xan4nUgoHFhnpKtmeqC/5lPJNPFdrDJVAL0gW182Ccy7xGvaA33xIg2xrRTzA7Gzxyy8 3x/eJODRgjvZpcP0AeqzmFw56uouUWtxeR93sxLLleYHds4pyWjgyT9ruygbdOPcIC25 iizrN3zHKw77Sr/Cb64at+NdiW2U0A6GgN+qFXSKgR1rBlUg4qRe/EVdzOCULABzX3Si iYhHoJHrVjyGwdHQbOAT7oONNM29pY+Prncp9mIQDJGHYPZh8oIsfPf3hANiUZC3UUeS 0D0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0vJ8DhwvnCQdnTeYuE3CkWRZJOO1ip2uJNFoaTJPamw=; b=gmdXpoBXc/nxilOmBd0vSfb68FIfWF2XWCFVZafAiyQOizv9H1XaGjUUnsrcXBjMYG CLY+QvbdGLjoUxV5crvvSHsr1fHUIoptK06ZCpgdeqkmfhqWiFrDxs5wg2Vv40/KNR+u vI3NRib4sVb9gYg5WxwP0AWCaBSIhtyhrgFyUF6odJQTWio8pcIRIwCcSV+T7rY/rvKZ jfiSdRjlpH2KjmFQ05YMijePZr5QrgyQ3RtgwJTRbN6VKPq34o1EghFlw3r20m37alHX 58adVh+O0+9T/Z0Lzk66QZTA69LBV3HDQrrU6C03rhwQeYUs7MEO0Qi9ru+xDCNJONPJ B8eA== X-Gm-Message-State: AOAM5310kl2xmgL7KmO+cqKXPHu2U9Nat2tDEZly5A4MdYJyQ2lGvjhL HaXxPmbFtaFwpYNEG125t3ywPw== X-Received: by 2002:a05:6512:c2a:: with SMTP id z42mr4974720lfu.329.1642799180056; Fri, 21 Jan 2022 13:06:20 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id v10sm279125ljk.44.2022.01.21.13.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:06:19 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH v5 0/6] drm/msm/dpu: simplify RM code Date: Sat, 22 Jan 2022 00:06:12 +0300 Message-Id: <20220121210618.3482550-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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: David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Stephen Boyd , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" INTF blocks are not really handled by resource manager, they are assigned at dpu_encoder_setup_display using dpu_encoder_get_intf(). Then this allocation is passed to RM and then returned to then dpu_encoder. So allocate them outside of RM and use them directly. While we are at it, drop the lm_max_width from the RM and simplify VBIF handling (move creation/destruction to the RM too). Once this and SSPP handling patches are merged, the RM would handle lifetime of all dpu_hw_* objects. Changes since v4: - Changes IS_ERR_OR_NULL() to IS_ERR() in dpu_rm_init() - Removed if(!null) conditions when calling dpu_hw_intf_destroy() and dpu_hw_vbif_destroy() Changes since v3: - Add missing DSPP blocks teardown - Remove dpu_hw_blk from dpu_hw_intf - move dpu_hw_vbif creation/destruction to the RM Changes since v2: - Dropped DSPP, PP and MERGE_3D patches for now. Changes since v1: - Split into separate patch series to ease review. Dmitry Baryshkov (6): drm/msm/dpu: drop unused lm_max_width from RM drm/msm/dpu: add DSPP blocks teardown drm/msm/dpu: get INTF blocks directly rather than through RM drm/msm/dpu: stop embedding dpu_hw_blk into dpu_hw_intf drm/msm/dpu: fix error handling in dpu_rm_init drm/msm/dpu: move VBIF blocks handling to dpu_rm drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 36 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 16 --- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 5 - .../drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 8 -- .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 11 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 28 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 126 +++++------------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 31 ++++- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 26 +--- 12 files changed, 73 insertions(+), 225 deletions(-)