From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>, Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Stephen Boyd <swboyd@chromium.org>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Bjorn Andersson <andersson@kernel.org>, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v2 04/27] drm/msm/dpu: move SSPP debugfs creation to dpu_kms.c Date: Thu, 29 Dec 2022 21:18:33 +0200 [thread overview] Message-ID: <20221229191856.3508092-5-dmitry.baryshkov@linaro.org> (raw) In-Reply-To: <20221229191856.3508092-1-dmitry.baryshkov@linaro.org> As SSPP blocks are now visible through dpu_kms->rm.sspp_blocks, move SSPP debugfs creation from dpu_plane to dpu_kms. We are going to break the 1:1 correspondence between planes and SSPPs, so it makes no sense anymore to create SSPP debugfs entries in dpu_plane.c Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 ++++++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 16 ---------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h index 651621b9794f..8c3e9090be4b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h @@ -388,7 +388,6 @@ struct dpu_hw_sspp *dpu_hw_sspp_init(enum dpu_sspp idx, */ void dpu_hw_sspp_destroy(struct dpu_hw_sspp *ctx); -void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root); int _dpu_hw_sspp_init_debugfs(struct dpu_hw_sspp *hw_pipe, struct dpu_kms *kms, struct dentry *entry); #endif /*_DPU_HW_SSPP_H */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index b71199511a52..2dfc4748a0e8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -250,6 +250,24 @@ void dpu_debugfs_create_regset32(const char *name, umode_t mode, debugfs_create_file(name, mode, parent, regset, &dpu_regset32_fops); } +static void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root) +{ + struct dentry *entry = debugfs_create_dir("sspp", debugfs_root); + int i; + + if (IS_ERR(entry)) + return; + + for (i = SSPP_NONE; i < SSPP_MAX; i++) { + struct dpu_hw_sspp *hw = dpu_rm_get_sspp(&dpu_kms->rm, i); + + if (!hw) + continue; + + _dpu_hw_sspp_init_debugfs(hw, dpu_kms, entry); + } +} + static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) { struct dpu_kms *dpu_kms = to_dpu_kms(kms); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index e443799de2c1..cdde7b9ec882 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -1399,22 +1399,6 @@ void dpu_plane_danger_signal_ctrl(struct drm_plane *plane, bool enable) _dpu_plane_set_qos_ctrl(plane, enable, DPU_PLANE_QOS_PANIC_CTRL); pm_runtime_put_sync(&dpu_kms->pdev->dev); } - -/* SSPP live inside dpu_plane private data only. Enumerate them here. */ -void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root) -{ - struct drm_plane *plane; - struct dentry *entry = debugfs_create_dir("sspp", debugfs_root); - - if (IS_ERR(entry)) - return; - - drm_for_each_plane(plane, dpu_kms->dev) { - struct dpu_plane *pdpu = to_dpu_plane(plane); - - _dpu_hw_sspp_init_debugfs(pdpu->pipe_hw, dpu_kms, entry); - } -} #endif static bool dpu_plane_format_mod_supported(struct drm_plane *plane, -- 2.39.0
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>, Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson <andersson@kernel.org>, dri-devel@lists.freedesktop.org, Stephen Boyd <swboyd@chromium.org> Subject: [PATCH v2 04/27] drm/msm/dpu: move SSPP debugfs creation to dpu_kms.c Date: Thu, 29 Dec 2022 21:18:33 +0200 [thread overview] Message-ID: <20221229191856.3508092-5-dmitry.baryshkov@linaro.org> (raw) In-Reply-To: <20221229191856.3508092-1-dmitry.baryshkov@linaro.org> As SSPP blocks are now visible through dpu_kms->rm.sspp_blocks, move SSPP debugfs creation from dpu_plane to dpu_kms. We are going to break the 1:1 correspondence between planes and SSPPs, so it makes no sense anymore to create SSPP debugfs entries in dpu_plane.c Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 ++++++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 16 ---------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h index 651621b9794f..8c3e9090be4b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h @@ -388,7 +388,6 @@ struct dpu_hw_sspp *dpu_hw_sspp_init(enum dpu_sspp idx, */ void dpu_hw_sspp_destroy(struct dpu_hw_sspp *ctx); -void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root); int _dpu_hw_sspp_init_debugfs(struct dpu_hw_sspp *hw_pipe, struct dpu_kms *kms, struct dentry *entry); #endif /*_DPU_HW_SSPP_H */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index b71199511a52..2dfc4748a0e8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -250,6 +250,24 @@ void dpu_debugfs_create_regset32(const char *name, umode_t mode, debugfs_create_file(name, mode, parent, regset, &dpu_regset32_fops); } +static void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root) +{ + struct dentry *entry = debugfs_create_dir("sspp", debugfs_root); + int i; + + if (IS_ERR(entry)) + return; + + for (i = SSPP_NONE; i < SSPP_MAX; i++) { + struct dpu_hw_sspp *hw = dpu_rm_get_sspp(&dpu_kms->rm, i); + + if (!hw) + continue; + + _dpu_hw_sspp_init_debugfs(hw, dpu_kms, entry); + } +} + static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) { struct dpu_kms *dpu_kms = to_dpu_kms(kms); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index e443799de2c1..cdde7b9ec882 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -1399,22 +1399,6 @@ void dpu_plane_danger_signal_ctrl(struct drm_plane *plane, bool enable) _dpu_plane_set_qos_ctrl(plane, enable, DPU_PLANE_QOS_PANIC_CTRL); pm_runtime_put_sync(&dpu_kms->pdev->dev); } - -/* SSPP live inside dpu_plane private data only. Enumerate them here. */ -void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root) -{ - struct drm_plane *plane; - struct dentry *entry = debugfs_create_dir("sspp", debugfs_root); - - if (IS_ERR(entry)) - return; - - drm_for_each_plane(plane, dpu_kms->dev) { - struct dpu_plane *pdpu = to_dpu_plane(plane); - - _dpu_hw_sspp_init_debugfs(pdpu->pipe_hw, dpu_kms, entry); - } -} #endif static bool dpu_plane_format_mod_supported(struct drm_plane *plane, -- 2.39.0
next prev parent reply other threads:[~2022-12-29 19:19 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-12-29 19:18 [PATCH v2 00/27] drm/msm/dpu: wide planes support Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 01/27] drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update() Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2023-01-26 19:26 ` Abhinav Kumar 2023-01-26 19:26 ` Abhinav Kumar 2022-12-29 19:18 ` [PATCH v2 02/27] drm/msm/dpu: rename struct dpu_hw_pipe to dpu_hw_sspp Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2023-01-26 22:55 ` Abhinav Kumar 2023-01-26 22:55 ` Abhinav Kumar 2023-01-31 11:19 ` Dmitry Baryshkov 2023-01-31 11:19 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 03/27] drm/msm/dpu: move SSPP allocation to the RM Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2023-01-26 23:29 ` Abhinav Kumar 2023-01-26 23:29 ` Abhinav Kumar 2023-01-27 5:56 ` Dmitry Baryshkov 2023-01-27 5:56 ` Dmitry Baryshkov 2023-01-27 22:59 ` Abhinav Kumar 2023-01-27 22:59 ` Abhinav Kumar 2022-12-29 19:18 ` Dmitry Baryshkov [this message] 2022-12-29 19:18 ` [PATCH v2 04/27] drm/msm/dpu: move SSPP debugfs creation to dpu_kms.c Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 05/27] drm/msm/dpu: drop EAGAIN check from dpu_format_populate_layout Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2023-01-27 0:52 ` Abhinav Kumar 2023-01-27 0:52 ` Abhinav Kumar 2023-01-27 6:05 ` Dmitry Baryshkov 2023-01-27 6:05 ` Dmitry Baryshkov 2023-01-27 23:59 ` Abhinav Kumar 2023-01-27 23:59 ` Abhinav Kumar 2023-02-03 14:16 ` Dmitry Baryshkov 2023-02-03 14:16 ` Dmitry Baryshkov 2023-02-03 17:32 ` Abhinav Kumar 2023-02-03 17:32 ` Abhinav Kumar 2022-12-29 19:18 ` [PATCH v2 06/27] drm/msm/dpu: move pipe_hw to dpu_plane_state Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2023-01-30 21:51 ` Abhinav Kumar 2023-01-30 21:51 ` Abhinav Kumar 2023-01-31 11:51 ` Dmitry Baryshkov 2023-01-31 11:51 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 07/27] drm/msm/dpu: drop dpu_plane_pipe function Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 08/27] drm/msm/dpu: introduce struct dpu_sw_pipe Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 09/27] drm/msm/dpu: use dpu_sw_pipe for dpu_hw_sspp callbacks Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 10/27] drm/msm/dpu: pass dpu_format to _dpu_hw_sspp_setup_scaler3() Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2023-01-31 5:13 ` Abhinav Kumar 2023-01-31 5:13 ` Abhinav Kumar 2023-01-31 12:10 ` Dmitry Baryshkov 2023-01-31 12:10 ` Dmitry Baryshkov 2023-01-31 12:15 ` Dmitry Baryshkov 2023-01-31 12:15 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 11/27] drm/msm/dpu: move stride programming to dpu_hw_sspp_setup_sourceaddress Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2023-02-02 18:41 ` Abhinav Kumar 2023-02-02 18:41 ` Abhinav Kumar 2023-02-02 18:55 ` Dmitry Baryshkov 2023-02-02 18:55 ` Dmitry Baryshkov 2023-02-02 19:15 ` Abhinav Kumar 2023-02-02 19:15 ` Abhinav Kumar 2023-02-03 14:12 ` Dmitry Baryshkov 2023-02-03 14:12 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 12/27] drm/msm/dpu: remove dpu_hw_fmt_layout from struct dpu_hw_pipe_cfg Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2023-02-02 19:38 ` Abhinav Kumar 2023-02-02 19:38 ` Abhinav Kumar 2023-02-02 19:45 ` Dmitry Baryshkov 2023-02-02 19:45 ` Dmitry Baryshkov 2023-02-02 19:54 ` Abhinav Kumar 2023-02-02 19:54 ` Abhinav Kumar 2023-02-02 20:10 ` Dmitry Baryshkov 2023-02-02 20:10 ` Dmitry Baryshkov 2023-02-02 20:14 ` Abhinav Kumar 2023-02-02 20:14 ` Abhinav Kumar 2023-02-03 14:09 ` Dmitry Baryshkov 2023-02-03 14:09 ` Dmitry Baryshkov 2023-02-03 17:47 ` Abhinav Kumar 2023-02-03 17:47 ` Abhinav Kumar 2022-12-29 19:18 ` [PATCH v2 13/27] drm/msm/dpu: drop src_split and multirect check from dpu_crtc_atomic_check Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 14/27] drm/msm/dpu: don't use unsupported blend stages Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 15/27] drm/msm/dpu: move the rest of plane checks to dpu_plane_atomic_check() Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 16/27] drm/msm/dpu: drop redundant plane dst check from dpu_crtc_atomic_check() Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 17/27] drm/msm/dpu: add dpu_hw_pipe_cfg to dpu_plane_state Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 18/27] drm/msm/dpu: simplify dpu_plane_validate_src() Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 19/27] drm/msm/dpu: rewrite plane's QoS-related functions to take dpu_sw_pipe and dpu_format Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 20/27] drm/msm/dpu: populate SmartDMA features in hw catalog Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 21/27] drm/msm/dpu: make _dpu_plane_calc_clk accept mode directly Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 22/27] drm/msm/dpu: rework dpu_plane_sspp_atomic_update() Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 23/27] drm/msm/dpu: rework dpu_plane_atomic_check() Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 24/27] drm/msm/dpu: rework plane CSC setting Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 25/27] drm/msm/dpu: rework static color fill code Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 26/27] drm/msm/dpu: split pipe handling from _dpu_crtc_blend_setup_mixer Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov 2022-12-29 19:18 ` [PATCH v2 27/27] drm/msm/dpu: add support for wide planes Dmitry Baryshkov 2022-12-29 19:18 ` Dmitry Baryshkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221229191856.3508092-5-dmitry.baryshkov@linaro.org \ --to=dmitry.baryshkov@linaro.org \ --cc=airlied@gmail.com \ --cc=andersson@kernel.org \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=quic_abhinavk@quicinc.com \ --cc=robdclark@gmail.com \ --cc=sean@poorly.run \ --cc=swboyd@chromium.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.