tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Thomas Zimmermann cce32e4e 382fc1f6

+90 -90
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
··· 282 282 return PTR_ERR(crtc_state); 283 283 284 284 ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, 285 - DRM_PLANE_HELPER_NO_SCALING, 286 - DRM_PLANE_HELPER_NO_SCALING, 285 + DRM_PLANE_NO_SCALING, 286 + DRM_PLANE_NO_SCALING, 287 287 false, true); 288 288 if (ret != 0) 289 289 return ret;
+2 -2
drivers/gpu/drm/arm/hdlcd_crtc.c
··· 251 251 return -EINVAL; 252 252 return drm_atomic_helper_check_plane_state(new_plane_state, 253 253 crtc_state, 254 - DRM_PLANE_HELPER_NO_SCALING, 255 - DRM_PLANE_HELPER_NO_SCALING, 254 + DRM_PLANE_NO_SCALING, 255 + DRM_PLANE_NO_SCALING, 256 256 false, true); 257 257 } 258 258
+4 -4
drivers/gpu/drm/ast/ast_mode.c
··· 554 554 new_plane_state->crtc); 555 555 556 556 ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, 557 - DRM_PLANE_HELPER_NO_SCALING, 558 - DRM_PLANE_HELPER_NO_SCALING, 557 + DRM_PLANE_NO_SCALING, 558 + DRM_PLANE_NO_SCALING, 559 559 false, true); 560 560 if (ret) 561 561 return ret; ··· 778 778 new_plane_state->crtc); 779 779 780 780 ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, 781 - DRM_PLANE_HELPER_NO_SCALING, 782 - DRM_PLANE_HELPER_NO_SCALING, 781 + DRM_PLANE_NO_SCALING, 782 + DRM_PLANE_NO_SCALING, 783 783 true, true); 784 784 if (ret) 785 785 return ret;
+2 -2
drivers/gpu/drm/drm_plane_helper.c
··· 179 179 ret = drm_plane_helper_check_update(plane, crtc, fb, 180 180 &src, &dest, 181 181 DRM_MODE_ROTATE_0, 182 - DRM_PLANE_HELPER_NO_SCALING, 183 - DRM_PLANE_HELPER_NO_SCALING, 182 + DRM_PLANE_NO_SCALING, 183 + DRM_PLANE_NO_SCALING, 184 184 false, false, &visible); 185 185 if (ret) 186 186 return ret;
+2 -2
drivers/gpu/drm/drm_simple_kms_helper.c
··· 222 222 &pipe->crtc); 223 223 224 224 ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state, 225 - DRM_PLANE_HELPER_NO_SCALING, 226 - DRM_PLANE_HELPER_NO_SCALING, 225 + DRM_PLANE_NO_SCALING, 226 + DRM_PLANE_NO_SCALING, 227 227 false, false); 228 228 if (ret) 229 229 return ret;
+2 -2
drivers/gpu/drm/i915/display/i9xx_plane.c
··· 325 325 return ret; 326 326 327 327 ret = intel_atomic_plane_check_clipping(plane_state, crtc_state, 328 - DRM_PLANE_HELPER_NO_SCALING, 329 - DRM_PLANE_HELPER_NO_SCALING, 328 + DRM_PLANE_NO_SCALING, 329 + DRM_PLANE_NO_SCALING, 330 330 i9xx_plane_has_windowing(plane)); 331 331 if (ret) 332 332 return ret;
+2 -2
drivers/gpu/drm/i915/display/intel_cursor.c
··· 143 143 } 144 144 145 145 ret = intel_atomic_plane_check_clipping(plane_state, crtc_state, 146 - DRM_PLANE_HELPER_NO_SCALING, 147 - DRM_PLANE_HELPER_NO_SCALING, 146 + DRM_PLANE_NO_SCALING, 147 + DRM_PLANE_NO_SCALING, 148 148 true); 149 149 if (ret) 150 150 return ret;
+4 -4
drivers/gpu/drm/i915/display/intel_sprite.c
··· 1354 1354 { 1355 1355 struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane); 1356 1356 struct drm_i915_private *dev_priv = to_i915(plane->base.dev); 1357 - int min_scale = DRM_PLANE_HELPER_NO_SCALING; 1358 - int max_scale = DRM_PLANE_HELPER_NO_SCALING; 1357 + int min_scale = DRM_PLANE_NO_SCALING; 1358 + int max_scale = DRM_PLANE_NO_SCALING; 1359 1359 int ret; 1360 1360 1361 1361 if (g4x_fb_scalable(plane_state->hw.fb)) { ··· 1425 1425 return ret; 1426 1426 1427 1427 ret = intel_atomic_plane_check_clipping(plane_state, crtc_state, 1428 - DRM_PLANE_HELPER_NO_SCALING, 1429 - DRM_PLANE_HELPER_NO_SCALING, 1428 + DRM_PLANE_NO_SCALING, 1429 + DRM_PLANE_NO_SCALING, 1430 1430 true); 1431 1431 if (ret) 1432 1432 return ret;
+2 -2
drivers/gpu/drm/i915/display/skl_universal_plane.c
··· 1855 1855 struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane); 1856 1856 struct drm_i915_private *dev_priv = to_i915(plane->base.dev); 1857 1857 const struct drm_framebuffer *fb = plane_state->hw.fb; 1858 - int min_scale = DRM_PLANE_HELPER_NO_SCALING; 1859 - int max_scale = DRM_PLANE_HELPER_NO_SCALING; 1858 + int min_scale = DRM_PLANE_NO_SCALING; 1859 + int max_scale = DRM_PLANE_NO_SCALING; 1860 1860 int ret; 1861 1861 1862 1862 ret = skl_plane_check_fb(crtc_state, plane_state);
+2 -2
drivers/gpu/drm/imx/ipuv3-plane.c
··· 392 392 return -EINVAL; 393 393 394 394 ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, 395 - DRM_PLANE_HELPER_NO_SCALING, 396 - DRM_PLANE_HELPER_NO_SCALING, 395 + DRM_PLANE_NO_SCALING, 396 + DRM_PLANE_NO_SCALING, 397 397 can_position, true); 398 398 if (ret) 399 399 return ret;
+2 -2
drivers/gpu/drm/ingenic/ingenic-drm-drv.c
··· 481 481 return PTR_ERR(priv_state); 482 482 483 483 ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, 484 - DRM_PLANE_HELPER_NO_SCALING, 485 - DRM_PLANE_HELPER_NO_SCALING, 484 + DRM_PLANE_NO_SCALING, 485 + DRM_PLANE_NO_SCALING, 486 486 priv->soc_info->has_osd, 487 487 true); 488 488 if (ret)
+2 -2
drivers/gpu/drm/kmb/kmb_plane.c
··· 135 135 new_plane_state->crtc); 136 136 return drm_atomic_helper_check_plane_state(new_plane_state, 137 137 crtc_state, 138 - DRM_PLANE_HELPER_NO_SCALING, 139 - DRM_PLANE_HELPER_NO_SCALING, 138 + DRM_PLANE_NO_SCALING, 139 + DRM_PLANE_NO_SCALING, 140 140 can_position, true); 141 141 } 142 142
+2 -2
drivers/gpu/drm/logicvc/logicvc_layer.c
··· 116 116 } 117 117 } 118 118 119 - min_scale = DRM_PLANE_HELPER_NO_SCALING; 120 - max_scale = DRM_PLANE_HELPER_NO_SCALING; 119 + min_scale = DRM_PLANE_NO_SCALING; 120 + max_scale = DRM_PLANE_NO_SCALING; 121 121 122 122 can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY && 123 123 layer->index != (logicvc->config.layers_count - 1) &&
+4 -4
drivers/gpu/drm/mediatek/mtk_drm_plane.c
··· 107 107 crtc_state = new_plane_state->crtc->state; 108 108 109 109 return drm_atomic_helper_check_plane_state(plane->state, crtc_state, 110 - DRM_PLANE_HELPER_NO_SCALING, 111 - DRM_PLANE_HELPER_NO_SCALING, 110 + DRM_PLANE_NO_SCALING, 111 + DRM_PLANE_NO_SCALING, 112 112 true, true); 113 113 } 114 114 ··· 201 201 202 202 return drm_atomic_helper_check_plane_state(new_plane_state, 203 203 crtc_state, 204 - DRM_PLANE_HELPER_NO_SCALING, 205 - DRM_PLANE_HELPER_NO_SCALING, 204 + DRM_PLANE_NO_SCALING, 205 + DRM_PLANE_NO_SCALING, 206 206 true, true); 207 207 } 208 208
+1 -1
drivers/gpu/drm/meson/meson_plane.c
··· 94 94 return drm_atomic_helper_check_plane_state(new_plane_state, 95 95 crtc_state, 96 96 FRAC_16_16(1, 5), 97 - DRM_PLANE_HELPER_NO_SCALING, 97 + DRM_PLANE_NO_SCALING, 98 98 false, true); 99 99 } 100 100
+2 -2
drivers/gpu/drm/mxsfb/lcdif_kms.c
··· 392 392 &lcdif->crtc); 393 393 394 394 return drm_atomic_helper_check_plane_state(plane_state, crtc_state, 395 - DRM_PLANE_HELPER_NO_SCALING, 396 - DRM_PLANE_HELPER_NO_SCALING, 395 + DRM_PLANE_NO_SCALING, 396 + DRM_PLANE_NO_SCALING, 397 397 false, true); 398 398 } 399 399
+2 -2
drivers/gpu/drm/mxsfb/mxsfb_kms.c
··· 530 530 &mxsfb->crtc); 531 531 532 532 return drm_atomic_helper_check_plane_state(plane_state, crtc_state, 533 - DRM_PLANE_HELPER_NO_SCALING, 534 - DRM_PLANE_HELPER_NO_SCALING, 533 + DRM_PLANE_NO_SCALING, 534 + DRM_PLANE_NO_SCALING, 535 535 false, true); 536 536 } 537 537
+2 -2
drivers/gpu/drm/nouveau/dispnv50/base507c.c
··· 237 237 int ret; 238 238 239 239 ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state, 240 - DRM_PLANE_HELPER_NO_SCALING, 241 - DRM_PLANE_HELPER_NO_SCALING, 240 + DRM_PLANE_NO_SCALING, 241 + DRM_PLANE_NO_SCALING, 242 242 false, true); 243 243 if (ret) 244 244 return ret;
+2 -2
drivers/gpu/drm/nouveau/dispnv50/curs507a.c
··· 102 102 int ret; 103 103 104 104 ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state, 105 - DRM_PLANE_HELPER_NO_SCALING, 106 - DRM_PLANE_HELPER_NO_SCALING, 105 + DRM_PLANE_NO_SCALING, 106 + DRM_PLANE_NO_SCALING, 107 107 true, true); 108 108 asyh->curs.visible = asyw->state.visible; 109 109 if (ret || !asyh->curs.visible)
+2 -2
drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
··· 106 106 int ret; 107 107 108 108 ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state, 109 - DRM_PLANE_HELPER_NO_SCALING, 110 - DRM_PLANE_HELPER_NO_SCALING, 109 + DRM_PLANE_NO_SCALING, 110 + DRM_PLANE_NO_SCALING, 111 111 true, true); 112 112 if (ret) 113 113 return ret;
+2 -2
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
··· 296 296 struct nv50_head_atom *asyh) 297 297 { 298 298 return drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state, 299 - DRM_PLANE_HELPER_NO_SCALING, 300 - DRM_PLANE_HELPER_NO_SCALING, 299 + DRM_PLANE_NO_SCALING, 300 + DRM_PLANE_NO_SCALING, 301 301 true, true); 302 302 } 303 303
+2 -2
drivers/gpu/drm/rcar-du/rcar_du_plane.c
··· 594 594 return PTR_ERR(crtc_state); 595 595 596 596 ret = drm_atomic_helper_check_plane_state(state, crtc_state, 597 - DRM_PLANE_HELPER_NO_SCALING, 598 - DRM_PLANE_HELPER_NO_SCALING, 597 + DRM_PLANE_NO_SCALING, 598 + DRM_PLANE_NO_SCALING, 599 599 true, true); 600 600 if (ret < 0) 601 601 return ret;
+4 -4
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
··· 808 808 const struct vop_win_data *win = vop_win->data; 809 809 int ret; 810 810 int min_scale = win->phy->scl ? FRAC_16_16(1, 8) : 811 - DRM_PLANE_HELPER_NO_SCALING; 811 + DRM_PLANE_NO_SCALING; 812 812 int max_scale = win->phy->scl ? FRAC_16_16(8, 1) : 813 - DRM_PLANE_HELPER_NO_SCALING; 813 + DRM_PLANE_NO_SCALING; 814 814 815 815 if (!crtc || WARN_ON(!fb)) 816 816 return 0; ··· 1059 1059 struct vop_win *vop_win = to_vop_win(plane); 1060 1060 const struct vop_win_data *win = vop_win->data; 1061 1061 int min_scale = win->phy->scl ? FRAC_16_16(1, 8) : 1062 - DRM_PLANE_HELPER_NO_SCALING; 1062 + DRM_PLANE_NO_SCALING; 1063 1063 int max_scale = win->phy->scl ? FRAC_16_16(8, 1) : 1064 - DRM_PLANE_HELPER_NO_SCALING; 1064 + DRM_PLANE_NO_SCALING; 1065 1065 struct drm_crtc_state *crtc_state; 1066 1066 1067 1067 if (plane != new_plane_state->crtc->cursor)
+2 -2
drivers/gpu/drm/sprd/sprd_dpu.c
··· 523 523 return PTR_ERR(crtc_state); 524 524 525 525 return drm_atomic_helper_check_plane_state(plane_state, crtc_state, 526 - DRM_PLANE_HELPER_NO_SCALING, 527 - DRM_PLANE_HELPER_NO_SCALING, 526 + DRM_PLANE_NO_SCALING, 527 + DRM_PLANE_NO_SCALING, 528 528 true, true); 529 529 } 530 530
+2 -2
drivers/gpu/drm/sun4i/sun8i_ui_layer.c
··· 245 245 if (WARN_ON(!crtc_state)) 246 246 return -EINVAL; 247 247 248 - min_scale = DRM_PLANE_HELPER_NO_SCALING; 249 - max_scale = DRM_PLANE_HELPER_NO_SCALING; 248 + min_scale = DRM_PLANE_NO_SCALING; 249 + max_scale = DRM_PLANE_NO_SCALING; 250 250 251 251 if (layer->mixer->cfg->scaler_mask & BIT(layer->channel)) { 252 252 min_scale = SUN8I_UI_SCALER_SCALE_MIN;
+2 -2
drivers/gpu/drm/sun4i/sun8i_vi_layer.c
··· 379 379 if (WARN_ON(!crtc_state)) 380 380 return -EINVAL; 381 381 382 - min_scale = DRM_PLANE_HELPER_NO_SCALING; 383 - max_scale = DRM_PLANE_HELPER_NO_SCALING; 382 + min_scale = DRM_PLANE_NO_SCALING; 383 + max_scale = DRM_PLANE_NO_SCALING; 384 384 385 385 if (layer->mixer->cfg->scaler_mask & BIT(layer->channel)) { 386 386 min_scale = SUN8I_VI_SCALER_SCALE_MIN;
+16 -16
drivers/gpu/drm/tests/drm_plane_helper_test.c
··· 104 104 set_src(&plane_state, 0, 0, fb.width << 16, fb.height << 16); 105 105 set_crtc(&plane_state, 0, 0, fb.width, fb.height); 106 106 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 107 - DRM_PLANE_HELPER_NO_SCALING, 108 - DRM_PLANE_HELPER_NO_SCALING, 107 + DRM_PLANE_NO_SCALING, 108 + DRM_PLANE_NO_SCALING, 109 109 false, false); 110 110 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple clipping check should pass\n"); 111 111 KUNIT_EXPECT_TRUE(test, plane_state.visible); ··· 115 115 /* Rotated clipping + reflection, no scaling. */ 116 116 plane_state.rotation = DRM_MODE_ROTATE_90 | DRM_MODE_REFLECT_X; 117 117 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 118 - DRM_PLANE_HELPER_NO_SCALING, 119 - DRM_PLANE_HELPER_NO_SCALING, 118 + DRM_PLANE_NO_SCALING, 119 + DRM_PLANE_NO_SCALING, 120 120 false, false); 121 121 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Rotated clipping check should pass\n"); 122 122 KUNIT_EXPECT_TRUE(test, plane_state.visible); ··· 128 128 set_src(&plane_state, 0, 0, 1023 << 16, 767 << 16); 129 129 set_crtc(&plane_state, 0, 0, 1023, 767); 130 130 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 131 - DRM_PLANE_HELPER_NO_SCALING, 132 - DRM_PLANE_HELPER_NO_SCALING, 131 + DRM_PLANE_NO_SCALING, 132 + DRM_PLANE_NO_SCALING, 133 133 false, false); 134 134 KUNIT_EXPECT_TRUE_MSG(test, ret, 135 135 "Should not be able to position on the crtc with can_position=false\n"); 136 136 137 137 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 138 - DRM_PLANE_HELPER_NO_SCALING, 139 - DRM_PLANE_HELPER_NO_SCALING, 138 + DRM_PLANE_NO_SCALING, 139 + DRM_PLANE_NO_SCALING, 140 140 true, false); 141 141 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Simple positioning should work\n"); 142 142 KUNIT_EXPECT_TRUE(test, plane_state.visible); ··· 148 148 set_crtc(&plane_state, 0, 0, 1024, 768); 149 149 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 150 150 0x8001, 151 - DRM_PLANE_HELPER_NO_SCALING, 151 + DRM_PLANE_NO_SCALING, 152 152 false, false); 153 153 KUNIT_EXPECT_TRUE_MSG(test, ret, "Upscaling out of range should fail.\n"); 154 154 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 155 155 0x8000, 156 - DRM_PLANE_HELPER_NO_SCALING, 156 + DRM_PLANE_NO_SCALING, 157 157 false, false); 158 158 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Upscaling exactly 2x should work\n"); 159 159 KUNIT_EXPECT_TRUE(test, plane_state.visible); ··· 162 162 163 163 set_src(&plane_state, 0, 0, 2048 << 16, 1536 << 16); 164 164 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 165 - DRM_PLANE_HELPER_NO_SCALING, 165 + DRM_PLANE_NO_SCALING, 166 166 0x1ffff, false, false); 167 167 KUNIT_EXPECT_TRUE_MSG(test, ret, "Downscaling out of range should fail.\n"); 168 168 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 169 - DRM_PLANE_HELPER_NO_SCALING, 169 + DRM_PLANE_NO_SCALING, 170 170 0x20000, false, false); 171 171 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed with exact scaling limit\n"); 172 172 KUNIT_EXPECT_TRUE(test, plane_state.visible); ··· 177 177 set_src(&plane_state, 0, 0, 0x40001, 0x40001); 178 178 set_crtc(&plane_state, 1022, 766, 4, 4); 179 179 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 180 - DRM_PLANE_HELPER_NO_SCALING, 180 + DRM_PLANE_NO_SCALING, 181 181 0x10001, 182 182 true, false); 183 183 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); ··· 188 188 set_src(&plane_state, 0x20001, 0x20001, 0x4040001, 0x3040001); 189 189 set_crtc(&plane_state, -2, -2, 1028, 772); 190 190 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 191 - DRM_PLANE_HELPER_NO_SCALING, 191 + DRM_PLANE_NO_SCALING, 192 192 0x10001, 193 193 false, false); 194 194 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); ··· 201 201 set_crtc(&plane_state, 1022, 766, 4, 4); 202 202 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 203 203 0xffff, 204 - DRM_PLANE_HELPER_NO_SCALING, 204 + DRM_PLANE_NO_SCALING, 205 205 true, false); 206 206 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); 207 207 KUNIT_EXPECT_TRUE(test, plane_state.visible); ··· 213 213 set_crtc(&plane_state, -2, -2, 1028, 772); 214 214 ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state, 215 215 0xffff, 216 - DRM_PLANE_HELPER_NO_SCALING, 216 + DRM_PLANE_NO_SCALING, 217 217 false, false); 218 218 KUNIT_EXPECT_FALSE_MSG(test, ret, 0, "Should succeed by clipping to exact multiple"); 219 219 KUNIT_EXPECT_TRUE(test, plane_state.visible);
+4 -4
drivers/gpu/drm/vboxvideo/vbox_mode.c
··· 269 269 } 270 270 271 271 return drm_atomic_helper_check_plane_state(new_state, crtc_state, 272 - DRM_PLANE_HELPER_NO_SCALING, 273 - DRM_PLANE_HELPER_NO_SCALING, 272 + DRM_PLANE_NO_SCALING, 273 + DRM_PLANE_NO_SCALING, 274 274 false, true); 275 275 } 276 276 ··· 351 351 } 352 352 353 353 ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, 354 - DRM_PLANE_HELPER_NO_SCALING, 355 - DRM_PLANE_HELPER_NO_SCALING, 354 + DRM_PLANE_NO_SCALING, 355 + DRM_PLANE_NO_SCALING, 356 356 true, true); 357 357 if (ret) 358 358 return ret;
+2 -2
drivers/gpu/drm/virtio/virtgpu_plane.c
··· 93 93 return PTR_ERR(crtc_state); 94 94 95 95 ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, 96 - DRM_PLANE_HELPER_NO_SCALING, 97 - DRM_PLANE_HELPER_NO_SCALING, 96 + DRM_PLANE_NO_SCALING, 97 + DRM_PLANE_NO_SCALING, 98 98 is_cursor, true); 99 99 return ret; 100 100 }
+2 -2
drivers/gpu/drm/vkms/vkms_plane.c
··· 138 138 can_position = true; 139 139 140 140 ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, 141 - DRM_PLANE_HELPER_NO_SCALING, 142 - DRM_PLANE_HELPER_NO_SCALING, 141 + DRM_PLANE_NO_SCALING, 142 + DRM_PLANE_NO_SCALING, 143 143 can_position, true); 144 144 if (ret != 0) 145 145 return ret;
+4 -4
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
··· 719 719 new_state->crtc); 720 720 721 721 ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, 722 - DRM_PLANE_HELPER_NO_SCALING, 723 - DRM_PLANE_HELPER_NO_SCALING, 722 + DRM_PLANE_NO_SCALING, 723 + DRM_PLANE_NO_SCALING, 724 724 false, true); 725 725 726 726 if (!ret && new_fb) { ··· 761 761 new_state->crtc); 762 762 763 763 ret = drm_atomic_helper_check_plane_state(new_state, crtc_state, 764 - DRM_PLANE_HELPER_NO_SCALING, 765 - DRM_PLANE_HELPER_NO_SCALING, 764 + DRM_PLANE_NO_SCALING, 765 + DRM_PLANE_NO_SCALING, 766 766 true, true); 767 767 if (ret) 768 768 return ret;
+2 -2
drivers/gpu/drm/xlnx/zynqmp_disp.c
··· 1150 1150 1151 1151 return drm_atomic_helper_check_plane_state(new_plane_state, 1152 1152 crtc_state, 1153 - DRM_PLANE_HELPER_NO_SCALING, 1154 - DRM_PLANE_HELPER_NO_SCALING, 1153 + DRM_PLANE_NO_SCALING, 1154 + DRM_PLANE_NO_SCALING, 1155 1155 false, false); 1156 1156 } 1157 1157
+1 -1
include/drm/drm_atomic_helper.h
··· 41 41 * Due to src being in 16.16 fixed point and dest being in integer pixels, 42 42 * 1<<16 represents no scaling. 43 43 */ 44 - #define DRM_PLANE_HELPER_NO_SCALING (1<<16) 44 + #define DRM_PLANE_NO_SCALING (1<<16) 45 45 46 46 struct drm_atomic_state; 47 47 struct drm_private_obj;