diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-20 11:30:54 +0300 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-26 19:42:00 +0300 |
commit | cce32e4e38c63f040ffe1966117d364ecf9a28b8 (patch) | |
tree | 6dd9c7bd58d745a800658ecb0924499b67a1853c /drivers/gpu/drm/tests | |
parent | 382fc1f681324bb38bedfe763107a60256c4ddc8 (diff) | |
download | linux-cce32e4e38c63f040ffe1966117d364ecf9a28b8.tar.xz |
drm/atomic-helper: Remove _HELPER_ infix from DRM_PLANE_HELPER_NO_SCALING
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
Diffstat (limited to 'drivers/gpu/drm/tests')
-rw-r--r-- | drivers/gpu/drm/tests/drm_plane_helper_test.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gpu/drm/tests/drm_plane_helper_test.c b/drivers/gpu/drm/tests/drm_plane_helper_test.c index ec1654cdfc42..be6cff0020ed 100644 --- a/drivers/gpu/drm/tests/drm_plane_helper_test.c +++ b/drivers/gpu/drm/tests/drm_plane_helper_test.c @@ -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_crtc(&plane_state, 0, 0, fb.width, fb.height); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, - DRM_PLANE_HELPER_NO_SCALING, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, false, false); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple clipping check should pass\n"); 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. */ plane_state.rotation = DRM_MODE_ROTATE_90 | DRM_MODE_REFLECT_X; ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, - DRM_PLANE_HELPER_NO_SCALING, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, false, false); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Rotated clipping check should pass\n"); 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_crtc(&plane_state, 0, 0, 1023, 767); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, - DRM_PLANE_HELPER_NO_SCALING, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, false, false); KUNIT_EXPECT_TRUE_MSG(test, ret, "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, - DRM_PLANE_HELPER_NO_SCALING, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, true, false); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple positioning should work\n"); 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); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 0x8001, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, false, false); KUNIT_EXPECT_TRUE_MSG(test, ret, "Upscaling out of range should fail.\n"); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 0x8000, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, false, false); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Upscaling exactly 2x should work\n"); 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); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, 0x1ffff, false, false); KUNIT_EXPECT_TRUE_MSG(test, ret, "Downscaling out of range should fail.\n"); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, 0x20000, false, false); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed with exact scaling limit\n"); 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_crtc(&plane_state, 1022, 766, 4, 4); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, 0x10001, true, false); 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_crtc(&plane_state, -2, -2, 1028, 772); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, 0x10001, false, false); 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); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 0xffff, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, true, false); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); 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); ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 0xffff, - DRM_PLANE_HELPER_NO_SCALING, + DRM_PLANE_NO_SCALING, false, false); KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); KUNIT_EXPECT_TRUE(test, plane_state.visible); |