[PATCH 09/36] drm/rect: Return scaling factor and error code separately
Ville Syrjala
ville.syrjala at linux.intel.com
Wed Dec 18 16:10:26 UTC 2019
From: Ville Syrjälä <ville.syrjala at linux.intel.com>
We may want to dump out the calculated scaling factor(s) when
they exceed the limits. To achieve that we need to return the
error code and scaling factor separately.
Side note: the code in dpu_plane_validate_multirect_v2()
looks rather dubious on account of it not using fixed point
numbers. Not sure the rounding behaviour we have really
satisfies what it's trying to do. Maybe it should just do
(src_w!=dst_w || src_h!=dst_h) ?
v2: Fix kernel docs for vscale
Cc: Jeykumar Sankaran <jsanka at codeaurora.org>
Suggested-by: Sean Paul <sean at poorly.run>
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
drivers/gpu/drm/drm_atomic_helper.c | 8 ++---
drivers/gpu/drm/drm_rect.c | 34 ++++++++++++--------
drivers/gpu/drm/i915/display/intel_display.c | 4 +--
drivers/gpu/drm/i915/display/intel_sprite.c | 18 +++++------
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 +++--
include/drm/drm_rect.h | 6 ++--
6 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index bcc9ca240638..82f487de3a32 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -771,7 +771,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
struct drm_rect *dst = &plane_state->dst;
unsigned int rotation = plane_state->rotation;
struct drm_rect clip = {};
- int hscale, vscale;
+ int hscale, vscale, ret;
WARN_ON(plane_state->crtc && plane_state->crtc != crtc_state->crtc);
@@ -797,9 +797,9 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
drm_rect_rotate(src, fb->width << 16, fb->height << 16, rotation);
/* Check scaling */
- hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale);
- vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale);
- if (hscale < 0 || vscale < 0) {
+ ret = drm_rect_calc_hscale(src, dst, min_scale, max_scale, &hscale);
+ ret |= drm_rect_calc_vscale(src, dst, min_scale, max_scale, &vscale);
+ if (ret) {
DRM_DEBUG_KMS("Invalid scaling of plane\n");
drm_rect_debug_print("src: ", &plane_state->src, true);
drm_rect_debug_print("dst: ", &plane_state->dst, false);
diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
index 0460e874896e..f983d52717e0 100644
--- a/drivers/gpu/drm/drm_rect.c
+++ b/drivers/gpu/drm/drm_rect.c
@@ -155,6 +155,7 @@ static int drm_calc_scale(int src, int dst)
* @dst: destination window rectangle
* @min_hscale: minimum allowed horizontal scaling factor
* @max_hscale: maximum allowed horizontal scaling factor
+ * @hscale: calculated horizontal scaling factor
*
* Calculate the horizontal scaling factor as
* (@src width) / (@dst width).
@@ -164,23 +165,25 @@ static int drm_calc_scale(int src, int dst)
* pessimistic limit calculation.
*
* RETURNS:
- * The horizontal scaling factor, or errno of out of limits.
+ * Zero on success, or errno on out of limits.
*/
int drm_rect_calc_hscale(const struct drm_rect *src,
const struct drm_rect *dst,
- int min_hscale, int max_hscale)
+ int min_hscale, int max_hscale,
+ int *hscale)
{
int src_w = drm_rect_width(src);
int dst_w = drm_rect_width(dst);
- int hscale = drm_calc_scale(src_w, dst_w);
- if (hscale < 0 || dst_w == 0)
- return hscale;
+ *hscale = drm_calc_scale(src_w, dst_w);
- if (hscale < min_hscale || hscale > max_hscale)
+ if (*hscale < 0 || dst_w == 0)
+ return *hscale;
+
+ if (*hscale < min_hscale || *hscale > max_hscale)
return -ERANGE;
- return hscale;
+ return 0;
}
EXPORT_SYMBOL(drm_rect_calc_hscale);
@@ -190,6 +193,7 @@ EXPORT_SYMBOL(drm_rect_calc_hscale);
* @dst: destination window rectangle
* @min_vscale: minimum allowed vertical scaling factor
* @max_vscale: maximum allowed vertical scaling factor
+ * @vscale: calculated vertical scaling factor
*
* Calculate the vertical scaling factor as
* (@src height) / (@dst height).
@@ -199,23 +203,25 @@ EXPORT_SYMBOL(drm_rect_calc_hscale);
* pessimistic limit calculation.
*
* RETURNS:
- * The vertical scaling factor, or errno of out of limits.
+ * Zero on success, or errno on out of limits.
*/
int drm_rect_calc_vscale(const struct drm_rect *src,
const struct drm_rect *dst,
- int min_vscale, int max_vscale)
+ int min_vscale, int max_vscale,
+ int *vscale)
{
int src_h = drm_rect_height(src);
int dst_h = drm_rect_height(dst);
- int vscale = drm_calc_scale(src_h, dst_h);
- if (vscale < 0 || dst_h == 0)
- return vscale;
+ *vscale = drm_calc_scale(src_h, dst_h);
+
+ if (*vscale < 0 || dst_h == 0)
+ return *vscale;
- if (vscale < min_vscale || vscale > max_vscale)
+ if (*vscale < min_vscale || *vscale > max_vscale)
return -ERANGE;
- return vscale;
+ return 0;
}
EXPORT_SYMBOL(drm_rect_calc_vscale);
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index fb27cd336a64..04d37184a9aa 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5782,8 +5782,8 @@ static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state)
if (WARN_ON(crtc_state->scaler_state.scaler_id < 0))
return;
- hscale = drm_rect_calc_hscale(&src, dst, 0, INT_MAX);
- vscale = drm_rect_calc_vscale(&src, dst, 0, INT_MAX);
+ drm_rect_calc_hscale(&src, dst, 0, INT_MAX, &hscale);
+ drm_rect_calc_vscale(&src, dst, 0, INT_MAX, &vscale);
uv_rgb_hphase = skl_scaler_calc_phase(1, hscale, false);
uv_rgb_vphase = skl_scaler_calc_phase(1, vscale, false);
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index 8394502b092d..909b196be8e4 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -409,12 +409,12 @@ skl_program_scaler(struct intel_plane *plane,
u16 y_vphase, uv_rgb_vphase;
int hscale, vscale;
- hscale = drm_rect_calc_hscale(&plane_state->uapi.src,
- &plane_state->uapi.dst,
- 0, INT_MAX);
- vscale = drm_rect_calc_vscale(&plane_state->uapi.src,
- &plane_state->uapi.dst,
- 0, INT_MAX);
+ drm_rect_calc_hscale(&plane_state->uapi.src,
+ &plane_state->uapi.dst,
+ 0, INT_MAX, &hscale);
+ drm_rect_calc_vscale(&plane_state->uapi.src,
+ &plane_state->uapi.dst,
+ 0, INT_MAX, &vscale);
/* TODO: handle sub-pixel coordinates */
if (drm_format_info_is_yuv_semiplanar(fb->format) &&
@@ -1566,9 +1566,9 @@ static int g4x_sprite_min_cdclk(const struct intel_crtc_state *crtc_state,
pixel_rate = crtc_state->pixel_rate;
/* Horizontal downscaling limits the maximum pixel rate */
- hscale = drm_rect_calc_hscale(&plane_state->uapi.src,
- &plane_state->uapi.dst,
- 0, INT_MAX);
+ drm_rect_calc_hscale(&plane_state->uapi.src,
+ &plane_state->uapi.dst,
+ 0, INT_MAX, &hscale);
if (hscale < 0x10000)
return pixel_rate;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 58d5acbcfc5c..528242052118 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -658,7 +658,7 @@ int dpu_plane_validate_multirect_v2(struct dpu_multirect_plane_states *plane)
}
for (i = 0; i < R_MAX; i++) {
- int width_threshold;
+ int width_threshold, ret, hscale, vscale;
pstate[i] = to_dpu_plane_state(drm_state[i]);
dpu_plane[i] = to_dpu_plane(drm_state[i]->plane);
@@ -676,8 +676,10 @@ int dpu_plane_validate_multirect_v2(struct dpu_multirect_plane_states *plane)
dst[i] = drm_plane_state_dest(drm_state[i]);
- if (drm_rect_calc_hscale(&src[i], &dst[i], 1, 1) != 1 ||
- drm_rect_calc_vscale(&src[i], &dst[i], 1, 1) != 1) {
+ ret = drm_rect_calc_hscale(&src[i], &dst[i], 1, 1, &hscale);
+ ret |= drm_rect_calc_vscale(&src[i], &dst[i], 1, 1, &vscale);
+
+ if (ret || hscale != 1 || vscale != 1) {
DPU_ERROR_PLANE(dpu_plane[i],
"scaling is not supported in multirect mode\n");
return -EINVAL;
diff --git a/include/drm/drm_rect.h b/include/drm/drm_rect.h
index 57a3be9e53e4..f774b97f6792 100644
--- a/include/drm/drm_rect.h
+++ b/include/drm/drm_rect.h
@@ -211,10 +211,12 @@ bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
const struct drm_rect *clip);
int drm_rect_calc_hscale(const struct drm_rect *src,
const struct drm_rect *dst,
- int min_hscale, int max_hscale);
+ int min_hscale, int max_hscale,
+ int *hscale);
int drm_rect_calc_vscale(const struct drm_rect *src,
const struct drm_rect *dst,
- int min_vscale, int max_vscale);
+ int min_vscale, int max_vscale,
+ int *vscale);
void drm_rect_debug_print(const char *prefix,
const struct drm_rect *r, bool fixed_point);
void drm_rect_rotate(struct drm_rect *r,
--
2.23.0
More information about the Intel-gfx-trybot
mailing list