mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/atomic-helper: Remove _HELPER_ infix from DRM_PLANE_HELPER_NO_SCALING

Browse source 
Rename DRM_PLANE_HELPER_NO_SCALING to DRM_PLANE_NO_SCALING. The constant
is not really a helper, but rather a characteristic of the plane itself.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220720083058.15371-4-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2022-07-20 10:30:54 +02:00
parent 382fc1f681
commit cce32e4e38
33 changed files with 90 additions and 90 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
View file

@ -282,8 +282,8 @@ static int amdgpu_vkms_plane_atomic_check(struct drm_plane *plane,
return PTR_ERR(crtc_state); return PTR_ERR(crtc_state);
ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
if (ret != 0) if (ret != 0)
return ret; return ret;

4
drivers/gpu/drm/arm/hdlcd_crtc.c
View file

@ -251,8 +251,8 @@ static int hdlcd_plane_atomic_check(struct drm_plane *plane,
return -EINVAL; return -EINVAL;
return drm_atomic_helper_check_plane_state(new_plane_state, return drm_atomic_helper_check_plane_state(new_plane_state,
crtc_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
} }

8
drivers/gpu/drm/ast/ast_mode.c
View file

@ -554,8 +554,8 @@ static int ast_primary_plane_helper_atomic_check(struct drm_plane *plane,
new_plane_state->crtc); new_plane_state->crtc);
ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
if (ret) if (ret)
return ret; return ret;
@ -778,8 +778,8 @@ static int ast_cursor_plane_helper_atomic_check(struct drm_plane *plane,
new_plane_state->crtc); new_plane_state->crtc);
ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/drm_plane_helper.c
View file

@ -179,8 +179,8 @@ static int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *c
ret = drm_plane_helper_check_update(plane, crtc, fb, ret = drm_plane_helper_check_update(plane, crtc, fb,
&src, &dest, &src, &dest,
DRM_MODE_ROTATE_0, DRM_MODE_ROTATE_0,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false, &visible); false, false, &visible);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/drm_simple_kms_helper.c
View file

@ -222,8 +222,8 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
&pipe->crtc); &pipe->crtc);
ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state, ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false); false, false);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/i915/display/i9xx_plane.c
View file

@ -325,8 +325,8 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state,
return ret; return ret;
ret = intel_atomic_plane_check_clipping(plane_state, crtc_state, ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
i9xx_plane_has_windowing(plane)); i9xx_plane_has_windowing(plane));
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/i915/display/intel_cursor.c
View file

@ -143,8 +143,8 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
} }
ret = intel_atomic_plane_check_clipping(plane_state, crtc_state, ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true); true);
if (ret) if (ret)
return ret; return ret;

8
drivers/gpu/drm/i915/display/intel_sprite.c
View file

@ -1354,8 +1354,8 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,
{ {
struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane); struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
struct drm_i915_private *dev_priv = to_i915(plane->base.dev); struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
int min_scale = DRM_PLANE_HELPER_NO_SCALING; int min_scale = DRM_PLANE_NO_SCALING;
int max_scale = DRM_PLANE_HELPER_NO_SCALING; int max_scale = DRM_PLANE_NO_SCALING;
int ret; int ret;
if (g4x_fb_scalable(plane_state->hw.fb)) { if (g4x_fb_scalable(plane_state->hw.fb)) {
@ -1425,8 +1425,8 @@ vlv_sprite_check(struct intel_crtc_state *crtc_state,
return ret; return ret;
ret = intel_atomic_plane_check_clipping(plane_state, crtc_state, ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true); true);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/i915/display/skl_universal_plane.c
View file

@ -1855,8 +1855,8 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane); struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
struct drm_i915_private *dev_priv = to_i915(plane->base.dev); struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
const struct drm_framebuffer *fb = plane_state->hw.fb; const struct drm_framebuffer *fb = plane_state->hw.fb;
int min_scale = DRM_PLANE_HELPER_NO_SCALING; int min_scale = DRM_PLANE_NO_SCALING;
int max_scale = DRM_PLANE_HELPER_NO_SCALING; int max_scale = DRM_PLANE_NO_SCALING;
int ret; int ret;
ret = skl_plane_check_fb(crtc_state, plane_state); ret = skl_plane_check_fb(crtc_state, plane_state);

4
drivers/gpu/drm/imx/ipuv3-plane.c
View file

@ -392,8 +392,8 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,
return -EINVAL; return -EINVAL;
ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
can_position, true); can_position, true);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/ingenic/ingenic-drm-drv.c
View file

@ -481,8 +481,8 @@ static int ingenic_drm_plane_atomic_check(struct drm_plane *plane,
return PTR_ERR(priv_state); return PTR_ERR(priv_state);
ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
priv->soc_info->has_osd, priv->soc_info->has_osd,
true); true);
if (ret) if (ret)

4
drivers/gpu/drm/kmb/kmb_plane.c
View file

@ -135,8 +135,8 @@ static int kmb_plane_atomic_check(struct drm_plane *plane,
new_plane_state->crtc); new_plane_state->crtc);
return drm_atomic_helper_check_plane_state(new_plane_state, return drm_atomic_helper_check_plane_state(new_plane_state,
crtc_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
can_position, true); can_position, true);
} }

4
drivers/gpu/drm/logicvc/logicvc_layer.c
View file

@ -116,8 +116,8 @@ static int logicvc_plane_atomic_check(struct drm_plane *drm_plane,
} }
} }
min_scale = DRM_PLANE_HELPER_NO_SCALING; min_scale = DRM_PLANE_NO_SCALING;
max_scale = DRM_PLANE_HELPER_NO_SCALING; max_scale = DRM_PLANE_NO_SCALING;
can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY && can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY &&
layer->index != (logicvc->config.layers_count - 1) && layer->index != (logicvc->config.layers_count - 1) &&

8
drivers/gpu/drm/mediatek/mtk_drm_plane.c
View file

@ -107,8 +107,8 @@ static int mtk_plane_atomic_async_check(struct drm_plane *plane,
crtc_state = new_plane_state->crtc->state; crtc_state = new_plane_state->crtc->state;
return drm_atomic_helper_check_plane_state(plane->state, crtc_state, return drm_atomic_helper_check_plane_state(plane->state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
} }
@ -201,8 +201,8 @@ static int mtk_plane_atomic_check(struct drm_plane *plane,
return drm_atomic_helper_check_plane_state(new_plane_state, return drm_atomic_helper_check_plane_state(new_plane_state,
crtc_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
} }

2
drivers/gpu/drm/meson/meson_plane.c
View file

@ -94,7 +94,7 @@ static int meson_plane_atomic_check(struct drm_plane *plane,
return drm_atomic_helper_check_plane_state(new_plane_state, return drm_atomic_helper_check_plane_state(new_plane_state,
crtc_state, crtc_state,
FRAC_16_16(1, 5), FRAC_16_16(1, 5),
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
} }

4
drivers/gpu/drm/mxsfb/lcdif_kms.c
View file

@ -392,8 +392,8 @@ static int lcdif_plane_atomic_check(struct drm_plane *plane,
&lcdif->crtc); &lcdif->crtc);
return drm_atomic_helper_check_plane_state(plane_state, crtc_state, return drm_atomic_helper_check_plane_state(plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
} }

4
drivers/gpu/drm/mxsfb/mxsfb_kms.c
View file

@ -530,8 +530,8 @@ static int mxsfb_plane_atomic_check(struct drm_plane *plane,
&mxsfb->crtc); &mxsfb->crtc);
return drm_atomic_helper_check_plane_state(plane_state, crtc_state, return drm_atomic_helper_check_plane_state(plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
} }

4
drivers/gpu/drm/nouveau/dispnv50/base507c.c
View file

@ -237,8 +237,8 @@ base507c_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
int ret; int ret;
ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state, ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/nouveau/dispnv50/curs507a.c
View file

@ -102,8 +102,8 @@ curs507a_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
int ret; int ret;
ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state, ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
asyh->curs.visible = asyw->state.visible; asyh->curs.visible = asyw->state.visible;
if (ret || !asyh->curs.visible) if (ret || !asyh->curs.visible)

4
drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
View file

@ -106,8 +106,8 @@ ovly507e_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
int ret; int ret;
ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state, ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
View file

@ -296,8 +296,8 @@ wndwc37e_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
return drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state, return drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
} }

4
drivers/gpu/drm/rcar-du/rcar_du_plane.c
View file

@ -594,8 +594,8 @@ int __rcar_du_plane_atomic_check(struct drm_plane *plane,
return PTR_ERR(crtc_state); return PTR_ERR(crtc_state);
ret = drm_atomic_helper_check_plane_state(state, crtc_state, ret = drm_atomic_helper_check_plane_state(state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
if (ret < 0) if (ret < 0)
return ret; return ret;

8
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View file

@ -808,9 +808,9 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
const struct vop_win_data *win = vop_win->data; const struct vop_win_data *win = vop_win->data;
int ret; int ret;
int min_scale = win->phy->scl ? FRAC_16_16(1, 8) : int min_scale = win->phy->scl ? FRAC_16_16(1, 8) :
DRM_PLANE_HELPER_NO_SCALING; DRM_PLANE_NO_SCALING;
int max_scale = win->phy->scl ? FRAC_16_16(8, 1) : int max_scale = win->phy->scl ? FRAC_16_16(8, 1) :
DRM_PLANE_HELPER_NO_SCALING; DRM_PLANE_NO_SCALING;
if (!crtc || WARN_ON(!fb)) if (!crtc || WARN_ON(!fb))
return 0; return 0;
@ -1059,9 +1059,9 @@ static int vop_plane_atomic_async_check(struct drm_plane *plane,
struct vop_win *vop_win = to_vop_win(plane); struct vop_win *vop_win = to_vop_win(plane);
const struct vop_win_data *win = vop_win->data; const struct vop_win_data *win = vop_win->data;
int min_scale = win->phy->scl ? FRAC_16_16(1, 8) : int min_scale = win->phy->scl ? FRAC_16_16(1, 8) :
DRM_PLANE_HELPER_NO_SCALING; DRM_PLANE_NO_SCALING;
int max_scale = win->phy->scl ? FRAC_16_16(8, 1) : int max_scale = win->phy->scl ? FRAC_16_16(8, 1) :
DRM_PLANE_HELPER_NO_SCALING; DRM_PLANE_NO_SCALING;
struct drm_crtc_state *crtc_state; struct drm_crtc_state *crtc_state;
if (plane != new_plane_state->crtc->cursor) if (plane != new_plane_state->crtc->cursor)

4
drivers/gpu/drm/sprd/sprd_dpu.c
View file

@ -523,8 +523,8 @@ static int sprd_plane_atomic_check(struct drm_plane *plane,
return PTR_ERR(crtc_state); return PTR_ERR(crtc_state);
return drm_atomic_helper_check_plane_state(plane_state, crtc_state, return drm_atomic_helper_check_plane_state(plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
} }

4
drivers/gpu/drm/sun4i/sun8i_ui_layer.c
View file

@ -245,8 +245,8 @@ static int sun8i_ui_layer_atomic_check(struct drm_plane *plane,
if (WARN_ON(!crtc_state)) if (WARN_ON(!crtc_state))
return -EINVAL; return -EINVAL;
min_scale = DRM_PLANE_HELPER_NO_SCALING; min_scale = DRM_PLANE_NO_SCALING;
max_scale = DRM_PLANE_HELPER_NO_SCALING; max_scale = DRM_PLANE_NO_SCALING;
if (layer->mixer->cfg->scaler_mask & BIT(layer->channel)) { if (layer->mixer->cfg->scaler_mask & BIT(layer->channel)) {
min_scale = SUN8I_UI_SCALER_SCALE_MIN; min_scale = SUN8I_UI_SCALER_SCALE_MIN;

4
drivers/gpu/drm/sun4i/sun8i_vi_layer.c
View file

@ -379,8 +379,8 @@ static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,
if (WARN_ON(!crtc_state)) if (WARN_ON(!crtc_state))
return -EINVAL; return -EINVAL;
min_scale = DRM_PLANE_HELPER_NO_SCALING; min_scale = DRM_PLANE_NO_SCALING;
max_scale = DRM_PLANE_HELPER_NO_SCALING; max_scale = DRM_PLANE_NO_SCALING;
if (layer->mixer->cfg->scaler_mask & BIT(layer->channel)) { if (layer->mixer->cfg->scaler_mask & BIT(layer->channel)) {
min_scale = SUN8I_VI_SCALER_SCALE_MIN; min_scale = SUN8I_VI_SCALER_SCALE_MIN;

32
drivers/gpu/drm/tests/drm_plane_helper_test.c
View file

@ -104,8 +104,8 @@ static void igt_check_plane_state(struct kunit *test)
set_src(&plane_state, 0, 0, fb.width << 16, fb.height << 16); set_src(&plane_state, 0, 0, fb.width << 16, fb.height << 16);
set_crtc(&plane_state, 0, 0, fb.width, fb.height); set_crtc(&plane_state, 0, 0, fb.width, fb.height);
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false); false, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple clipping check should pass\n"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple clipping check should pass\n");
KUNIT_EXPECT_TRUE(test, plane_state.visible); KUNIT_EXPECT_TRUE(test, plane_state.visible);
@ -115,8 +115,8 @@ static void igt_check_plane_state(struct kunit *test)
/* Rotated clipping + reflection, no scaling. */ /* Rotated clipping + reflection, no scaling. */
plane_state.rotation = DRM_MODE_ROTATE_90 | DRM_MODE_REFLECT_X; plane_state.rotation = DRM_MODE_ROTATE_90 | DRM_MODE_REFLECT_X;
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false); false, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Rotated clipping check should pass\n"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Rotated clipping check should pass\n");
KUNIT_EXPECT_TRUE(test, plane_state.visible); KUNIT_EXPECT_TRUE(test, plane_state.visible);
@ -128,15 +128,15 @@ static void igt_check_plane_state(struct kunit *test)
set_src(&plane_state, 0, 0, 1023 << 16, 767 << 16); set_src(&plane_state, 0, 0, 1023 << 16, 767 << 16);
set_crtc(&plane_state, 0, 0, 1023, 767); set_crtc(&plane_state, 0, 0, 1023, 767);
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false); false, false);
KUNIT_EXPECT_TRUE_MSG(test, ret, KUNIT_EXPECT_TRUE_MSG(test, ret,
"Should not be able to position on the crtc with can_position=false\n"); "Should not be able to position on the crtc with can_position=false\n");
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, false); true, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple positioning should work\n"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple positioning should work\n");
KUNIT_EXPECT_TRUE(test, plane_state.visible); KUNIT_EXPECT_TRUE(test, plane_state.visible);
@ -148,12 +148,12 @@ static void igt_check_plane_state(struct kunit *test)
set_crtc(&plane_state, 0, 0, 1024, 768); set_crtc(&plane_state, 0, 0, 1024, 768);
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
0x8001, 0x8001,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false); false, false);
KUNIT_EXPECT_TRUE_MSG(test, ret, "Upscaling out of range should fail.\n"); KUNIT_EXPECT_TRUE_MSG(test, ret, "Upscaling out of range should fail.\n");
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
0x8000, 0x8000,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false); false, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Upscaling exactly 2x should work\n"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Upscaling exactly 2x should work\n");
KUNIT_EXPECT_TRUE(test, plane_state.visible); KUNIT_EXPECT_TRUE(test, plane_state.visible);
@ -162,11 +162,11 @@ static void igt_check_plane_state(struct kunit *test)
set_src(&plane_state, 0, 0, 2048 << 16, 1536 << 16); set_src(&plane_state, 0, 0, 2048 << 16, 1536 << 16);
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
0x1ffff, false, false); 0x1ffff, false, false);
KUNIT_EXPECT_TRUE_MSG(test, ret, "Downscaling out of range should fail.\n"); KUNIT_EXPECT_TRUE_MSG(test, ret, "Downscaling out of range should fail.\n");
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
0x20000, false, false); 0x20000, false, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed with exact scaling limit\n"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed with exact scaling limit\n");
KUNIT_EXPECT_TRUE(test, plane_state.visible); KUNIT_EXPECT_TRUE(test, plane_state.visible);
@ -177,7 +177,7 @@ static void igt_check_plane_state(struct kunit *test)
set_src(&plane_state, 0, 0, 0x40001, 0x40001); set_src(&plane_state, 0, 0, 0x40001, 0x40001);
set_crtc(&plane_state, 1022, 766, 4, 4); set_crtc(&plane_state, 1022, 766, 4, 4);
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
0x10001, 0x10001,
true, false); true, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple");
@ -188,7 +188,7 @@ static void igt_check_plane_state(struct kunit *test)
set_src(&plane_state, 0x20001, 0x20001, 0x4040001, 0x3040001); set_src(&plane_state, 0x20001, 0x20001, 0x4040001, 0x3040001);
set_crtc(&plane_state, -2, -2, 1028, 772); set_crtc(&plane_state, -2, -2, 1028, 772);
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
0x10001, 0x10001,
false, false); false, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple");
@ -201,7 +201,7 @@ static void igt_check_plane_state(struct kunit *test)
set_crtc(&plane_state, 1022, 766, 4, 4); set_crtc(&plane_state, 1022, 766, 4, 4);
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
0xffff, 0xffff,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, false); true, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple");
KUNIT_EXPECT_TRUE(test, plane_state.visible); KUNIT_EXPECT_TRUE(test, plane_state.visible);
@ -213,7 +213,7 @@ static void igt_check_plane_state(struct kunit *test)
set_crtc(&plane_state, -2, -2, 1028, 772); set_crtc(&plane_state, -2, -2, 1028, 772);
ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
0xffff, 0xffff,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false); false, false);
KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple");
KUNIT_EXPECT_TRUE(test, plane_state.visible); KUNIT_EXPECT_TRUE(test, plane_state.visible);

8
drivers/gpu/drm/vboxvideo/vbox_mode.c
View file

@ -269,8 +269,8 @@ static int vbox_primary_atomic_check(struct drm_plane *plane,
} }
return drm_atomic_helper_check_plane_state(new_state, crtc_state, return drm_atomic_helper_check_plane_state(new_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
} }
@ -351,8 +351,8 @@ static int vbox_cursor_atomic_check(struct drm_plane *plane,
} }
ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/virtio/virtgpu_plane.c
View file

@ -93,8 +93,8 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane,
return PTR_ERR(crtc_state); return PTR_ERR(crtc_state);
ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
is_cursor, true); is_cursor, true);
return ret; return ret;
} }

4
drivers/gpu/drm/vkms/vkms_plane.c
View file

@ -138,8 +138,8 @@ static int vkms_plane_atomic_check(struct drm_plane *plane,
can_position = true; can_position = true;
ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
can_position, true); can_position, true);
if (ret != 0) if (ret != 0)
return ret; return ret;

8
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
View file

@ -719,8 +719,8 @@ int vmw_du_primary_plane_atomic_check(struct drm_plane *plane,
new_state->crtc); new_state->crtc);
ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, true); false, true);
if (!ret && new_fb) { if (!ret && new_fb) {
@ -761,8 +761,8 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane,
new_state->crtc); new_state->crtc);
ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, ret = drm_atomic_helper_check_plane_state(new_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
true, true); true, true);
if (ret) if (ret)
return ret; return ret;

4
drivers/gpu/drm/xlnx/zynqmp_disp.c
View file

@ -1150,8 +1150,8 @@ zynqmp_disp_plane_atomic_check(struct drm_plane *plane,
return drm_atomic_helper_check_plane_state(new_plane_state, return drm_atomic_helper_check_plane_state(new_plane_state,
crtc_state, crtc_state,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_NO_SCALING,
false, false); false, false);
} }

2
include/drm/drm_atomic_helper.h
View file

@ -41,7 +41,7 @@
* Due to src being in 16.16 fixed point and dest being in integer pixels, * Due to src being in 16.16 fixed point and dest being in integer pixels,
* 1<<16 represents no scaling. * 1<<16 represents no scaling.
*/ */
#define DRM_PLANE_HELPER_NO_SCALING (1<<16) #define DRM_PLANE_NO_SCALING (1<<16)
struct drm_atomic_state; struct drm_atomic_state;
struct drm_private_obj; struct drm_private_obj;