[Freedreno] [DPU PATCH 1/2] drm/msm: dpu: Remove dpu_format_populate_layout_with_roi()

Sean Paul seanpaul at chromium.org
Thu Jun 21 19:02:38 UTC 2018


It's unused, so let's get rid of it.

Signed-off-by: Sean Paul <seanpaul at chromium.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 31 ---------------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 16 -----------
 2 files changed, 47 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
index deaf4a33b776..12dc6a9d3b25 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
@@ -1124,37 +1124,6 @@ static void _dpu_format_calc_offset_linear(struct dpu_hw_fmt_layout *source,
 	}
 }
 
-int dpu_format_populate_layout_with_roi(
-		struct msm_gem_address_space *aspace,
-		struct drm_framebuffer *fb,
-		struct dpu_rect *roi,
-		struct dpu_hw_fmt_layout *layout)
-{
-	int ret;
-
-	ret = dpu_format_populate_layout(aspace, fb, layout);
-	if (ret || !roi)
-		return ret;
-
-	if (!roi->w || !roi->h || (roi->x + roi->w > fb->width) ||
-			(roi->y + roi->h > fb->height)) {
-		DRM_ERROR("invalid roi=[%d,%d,%d,%d], fb=[%u,%u]\n",
-				roi->x, roi->y, roi->w, roi->h,
-				fb->width, fb->height);
-		ret = -EINVAL;
-	} else if (DPU_FORMAT_IS_LINEAR(layout->format)) {
-		_dpu_format_calc_offset_linear(layout, roi->x, roi->y);
-		layout->width = roi->w;
-		layout->height = roi->h;
-	} else if (roi->x || roi->y || (roi->w != fb->width) ||
-			(roi->h != fb->height)) {
-		DRM_ERROR("non-linear layout with roi not supported\n");
-		ret = -EINVAL;
-	}
-
-	return ret;
-}
-
 int dpu_format_check_modified_format(
 		const struct msm_kms *kms,
 		const struct msm_format *msm_fmt,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h
index 6aa91de93cac..b55bfd13e296 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h
@@ -115,22 +115,6 @@ int dpu_format_populate_layout(
 		struct drm_framebuffer *fb,
 		struct dpu_hw_fmt_layout *fmtl);
 
-/**
- * dpu_format_populate_layout_with_roi - populate the given format layout
- *                     based on mmu, fb, roi, and format found in the fb
- * @aspace:            address space pointer
- * @fb:                framebuffer pointer
- * @roi:               region of interest (optional)
- * @fmtl:              format layout structure to populate
- *
- * Return: error code on failure, 0 on success
- */
-int dpu_format_populate_layout_with_roi(
-		struct msm_gem_address_space *aspace,
-		struct drm_framebuffer *fb,
-		struct dpu_rect *roi,
-		struct dpu_hw_fmt_layout *fmtl);
-
 /**
  * dpu_format_get_framebuffer_size - get framebuffer memory size
  * @format:            DRM pixel format
-- 
Sean Paul, Software Engineer, Google / Chromium OS



More information about the Freedreno mailing list