| Message ID | 1421214054-30393-1-git-send-email-sonika.jindal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 14, 2015 at 11:10:54AM +0530, Sonika Jindal wrote: > Taking rotation into account while checking the plane > and adjusting the sizes accordingly. > > v2: Adding parameter in the callers in the same patch(Matt) > Removing unnecessary code and allowing scaling(Ville) > > Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> > --- ... > EXPORT_SYMBOL(drm_plane_helper_check_update); > @@ -258,7 +293,8 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, > &src, &dest, &clip, > DRM_PLANE_HELPER_NO_SCALING, > DRM_PLANE_HELPER_NO_SCALING, > - false, false, &visible); > + false, false, &visible, > + DRM_ROTATE_0); I think this needs to be BIT(DRM_ROTATE_0)? ... > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index e7ca25b..4813a53 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -551,7 +551,8 @@ static int vop_update_plane_event(struct drm_plane *plane, > &src, &dest, &clip, > DRM_PLANE_HELPER_NO_SCALING, > DRM_PLANE_HELPER_NO_SCALING, > - can_position, false, &visible); > + can_position, false, &visible, > + DRM_ROTATE_0); Same here. Matt
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5579
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 353/353 353/353
ILK 355/355 355/355
SNB 400/422 400/422
IVB -2 487/487 485/487
BYT 296/296 296/296
HSW 486/508 486/508
BDW -1 402/402 401/402
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*IVB igt_kms_cursor_crc_cursor-256x256-offscreen DMESG_WARN(1, M4)PASS(2, M34M21) FAIL(1, M21)
*IVB igt_kms_cursor_crc_cursor-64x64-offscreen DMESG_WARN(1, M4)PASS(2, M34M21) FAIL(1, M21)
*BDW igt_gem_concurrent_blit_gtt-rcs-early-read-interruptible PASS(5, M30M28) DMESG_WARN(1, M30)
Note: You need to pay more attention to line start with '*'
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c index f24c4cf..d6916af 100644 --- a/drivers/gpu/drm/drm_plane_helper.c +++ b/drivers/gpu/drm/drm_plane_helper.c @@ -138,7 +138,8 @@ int drm_plane_helper_check_update(struct drm_plane *plane, int max_scale, bool can_position, bool can_update_disabled, - bool *visible) + bool *visible, + unsigned int rotation) { int hscale, vscale; @@ -158,9 +159,13 @@ int drm_plane_helper_check_update(struct drm_plane *plane, return -EINVAL; } + if (fb) + drm_rect_rotate(src, fb->width << 16, fb->height << 16, + rotation); + /* Check scaling */ - hscale = drm_rect_calc_hscale(src, dest, min_scale, max_scale); - vscale = drm_rect_calc_vscale(src, dest, min_scale, max_scale); + hscale = drm_rect_calc_hscale_relaxed(src, dest, min_scale, max_scale); + vscale = drm_rect_calc_vscale_relaxed(src, dest, min_scale, max_scale); if (hscale < 0 || vscale < 0) { DRM_DEBUG_KMS("Invalid scaling of plane\n"); return -ERANGE; @@ -182,6 +187,36 @@ int drm_plane_helper_check_update(struct drm_plane *plane, return -EINVAL; } + if (*visible) { + /* check again in case clipping clamped the results */ + hscale = drm_rect_calc_hscale(src, dest, min_scale, max_scale); + if (hscale < 0) { + DRM_DEBUG_KMS("Horizontal scaling factor out of limits\n"); + drm_rect_debug_print(src, true); + drm_rect_debug_print(dest, false); + + return hscale; + } + + vscale = drm_rect_calc_vscale(src, dest, min_scale, max_scale); + if (vscale < 0) { + DRM_DEBUG_KMS("Vertical scaling factor out of limits\n"); + drm_rect_debug_print(src, true); + drm_rect_debug_print(dest, false); + + return vscale; + } + + /* Make the source viewport size an exact multiple of the scaling factors. */ + drm_rect_adjust_size(src, + drm_rect_width(dest) * hscale - drm_rect_width(src), + drm_rect_height(dest) * vscale - drm_rect_height(src)); + + drm_rect_rotate_inv(src, fb->width << 16, fb->height << 16, + rotation); + + } + return 0; } EXPORT_SYMBOL(drm_plane_helper_check_update); @@ -258,7 +293,8 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, &src, &dest, &clip, DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, - false, false, &visible); + false, false, &visible, + DRM_ROTATE_0); if (ret) return ret; diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f40288f..d19ed4b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12155,7 +12155,8 @@ intel_check_primary_plane(struct drm_plane *plane, src, dest, clip, DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, - false, true, &state->visible); + false, true, &state->visible, + to_intel_plane(plane)->rotation); if (ret) return ret; @@ -12429,7 +12430,8 @@ intel_check_cursor_plane(struct drm_plane *plane, src, dest, clip, DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, - true, true, &state->visible); + true, true, &state->visible, + to_intel_plane(plane)->rotation); if (ret) return ret; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index e7ca25b..4813a53 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -551,7 +551,8 @@ static int vop_update_plane_event(struct drm_plane *plane, &src, &dest, &clip, DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, - can_position, false, &visible); + can_position, false, &visible, + DRM_ROTATE_0); if (ret) return ret; diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h index a185392..ef9eb04 100644 --- a/include/drm/drm_plane_helper.h +++ b/include/drm/drm_plane_helper.h @@ -84,7 +84,8 @@ extern int drm_plane_helper_check_update(struct drm_plane *plane, int max_scale, bool can_position, bool can_update_disabled, - bool *visible); + bool *visible, + unsigned int rotation); extern int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, struct drm_framebuffer *fb,
Taking rotation into account while checking the plane and adjusting the sizes accordingly. v2: Adding parameter in the callers in the same patch(Matt) Removing unnecessary code and allowing scaling(Ville) Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> --- drivers/gpu/drm/drm_plane_helper.c | 44 ++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 6 ++-- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +- include/drm/drm_plane_helper.h | 3 +- 4 files changed, 48 insertions(+), 8 deletions(-)