Skip to content

Commit

Permalink
drm/msm: unify MDSS drivers
Browse files Browse the repository at this point in the history
MDP5 and DPU1 both provide the driver handling the MDSS region, which
handles the irq domain and (incase of DPU1) adds some init for the UBWC
controller. Unify those two pieces of code into a common driver.

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/482506/
Link: https://lore.kernel.org/r/20220419155346.1272627-2-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  • Loading branch information
Dmitry Baryshkov committed Apr 25, 2022
1 parent 78f815c commit 87729e2
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 325 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/msm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ msm-y := \
disp/mdp5/mdp5_crtc.o \
disp/mdp5/mdp5_encoder.o \
disp/mdp5/mdp5_irq.o \
disp/mdp5/mdp5_mdss.o \
disp/mdp5/mdp5_kms.o \
disp/mdp5/mdp5_pipe.o \
disp/mdp5/mdp5_mixer.o \
Expand All @@ -67,7 +66,6 @@ msm-y := \
disp/dpu1/dpu_hw_util.o \
disp/dpu1/dpu_hw_vbif.o \
disp/dpu1/dpu_kms.o \
disp/dpu1/dpu_mdss.o \
disp/dpu1/dpu_plane.o \
disp/dpu1/dpu_rm.o \
disp/dpu1/dpu_vbif.o \
Expand All @@ -88,6 +86,7 @@ msm-y := \
msm_gpu_devfreq.o \
msm_io_utils.o \
msm_iommu.o \
msm_mdss.o \
msm_perf.o \
msm_rd.o \
msm_ringbuffer.o \
Expand Down
252 changes: 0 additions & 252 deletions drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c

This file was deleted.

4 changes: 2 additions & 2 deletions drivers/gpu/drm/msm/msm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1252,10 +1252,10 @@ static int msm_pdev_probe(struct platform_device *pdev)

switch (get_mdp_ver(pdev)) {
case KMS_MDP5:
ret = mdp5_mdss_init(pdev);
ret = msm_mdss_init(pdev, true);
break;
case KMS_DPU:
ret = dpu_mdss_init(pdev);
ret = msm_mdss_init(pdev, false);
break;
default:
ret = 0;
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/msm/msm_kms.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@ struct msm_mdss {
const struct msm_mdss_funcs *funcs;
};

int mdp5_mdss_init(struct platform_device *dev);
int dpu_mdss_init(struct platform_device *dev);
int msm_mdss_init(struct platform_device *pdev, bool is_mdp5);

#define for_each_crtc_mask(dev, crtc, crtc_mask) \
drm_for_each_crtc(crtc, dev) \
Expand Down
Loading

0 comments on commit 87729e2

Please sign in to comment.