mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 02:24:24 +02:00
drm/msm/dpu: get rid of DPU_MDP_VSYNC_SEL
Continue migration to the MDSS-revision based checks and replace DPU_MDP_VSYNC_SEL feature bit with the core_major_ver < 5 check. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Patchwork: https://patchwork.freedesktop.org/patch/655395/ Link: https://lore.kernel.org/r/20250522-dpu-drop-features-v5-18-3b2085a07884@oss.qualcomm.com
This commit is contained in:
parent
5ef71e181c
commit
a48871823a
|
|
@ -19,7 +19,6 @@ static const struct dpu_mdp_cfg msm8937_mdp[] = {
|
|||
{
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x454,
|
||||
.features = BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls = {
|
||||
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
[DPU_CLK_CTRL_RGB0] = { .reg_off = 0x2ac, .bit_off = 4 },
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ static const struct dpu_mdp_cfg msm8917_mdp[] = {
|
|||
{
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x454,
|
||||
.features = BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls = {
|
||||
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
[DPU_CLK_CTRL_RGB0] = { .reg_off = 0x2ac, .bit_off = 4 },
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ static const struct dpu_mdp_cfg msm8953_mdp[] = {
|
|||
{
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x454,
|
||||
.features = BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls = {
|
||||
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
[DPU_CLK_CTRL_RGB0] = { .reg_off = 0x2ac, .bit_off = 4 },
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ static const struct dpu_mdp_cfg msm8996_mdp[] = {
|
|||
{
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x454,
|
||||
.features = BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls = {
|
||||
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
[DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 },
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ static const struct dpu_caps msm8998_dpu_caps = {
|
|||
static const struct dpu_mdp_cfg msm8998_mdp = {
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x458,
|
||||
.features = BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls = {
|
||||
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
[DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 },
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ static const struct dpu_caps sdm660_dpu_caps = {
|
|||
static const struct dpu_mdp_cfg sdm660_mdp = {
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x458,
|
||||
.features = BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls = {
|
||||
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
[DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 },
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ static const struct dpu_caps sdm630_dpu_caps = {
|
|||
static const struct dpu_mdp_cfg sdm630_mdp = {
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x458,
|
||||
.features = BIT(DPU_MDP_VSYNC_SEL),
|
||||
.clk_ctrls = {
|
||||
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
[DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2ac, .bit_off = 8 },
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ static const struct dpu_caps sdm845_dpu_caps = {
|
|||
static const struct dpu_mdp_cfg sdm845_mdp = {
|
||||
.name = "top_0",
|
||||
.base = 0x0, .len = 0x45c,
|
||||
.features = BIT(DPU_MDP_AUDIO_SELECT) | BIT(DPU_MDP_VSYNC_SEL),
|
||||
.features = BIT(DPU_MDP_AUDIO_SELECT),
|
||||
.clk_ctrls = {
|
||||
[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
|
||||
[DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 },
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@
|
|||
* @DPU_MDP_10BIT_SUPPORT, Chipset supports 10 bit pixel formats
|
||||
* @DPU_MDP_PERIPH_0_REMOVED Indicates that access to periph top0 block results
|
||||
* in a failure
|
||||
* @DPU_MDP_VSYNC_SEL Enables vsync source selection via MDP_VSYNC_SEL register
|
||||
* (moved into INTF block since DPU 5.0.0)
|
||||
* @DPU_MDP_MAX Maximum value
|
||||
|
||||
*/
|
||||
|
|
@ -44,7 +42,6 @@ enum {
|
|||
DPU_MDP_10BIT_SUPPORT,
|
||||
DPU_MDP_AUDIO_SELECT,
|
||||
DPU_MDP_PERIPH_0_REMOVED,
|
||||
DPU_MDP_VSYNC_SEL,
|
||||
DPU_MDP_MAX
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ static void _setup_mdp_ops(struct dpu_hw_mdp_ops *ops,
|
|||
ops->setup_clk_force_ctrl = dpu_hw_setup_clk_force_ctrl;
|
||||
ops->get_danger_status = dpu_hw_get_danger_status;
|
||||
|
||||
if (cap & BIT(DPU_MDP_VSYNC_SEL))
|
||||
if (mdss_rev->core_major_ver < 5)
|
||||
ops->setup_vsync_source = dpu_hw_setup_vsync_sel;
|
||||
else if (!(cap & BIT(DPU_MDP_PERIPH_0_REMOVED)))
|
||||
ops->setup_vsync_source = dpu_hw_setup_wd_timer;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user