Re: [v2 1/6] drm/i915/skl+: Use plane size for relative data rate calculation

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 01/27/2016 09:39 PM, Shobhit Kumar wrote:
From: "Kumar, Mahesh" <mahesh1.kumar@xxxxxxxxx>

Use plane size for relative data rate calculation. don't always use
pipe source width & height.
adjust height & width according to rotation.
use plane size for watermark calculations also.

v2: Address Matt's comments.
     Use intel_plane_state->visible to avoid divide-by-zero error.
     Where FB was present but not visible so causing total data rate to
     be zero, hence divide-by-zero.


Matt, request you to have a re-look at this series.

Regards
Shobhit

Cc: matthew.d.roper@xxxxxxxxx
Signed-off-by: Kumar, Mahesh <mahesh1.kumar@xxxxxxxxx>
---
  drivers/gpu/drm/i915/intel_pm.c | 42 ++++++++++++++++++++++++++---------------
  1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 20bf854..d55e5d0 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2868,25 +2868,28 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate,
  			     const struct drm_plane_state *pstate,
  			     int y)
  {
-	struct intel_crtc *intel_crtc = to_intel_crtc(cstate->base.crtc);
+	struct intel_plane_state *intel_pstate = to_intel_plane_state(pstate);
  	struct drm_framebuffer *fb = pstate->fb;
+	uint32_t width = 0, height = 0;
+
+	width = drm_rect_width(&intel_pstate->src) >> 16;
+	height = drm_rect_height(&intel_pstate->src) >> 16;
+
+	if (intel_rotation_90_or_270(pstate->rotation))
+		swap(width, height);

  	/* for planar format */
  	if (fb->pixel_format == DRM_FORMAT_NV12) {
  		if (y)  /* y-plane data rate */
-			return intel_crtc->config->pipe_src_w *
-				intel_crtc->config->pipe_src_h *
+			return width * height *
  				drm_format_plane_cpp(fb->pixel_format, 0);
  		else    /* uv-plane data rate */
-			return (intel_crtc->config->pipe_src_w/2) *
-				(intel_crtc->config->pipe_src_h/2) *
+			return (width / 2) * (height / 2) *
  				drm_format_plane_cpp(fb->pixel_format, 1);
  	}

  	/* for packed formats */
-	return intel_crtc->config->pipe_src_w *
-		intel_crtc->config->pipe_src_h *
-		drm_format_plane_cpp(fb->pixel_format, 0);
+	return width * height * drm_format_plane_cpp(fb->pixel_format, 0);
  }

  /*
@@ -2905,9 +2908,8 @@ skl_get_total_relative_data_rate(const struct intel_crtc_state *cstate)
  	for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
  		const struct drm_plane_state *pstate = intel_plane->base.state;

-		if (pstate->fb == NULL)
+		if (!to_intel_plane_state(pstate)->visible)
  			continue;
-
  		if (intel_plane->base.type == DRM_PLANE_TYPE_CURSOR)
  			continue;

@@ -2965,8 +2967,9 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
  		struct drm_framebuffer *fb = plane->state->fb;
  		int id = skl_wm_plane_id(intel_plane);

-		if (fb == NULL)
+		if (!to_intel_plane_state(plane->state)->visible)
  			continue;
+
  		if (plane->type == DRM_PLANE_TYPE_CURSOR)
  			continue;

@@ -2992,7 +2995,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
  		uint16_t plane_blocks, y_plane_blocks = 0;
  		int id = skl_wm_plane_id(intel_plane);

-		if (pstate->fb == NULL)
+		if (!to_intel_plane_state(pstate)->visible)
  			continue;
  		if (plane->type == DRM_PLANE_TYPE_CURSOR)
  			continue;
@@ -3116,28 +3119,37 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
  {
  	struct drm_plane *plane = &intel_plane->base;
  	struct drm_framebuffer *fb = plane->state->fb;
+	struct intel_plane_state *intel_pstate =
+					to_intel_plane_state(plane->state);
  	uint32_t latency = dev_priv->wm.skl_latency[level];
  	uint32_t method1, method2;
  	uint32_t plane_bytes_per_line, plane_blocks_per_line;
  	uint32_t res_blocks, res_lines;
  	uint32_t selected_result;
  	uint8_t bytes_per_pixel;
+	uint32_t width = 0, height = 0;

-	if (latency == 0 || !cstate->base.active || !fb)
+	if (latency == 0 || !cstate->base.active || !intel_pstate->visible)
  		return false;

+	width = drm_rect_width(&intel_pstate->src) >> 16;
+	height = drm_rect_height(&intel_pstate->src) >> 16;
+
+	if (intel_rotation_90_or_270(plane->state->rotation))
+		swap(width, height);
+
  	bytes_per_pixel = drm_format_plane_cpp(fb->pixel_format, 0);
  	method1 = skl_wm_method1(skl_pipe_pixel_rate(cstate),
  				 bytes_per_pixel,
  				 latency);
  	method2 = skl_wm_method2(skl_pipe_pixel_rate(cstate),
  				 cstate->base.adjusted_mode.crtc_htotal,
-				 cstate->pipe_src_w,
+				 width,
  				 bytes_per_pixel,
  				 fb->modifier[0],
  				 latency);

-	plane_bytes_per_line = cstate->pipe_src_w * bytes_per_pixel;
+	plane_bytes_per_line = width * bytes_per_pixel;
  	plane_blocks_per_line = DIV_ROUND_UP(plane_bytes_per_line, 512);

  	if (fb->modifier[0] == I915_FORMAT_MOD_Y_TILED ||

_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux