[Freedreno] [DPU PATCH v2 2/7] drm/msm/dpu: clean up dpu plane custom properties

Sean Paul seanpaul at chromium.org
Thu Jun 7 20:49:37 UTC 2018


On Tue, Jun 05, 2018 at 08:45:33PM -0700, Jeykumar Sankaran wrote:
> This change removes all the dpu plane custom properties
> and its handlers.
> 
> changs in v2:
> 	- remove stale code in blend config(Sean Paul)
> 	- Makefile changes to remove warning flags(Sean Paul)
> 
> Signed-off-by: Jeykumar Sankaran <jsanka at codeaurora.org>
> ---
>  drivers/gpu/drm/msm/Makefile                       |    8 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_ad4.h            |   99 --
>  .../gpu/drm/msm/disp/dpu1/dpu_color_processing.c   | 1521 --------------------
>  .../gpu/drm/msm/disp/dpu1/dpu_color_processing.h   |  120 --
>  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c           |  205 +--
>  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h           |    3 +-
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c        |    2 -
>  .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c    |    1 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ad4.c         | 1443 -------------------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c     |   72 +-
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h     |   89 --
>  .../msm/disp/dpu1/dpu_hw_color_proc_common_v4.h    |   69 -
>  .../gpu/drm/msm/disp/dpu1/dpu_hw_color_proc_v4.c   |  242 ----
>  .../gpu/drm/msm/disp/dpu1/dpu_hw_color_proc_v4.h   |   40 -
>  .../drm/msm/disp/dpu1/dpu_hw_color_processing.h    |   20 -
>  .../msm/disp/dpu1/dpu_hw_color_processing_v1_7.c   |  565 --------
>  .../msm/disp/dpu1/dpu_hw_color_processing_v1_7.h   |   92 --
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c         |   44 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h         |   15 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c        |  209 ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h        |  220 ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c          |    1 +
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h        |   44 +-
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c    |   68 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h    |    6 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c  |  757 ----------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.h  |   27 -
>  .../msm/disp/dpu1/dpu_hw_reg_dma_v1_color_proc.c   |  943 ------------
>  .../msm/disp/dpu1/dpu_hw_reg_dma_v1_color_proc.h   |   75 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c        |  219 ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h        |   73 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c        |    1 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h        |  156 ++
>  drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c            |    3 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c          | 1269 +---------------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h          |   31 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_reg_dma.c        |  139 --
>  drivers/gpu/drm/msm/disp/dpu1/dpu_reg_dma.h        |  310 ----
>  drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c             |  102 +-
>  drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h             |    2 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_wb.c             |    2 -
>  drivers/gpu/drm/msm/msm_drv.h                      |   28 -
>  include/uapi/drm/dpu_drm.h                         |  187 ---
>  include/uapi/drm/msm_drm.h                         |    1 -
>  44 files changed, 282 insertions(+), 9241 deletions(-)
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_ad4.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_color_processing.c
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_color_processing.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ad4.c
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_color_proc_common_v4.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_color_proc_v4.c
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_color_proc_v4.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_color_processing.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_color_processing_v1_7.c
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_color_processing_v1_7.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1_color_proc.c
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1_color_proc.h
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_reg_dma.c
>  delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_reg_dma.h
> 

/snip

> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_reg_dma.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_reg_dma.c

/snip

> -
> -int dpu_reg_dma_init(void __iomem *addr, struct dpu_mdss_cfg *m,
> -		struct drm_device *dev)
> -{
> -	int rc = 0;
> -
> -	if (!addr || !m || !dev) {
> -		DRM_DEBUG("invalid addr %pK catalog %pK dev %pK\n", addr, m,
> -				dev);
> -		return 0;
> -	}
> -
> -	reg_dma.drm_dev = dev;
> -	reg_dma.caps = &m->dma_cfg;
> -	reg_dma.addr = addr;
> -
> -	if (!m->reg_dma_count)
> -		return 0;
> -
> -	switch (reg_dma.caps->version) {
> -	case 1:
> -		rc = init_v1(&reg_dma);
> -		if (rc)
> -			DRM_DEBUG("init v1 dma ops failed\n");
> -		else
> -			dpu_dbg_reg_register_base("reg_dma", addr,
> -					reg_dma.caps->len);
> -		break;
> -	default:
> -		break;
> -	}
> -
> -	return 0;
> -}
> -

../scripts/Makefile.build:559: recipe for target 'drivers/gpu/drm' failed
../scripts/Makefile.build:559: recipe for target 'drivers/gpu' failed
/usr/local/google/home/seanpaul/s/dpu-staging/Makefile:1060: recipe for target 'drivers' failed
make[1]: Leaving directory '/usr/local/google/home/seanpaul/s/dpu-staging/.build_arm'
Makefile:146: recipe for target 'sub-make' failed
../drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c: In function ‘dpu_crtc_atomic_check’:
../drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c:2097:1: warning: the frame size of 1048 bytes is larger than 1024 bytes [-Wframe-larger-than=]
 }
 ^
../drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c: In function ‘dpu_kms_hw_init’:
../drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c:1512:7: error: implicit declaration of function ‘dpu_reg_dma_init’; did you mean ‘dpu_rm_init’? [-Werror=implicit-function-declaration]
  rc = dpu_reg_dma_init(dpu_kms->reg_dma, dpu_kms->catalog,
       ^~~~~~~~~~~~~~~~
       dpu_rm_init
cc1: some warnings being treated as errors

/snip

-- 
Sean Paul, Software Engineer, Google / Chromium OS


More information about the Freedreno mailing list