Commit 92cb9192e330b0fc677df2e076740ee9a28a4750
2020-08-17T18:35:04
kmsdrm: move hardware cursor functionality to the ATOMIC interface. Disconnect the display plane from the GBM surface buffers before destroying the GBM surface.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347
diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.c b/src/video/kmsdrm/SDL_kmsdrmmouse.c
index 19d50b4..fd8ccef 100644
--- a/src/video/kmsdrm/SDL_kmsdrmmouse.c
+++ b/src/video/kmsdrm/SDL_kmsdrmmouse.c
@@ -39,6 +39,17 @@ static void KMSDRM_FreeCursor(SDL_Cursor * cursor);
static void KMSDRM_WarpMouse(SDL_Window * window, int x, int y);
static int KMSDRM_WarpMouseGlobal(int x, int y);
+/*********************************/
+/* Atomic helper functions block.*/
+/*********************************/
+
+
+
+/**************************************/
+/* Atomic helper functions block ends.*/
+/**************************************/
+
+
/* Converts a pixel from straight-alpha [AA, RR, GG, BB], which the SDL cursor surface has,
to premultiplied-alpha [AA. AA*RR, AA*GG, AA*BB].
These multiplications have to be done with floats instead of uint32_t's, and the resulting values have
@@ -119,6 +130,8 @@ KMSDRM_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
goto cleanup;
}
+ /* Here simply set the hox_x and hot_y, that will be used in drm_atomic_movecursor().
+ These are the coordinates of the "tip of the cursor" from it's base. */
curdata->hot_x = hot_x;
curdata->hot_y = hot_y;
curdata->w = usable_cursor_w;
@@ -135,8 +148,9 @@ KMSDRM_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
bo_stride = KMSDRM_gbm_bo_get_stride(curdata->bo);
bufsize = bo_stride * curdata->h;
- /* Always use a temp buffer: it serves the purpose of storing the alpha-premultiplied pixels (so
- we can copy them to the gbm BO with a single gb_bo_write() call), and also copying from the
+ /* Always use a temp buffer: it serves the purpose of storing the
+ alpha-premultiplied pixels (so we can copy them to the gbm BO
+ with a single gb_bo_write() call), and also copying from the
SDL surface, line by line, to a gbm BO with different pitch. */
buffer = (uint32_t*)SDL_malloc(bufsize);
if (!buffer) {
@@ -196,18 +210,21 @@ cleanup:
return NULL;
}
-/* Show the specified cursor, or hide if cursor is NULL */
+/* Show the specified cursor, or hide if cursor is NULL.
+ cur_cursor is the current cursor, and cursor is the new cursor.
+ A cursor is displayed on a display, so we have to add a pointer to dispdata
+ to the driverdata
+ */
static int
KMSDRM_ShowCursor(SDL_Cursor * cursor)
{
- SDL_VideoDevice *dev = SDL_GetVideoDevice();
- SDL_VideoData *viddata = ((SDL_VideoData *)dev->driverdata);
+ SDL_VideoDevice *video_device = SDL_GetVideoDevice();
+ //SDL_VideoData *viddata = ((SDL_VideoData *)dev->driverdata);
SDL_Mouse *mouse;
KMSDRM_CursorData *curdata;
SDL_VideoDisplay *display = NULL;
SDL_DisplayData *dispdata = NULL;
int ret;
- uint32_t bo_handle;
mouse = SDL_GetMouse();
if (!mouse) {
@@ -221,35 +238,30 @@ KMSDRM_ShowCursor(SDL_Cursor * cursor)
}
}
+ /* Hide cursor */
if (!cursor) {
- /* Hide current cursor */
+ /* Hide CURRENT cursor, a cursor that is already on screen
+ and SDL stores in mouse->cur_cursor. */
if (mouse->cur_cursor && mouse->cur_cursor->driverdata) {
curdata = (KMSDRM_CursorData *) mouse->cur_cursor->driverdata;
+ if (curdata->video) {
+
+ ret = drm_atomic_setcursor(0, 0, 0);
- if (curdata->crtc_id != 0) {
- ret = KMSDRM_drmModeSetCursor(viddata->drm_fd, curdata->crtc_id, 0, 0, 0);
if (ret) {
- SDL_SetError("Could not hide current cursor with drmModeSetCursor().");
+ SDL_SetError("Could not hide current cursor with drm_atomic_setcursor).");
return ret;
}
- /* Mark previous cursor as not-displayed */
- curdata->crtc_id = 0;
return 0;
+
}
}
- /* otherwise if possible, hide global cursor */
- if (dispdata && dispdata->crtc_id != 0) {
- ret = KMSDRM_drmModeSetCursor(viddata->drm_fd, dispdata->crtc_id, 0, 0, 0);
- if (ret) {
- SDL_SetError("Could not hide display's cursor with drmModeSetCursor().");
- return ret;
- }
- return 0;
- }
return SDL_SetError("Couldn't find cursor to hide.");
}
+
+
/* If cursor != NULL, show new cursor on display */
if (!display) {
return SDL_SetError("Could not get display for mouse.");
@@ -257,54 +269,55 @@ KMSDRM_ShowCursor(SDL_Cursor * cursor)
if (!dispdata) {
return SDL_SetError("Could not get display driverdata.");
}
-
+
curdata = (KMSDRM_CursorData *) cursor->driverdata;
if (!curdata || !curdata->bo) {
return SDL_SetError("Cursor not initialized properly.");
}
- bo_handle = KMSDRM_gbm_bo_get_handle(curdata->bo).u32;
- if (curdata->hot_x == 0 && curdata->hot_y == 0) {
- ret = KMSDRM_drmModeSetCursor(viddata->drm_fd, dispdata->crtc_id, bo_handle,
- curdata->w, curdata->h);
- } else {
- ret = KMSDRM_drmModeSetCursor2(viddata->drm_fd, dispdata->crtc_id, bo_handle,
- curdata->w, curdata->h, curdata->hot_x, curdata->hot_y);
- }
+ curdata->crtc_id = dispdata->crtc->crtc->crtc_id;
+ curdata->video = video_device;
+
+ /* DO show cursor */
+ ret = drm_atomic_setcursor(curdata, mouse->x - curdata->hot_x, mouse->y - curdata->hot_y);
+
if (ret) {
- SDL_SetError("drmModeSetCursor failed.");
+ SDL_SetError("KMSDRM_SetCursor failed.");
return ret;
}
- curdata->crtc_id = dispdata->crtc_id;
-
return 0;
}
-/* Free a window manager cursor */
+/* Unset the cursor from the cusror plane, and ONLY WHEN THAT'S DONE,
+ DONE FOR REAL, and not only requested, destroy it by destroying the curso BO.
+ Destroying the cursor BO is an special an delicate situation,
+ because drm_atomic_setcursor() returns immediately, and we DON'T
+ want to get to gbm_bo_destroy() before the prop changes requested
+ in drm_atomic_setcursor() have effectively been done. So we
+ issue a BLOCKING atomic_commit here to avoid that situation.
+ REMEMBER you yan issue an atomic_commit whenever you want, and
+ the changes requested until that moment (for any planes, crtcs, etc.)
+ will be done. */
static void
KMSDRM_FreeCursor(SDL_Cursor * cursor)
{
- KMSDRM_CursorData *curdata;
- int drm_fd;
+ KMSDRM_CursorData *curdata = NULL;
+ SDL_VideoDevice *video = NULL;
if (cursor) {
curdata = (KMSDRM_CursorData *) cursor->driverdata;
-
- if (curdata) {
- if (curdata->bo) {
- if (curdata->crtc_id != 0) {
- drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(curdata->bo));
- /* Hide the cursor if previously shown on a CRTC */
- KMSDRM_drmModeSetCursor(drm_fd, curdata->crtc_id, 0, 0, 0);
- curdata->crtc_id = 0;
- }
- KMSDRM_gbm_bo_destroy(curdata->bo);
- curdata->bo = NULL;
- }
- SDL_free(cursor->driverdata);
+ video = curdata->video;
+ if (video && curdata->bo) {
+ drm_atomic_setcursor(0, 0, 0);
+ /* Wait until the cursor is unset from the cursor plane before destroying it's BO. */
+ drm_atomic_commit(video, SDL_TRUE);
+ KMSDRM_gbm_bo_destroy(curdata->bo);
+ curdata->bo = NULL;
+
+ SDL_free(cursor->driverdata);
+ SDL_free(cursor);
}
- SDL_free(cursor);
}
}
@@ -330,20 +343,17 @@ KMSDRM_WarpMouseGlobal(int x, int y)
/* And now update the cursor graphic position on screen. */
curdata = (KMSDRM_CursorData *) mouse->cur_cursor->driverdata;
if (curdata->bo) {
+ int ret;
- if (curdata->crtc_id != 0) {
- int ret, drm_fd;
- drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(curdata->bo));
- ret = KMSDRM_drmModeMoveCursor(drm_fd, curdata->crtc_id, x, y);
+ drm_atomic_movecursor(curdata, x, y);
+ ret = drm_atomic_commit(curdata->video, SDL_TRUE);
- if (ret) {
- SDL_SetError("drmModeMoveCursor() failed.");
- }
+ if (ret) {
+ SDL_SetError("drm_atomic_movecursor() failed.");
+ }
+
+ return ret;
- return ret;
- } else {
- return SDL_SetError("Cursor is not currently shown.");
- }
} else {
return SDL_SetError("Cursor not initialized properly.");
}
@@ -382,18 +392,21 @@ KMSDRM_MoveCursor(SDL_Cursor * cursor)
{
SDL_Mouse *mouse = SDL_GetMouse();
KMSDRM_CursorData *curdata;
- int drm_fd, ret;
+ int ret;
/* We must NOT call SDL_SendMouseMotion() here or we will enter recursivity!
That's why we move the cursor graphic ONLY. */
if (mouse && mouse->cur_cursor && mouse->cur_cursor->driverdata) {
curdata = (KMSDRM_CursorData *) mouse->cur_cursor->driverdata;
- drm_fd = KMSDRM_gbm_device_get_fd(KMSDRM_gbm_bo_get_device(curdata->bo));
- ret = KMSDRM_drmModeMoveCursor(drm_fd, curdata->crtc_id, mouse->x, mouse->y);
-
- if (ret) {
- SDL_SetError("drmModeMoveCursor() failed.");
- }
+ /* In SDLPoP "QUIT?" menu, no more pageflips are generated, so no more atomic_commit() calls
+ from SwapWindow(), causing the cursor movement requested here not to be seen on screen.
+ Thus we have to do an atomic_commit() here, so requested movements are commited and seen. */
+ drm_atomic_movecursor(curdata, mouse->x, mouse->y);
+ ret = drm_atomic_commit(curdata->video, SDL_TRUE);
+
+ if (ret) {
+ SDL_SetError("drm_atomic_movecursor() failed.");
+ }
}
}
diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.h b/src/video/kmsdrm/SDL_kmsdrmmouse.h
index 6eb7548..4d21448 100644
--- a/src/video/kmsdrm/SDL_kmsdrmmouse.h
+++ b/src/video/kmsdrm/SDL_kmsdrmmouse.h
@@ -29,14 +29,6 @@
#define MAX_CURSOR_W 512
#define MAX_CURSOR_H 512
-typedef struct _KMSDRM_CursorData
-{
- struct gbm_bo *bo;
- uint32_t crtc_id;
- int hot_x, hot_y;
- int w, h;
-} KMSDRM_CursorData;
-
extern void KMSDRM_InitMouse(_THIS);
extern void KMSDRM_QuitMouse(_THIS);
diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c
index 582b1c1..23600a8 100644
--- a/src/video/kmsdrm/SDL_kmsdrmopengles.c
+++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c
@@ -119,7 +119,7 @@ KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window)
}
/* Add the pageflip to te request list. */
- drm_atomic_request_pageflip(_this, fb->fb_id);
+ drm_atomic_setbuffer(_this, dispdata->display_plane, fb->fb_id);
/* Issue the one and only atomic commit where all changes will be requested!.
We need e a non-blocking atomic commit for triple buffering, because we
@@ -164,6 +164,7 @@ int
KMSDRM_GLES_SwapWindowDB(_THIS, SDL_Window * window)
{
SDL_WindowData *windata = ((SDL_WindowData *) window->driverdata);
+ SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
KMSDRM_FBInfo *fb;
int ret;
@@ -188,7 +189,7 @@ KMSDRM_GLES_SwapWindowDB(_THIS, SDL_Window * window)
}
/* Add the pageflip to te request list. */
- drm_atomic_request_pageflip(_this, fb->fb_id);
+ drm_atomic_setbuffer(_this, dispdata->display_plane, fb->fb_id);
/* Issue the one and only atomic commit where all changes will be requested!.
Blocking for double buffering: won't return until completed. */
diff --git a/src/video/kmsdrm/SDL_kmsdrmsym.h b/src/video/kmsdrm/SDL_kmsdrmsym.h
index f5b2e01..2550b3d 100644
--- a/src/video/kmsdrm/SDL_kmsdrmsym.h
+++ b/src/video/kmsdrm/SDL_kmsdrmsym.h
@@ -42,9 +42,22 @@ SDL_KMSDRM_SYM(void,drmModeFreeConnector,(drmModeConnectorPtr ptr))
SDL_KMSDRM_SYM(void,drmModeFreeEncoder,(drmModeEncoderPtr ptr))
SDL_KMSDRM_SYM(int,drmGetCap,(int fd, uint64_t capability, uint64_t *value))
SDL_KMSDRM_SYM(drmModeResPtr,drmModeGetResources,(int fd))
+
SDL_KMSDRM_SYM(int,drmModeAddFB,(int fd, uint32_t width, uint32_t height, uint8_t depth,
uint8_t bpp, uint32_t pitch, uint32_t bo_handle,
uint32_t *buf_id))
+
+SDL_KMSDRM_SYM(int,drmModeAddFB2,(int fd, uint32_t width, uint32_t height,
+ uint32_t pixel_format, const uint32_t bo_handles[4],
+ const uint32_t pitches[4], const uint32_t offsets[4],
+ uint32_t *buf_id, uint32_t flags))
+
+SDL_KMSDRM_SYM(int,drmModeAddFB2WithModifiers,(int fd, uint32_t width, uint32_t height,
+ uint32_t pixel_format, const uint32_t bo_handles[4],
+ const uint32_t pitches[4], const uint32_t offsets[4],
+ const uint64_t modifier[4], uint32_t *buf_id,
+ uint32_t flags))
+
SDL_KMSDRM_SYM(int,drmModeRmFB,(int fd, uint32_t bufferId))
SDL_KMSDRM_SYM(drmModeFBPtr,drmModeGetFB,(int fd, uint32_t buf))
SDL_KMSDRM_SYM(drmModeCrtcPtr,drmModeGetCrtc,(int fd, uint32_t crtcId))
@@ -94,6 +107,11 @@ SDL_KMSDRM_SYM(struct gbm_device *,gbm_create_device,(int fd))
SDL_KMSDRM_SYM(unsigned int,gbm_bo_get_width,(struct gbm_bo *bo))
SDL_KMSDRM_SYM(unsigned int,gbm_bo_get_height,(struct gbm_bo *bo))
SDL_KMSDRM_SYM(uint32_t,gbm_bo_get_stride,(struct gbm_bo *bo))
+SDL_KMSDRM_SYM(uint32_t,gbm_bo_get_stride_for_plane,(struct gbm_bo *bo,int plane))
+SDL_KMSDRM_SYM(uint32_t,gbm_bo_get_format,(struct gbm_bo *bo))
+SDL_KMSDRM_SYM(uint32_t,gbm_bo_get_offset,(struct gbm_bo *bo, int plane))
+SDL_KMSDRM_SYM(int,gbm_bo_get_plane_count,(struct gbm_bo *bo))
+
SDL_KMSDRM_SYM(union gbm_bo_handle,gbm_bo_get_handle,(struct gbm_bo *bo))
SDL_KMSDRM_SYM(int,gbm_bo_write,(struct gbm_bo *bo, const void *buf, size_t count))
SDL_KMSDRM_SYM(struct gbm_device *,gbm_bo_get_device,(struct gbm_bo *bo))
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
index 8f417b8..3f16be9 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
@@ -150,16 +150,15 @@ get_driindex(void)
#define VOID2U64(x) ((uint64_t)(unsigned long)(x))
-static int add_connector_property(drmModeAtomicReq *req, uint32_t obj_id,
+static int add_connector_property(drmModeAtomicReq *req, struct connector *connector,
const char *name, uint64_t value)
{
- SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
unsigned int i;
int prop_id = 0;
- for (i = 0 ; i < dispdata->connector_props->count_props ; i++) {
- if (strcmp(dispdata->connector_props_info[i]->name, name) == 0) {
- prop_id = dispdata->connector_props_info[i]->prop_id;
+ for (i = 0 ; i < connector->props->count_props ; i++) {
+ if (strcmp(connector->props_info[i]->name, name) == 0) {
+ prop_id = connector->props_info[i]->prop_id;
break;
}
}
@@ -169,19 +168,18 @@ static int add_connector_property(drmModeAtomicReq *req, uint32_t obj_id,
return -EINVAL;
}
- return KMSDRM_drmModeAtomicAddProperty(req, obj_id, prop_id, value);
+ return KMSDRM_drmModeAtomicAddProperty(req, connector->connector->connector_id, prop_id, value);
}
-static int add_crtc_property(drmModeAtomicReq *req, uint32_t obj_id,
+static int add_crtc_property(drmModeAtomicReq *req, struct crtc *crtc,
const char *name, uint64_t value)
{
- SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
unsigned int i;
int prop_id = -1;
- for (i = 0 ; i < dispdata->crtc_props->count_props ; i++) {
- if (strcmp(dispdata->crtc_props_info[i]->name, name) == 0) {
- prop_id = dispdata->crtc_props_info[i]->prop_id;
+ for (i = 0 ; i < crtc->props->count_props ; i++) {
+ if (strcmp(crtc->props_info[i]->name, name) == 0) {
+ prop_id = crtc->props_info[i]->prop_id;
break;
}
}
@@ -191,19 +189,18 @@ static int add_crtc_property(drmModeAtomicReq *req, uint32_t obj_id,
return -EINVAL;
}
- return KMSDRM_drmModeAtomicAddProperty(req, obj_id, prop_id, value);
+ return KMSDRM_drmModeAtomicAddProperty(req, crtc->crtc->crtc_id, prop_id, value);
}
-static int add_plane_property(drmModeAtomicReq *req, uint32_t obj_id,
+static int add_plane_property(drmModeAtomicReq *req, struct plane *plane,
const char *name, uint64_t value)
{
- SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
unsigned int i;
int prop_id = -1;
- for (i = 0 ; i < dispdata->plane_props->count_props ; i++) {
- if (strcmp(dispdata->plane_props_info[i]->name, name) == 0) {
- prop_id = dispdata->plane_props_info[i]->prop_id;
+ for (i = 0 ; i < plane->props->count_props ; i++) {
+ if (strcmp(plane->props_info[i]->name, name) == 0) {
+ prop_id = plane->props_info[i]->prop_id;
break;
}
}
@@ -213,31 +210,11 @@ static int add_plane_property(drmModeAtomicReq *req, uint32_t obj_id,
return -EINVAL;
}
- return KMSDRM_drmModeAtomicAddProperty(req, obj_id, prop_id, value);
+ return KMSDRM_drmModeAtomicAddProperty(req, plane->plane->plane_id, prop_id, value);
}
#if 0
-static void get_plane_properties() {
- uint32_t i;
- dispdata->plane_ = drmModeObjectGetProperties(viddata->drm_fd,
- plane->plane_id, DRM_MODE_OBJECT_PLANE);
-
- if (!dispdata->type.props) {
- printf("could not get %s %u properties: %s\n",
- #type, id, strerror(errno));
- return NULL;
- }
-
- dispdata->type->props_info = calloc(dispdata->type.props->count_props,
- sizeof(*dispdata->type->props_info));
- for (i = 0; i < dispdata->type->props->count_props; i++) {
- dispdata->type.props_info[i] = drmModeGetProperty(viddata->drm_fd,
- dispdata->type->props->props[i]);
- }
- return props;
-}
-
void print_plane_info(_THIS, drmModePlanePtr plane)
{
char *plane_type;
@@ -275,7 +252,8 @@ void print_plane_info(_THIS, drmModePlanePtr plane)
}
- /* Remember that, to present a plane on screen, it has to be connected to a CRTC so the CRTC scans it,
+ /* Remember that to present a plane on screen, it has to be
+ connected to a CRTC so the CRTC scans it,
scales it, etc... and presents it on screen. */
/* Now we look for the CRTCs supported by the plane. */
@@ -310,7 +288,7 @@ void get_planes_info(_THIS)
}
printf("--Number of planes found: %d-- \n", plane_resources->count_planes);
- printf("--Usable CRTC that we have chosen: %d-- \n", dispdata->crtc->crtc_id);
+ printf("--Usable CRTC that we have chosen: %d-- \n", dispdata->crtc->crtc->crtc_id);
/* Iterate on all the available planes. */
for (i = 0; (i < plane_resources->count_planes); i++) {
@@ -333,22 +311,23 @@ void get_planes_info(_THIS)
#endif
-/* Get a plane that is PRIMARY (there's no guarantee that we have overlays in all hardware,
- so we can really only count on having one primary plane) and can use the CRTC we have chosen. */
-uint32_t get_plane_id(_THIS, drmModeRes *resources)
+/* Get the plane_id of a plane that is of the specified plane type (primary,
+ overlay, cursor...) and can use the CRTC we have chosen previously. */
+static uint32_t get_plane_id(_THIS, drmModeRes *resources, uint32_t plane_type)
{
drmModePlaneResPtr plane_resources;
uint32_t i, j;
uint32_t crtc_index = 0;
- int ret = -EINVAL;
- int found_primary = 0;
+ uint32_t ret = -EINVAL;
+ int found = 0;
SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
- /* Get the crtc_index for the current CRTC. Needed to find out if a plane supports the CRTC. */
+ /* Get the crtc_index for the current CRTC.
+ It's needed to find out if a plane supports the CRTC. */
for (i = 0; i < resources->count_crtcs; i++) {
- if (resources->crtcs[i] == dispdata->crtc_id) {
+ if (resources->crtcs[i] == dispdata->crtc->crtc->crtc_id) {
crtc_index = i;
break;
}
@@ -361,7 +340,7 @@ uint32_t get_plane_id(_THIS, drmModeRes *resources)
}
/* Iterate on all the available planes. */
- for (i = 0; (i < plane_resources->count_planes) && !found_primary; i++) {
+ for (i = 0; (i < plane_resources->count_planes) && !found; i++) {
uint32_t plane_id = plane_resources->planes[i];
@@ -378,15 +357,17 @@ uint32_t get_plane_id(_THIS, drmModeRes *resources)
plane_id, DRM_MODE_OBJECT_PLANE);
ret = plane_id;
- /* Search the plane props, to see if it's a primary plane. */
+ /* Iterate on the plane props to find the type of the plane,
+ to see if it's of the type we want. */
for (j = 0; j < props->count_props; j++) {
- drmModePropertyPtr p = KMSDRM_drmModeGetProperty(viddata->drm_fd, props->props[j]);
+ drmModePropertyPtr p = KMSDRM_drmModeGetProperty(viddata->drm_fd,
+ props->props[j]);
if ((strcmp(p->name, "type") == 0) &&
- (props->prop_values[j] == DRM_PLANE_TYPE_PRIMARY)) {
- /* found our primary plane, lets use that: */
- found_primary = 1;
+ (props->prop_values[j] == plane_type)) {
+ /* found our plane, use that: */
+ found = 1;
}
KMSDRM_drmModeFreeProperty(p);
@@ -403,56 +384,133 @@ uint32_t get_plane_id(_THIS, drmModeRes *resources)
return ret;
}
+/**********************************************************************************/
+/* The most important ATOMIC fn of the backend. */
+/* A PLANE reads a BUFFER, and a CRTC reads a PLANE and sends it's contents */
+/* over to a CONNECTOR->ENCODER system. */
+/* Think of a plane as a "frame" sorrounding a picture, where the "picture" */
+/* is the buffer, and we move the "frame" from a picture to another, */
+/* and the one that has the "frame" is the one sent over to the screen */
+/* via the CONNECTOR->ENCODER system. */
+/* Think of a PLANE as being "in the middle", it's the CENTRAL part */
+/* bewteen the CRTC and the BUFFER that is shown on screen. */
+/* What we do here is connect a PLANE to a CRTC and a BUFFER. */
+/* -ALWAYS set the CRTC_ID and FB_ID attribs of a plane at the same time, */
+/* meaning IN THE SAME atomic request. */
+/* -And NEVER destroy a GBM surface whose buffers are being read by a plane: */
+/* first, move the plane away from those buffers and ONLY THEN destroy the */
+/* buffers and/or the GBM surface containig them. */
+/**********************************************************************************/
void
-drm_atomic_request_pageflip(_THIS, uint32_t fb_id)
+drm_atomic_setbuffer(_THIS, struct plane *plane, uint32_t fb_id)
{
-
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
- uint32_t plane_id = dispdata->plane->plane_id;
/* Do we have a set of changes already in the making? If not, allocate a new one. */
if (!dispdata->atomic_req)
dispdata->atomic_req = KMSDRM_drmModeAtomicAlloc();
-
- add_plane_property(dispdata->atomic_req, plane_id, "FB_ID", fb_id);
- add_plane_property(dispdata->atomic_req, plane_id, "CRTC_ID", dispdata->crtc_id);
- add_plane_property(dispdata->atomic_req, plane_id, "SRC_X", 0);
- add_plane_property(dispdata->atomic_req, plane_id, "SRC_Y", 0);
- add_plane_property(dispdata->atomic_req, plane_id, "SRC_W", dispdata->mode.hdisplay << 16);
- add_plane_property(dispdata->atomic_req, plane_id, "SRC_H", dispdata->mode.vdisplay << 16);
- add_plane_property(dispdata->atomic_req, plane_id, "CRTC_X", 0);
- add_plane_property(dispdata->atomic_req, plane_id, "CRTC_Y", 0);
- add_plane_property(dispdata->atomic_req, plane_id, "CRTC_W", dispdata->mode.hdisplay);
- add_plane_property(dispdata->atomic_req, plane_id, "CRTC_H", dispdata->mode.vdisplay);
+
+ add_plane_property(dispdata->atomic_req, plane, "FB_ID", fb_id);
+ add_plane_property(dispdata->atomic_req, plane, "CRTC_ID", dispdata->crtc->crtc->crtc_id);
+ add_plane_property(dispdata->atomic_req, plane, "SRC_W", dispdata->mode.hdisplay << 16);
+ add_plane_property(dispdata->atomic_req, plane, "SRC_H", dispdata->mode.vdisplay << 16);
+ add_plane_property(dispdata->atomic_req, plane, "SRC_X", 0);
+ add_plane_property(dispdata->atomic_req, plane, "SRC_Y", 0);
+ add_plane_property(dispdata->atomic_req, plane, "CRTC_W", dispdata->mode.hdisplay);
+ add_plane_property(dispdata->atomic_req, plane, "CRTC_H", dispdata->mode.vdisplay);
+ add_plane_property(dispdata->atomic_req, plane, "CRTC_X", 0);
+ add_plane_property(dispdata->atomic_req, plane, "CRTC_Y", 0);
if (dispdata->kms_in_fence_fd != -1) {
- add_crtc_property(dispdata->atomic_req, dispdata->crtc_id, "OUT_FENCE_PTR",
+ add_crtc_property(dispdata->atomic_req, dispdata->crtc, "OUT_FENCE_PTR",
VOID2U64(&dispdata->kms_out_fence_fd));
- add_plane_property(dispdata->atomic_req, plane_id, "IN_FENCE_FD", dispdata->kms_in_fence_fd);
+ add_plane_property(dispdata->atomic_req, plane, "IN_FENCE_FD", dispdata->kms_in_fence_fd);
}
-
}
void
-drm_atomic_request_modeset(_THIS)
+drm_atomic_modeset(_THIS, int mode_index)
{
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
-
+ drmModeModeInfo mode;
uint32_t blob_id;
+ mode = dispdata->connector->connector->modes[mode_index];
+
/* Do we have a set of changes already in the making? If not, allocate a new one. */
if (!dispdata->atomic_req)
dispdata->atomic_req = KMSDRM_drmModeAtomicAlloc();
dispdata->atomic_flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
- add_connector_property(dispdata->atomic_req, dispdata->connector->connector_id, "CRTC_ID", dispdata->crtc_id);
- KMSDRM_drmModeCreatePropertyBlob(viddata->drm_fd, &dispdata->mode, sizeof(dispdata->mode), &blob_id);
- add_crtc_property(dispdata->atomic_req, dispdata->crtc_id, "MODE_ID", blob_id);
- add_crtc_property(dispdata->atomic_req, dispdata->crtc_id, "ACTIVE", 1);
+ add_connector_property(dispdata->atomic_req, dispdata->connector, "CRTC_ID", dispdata->crtc->crtc->crtc_id);
+ add_crtc_property(dispdata->atomic_req, dispdata->crtc, "ACTIVE", 1);
+ KMSDRM_drmModeCreatePropertyBlob(viddata->drm_fd, &mode, sizeof(mode), &blob_id);
+ add_crtc_property(dispdata->atomic_req, dispdata->crtc, "MODE_ID", blob_id);
+
+ /* Update video mode in use. */
+ dispdata->mode = mode;
+}
+
+int
+drm_atomic_setcursor(KMSDRM_CursorData *curdata, int x, int y)
+{
+ SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
+
+ /* Do we have a set of changes already in the making? If not, allocate a new one. */
+ if (!dispdata->atomic_req)
+ dispdata->atomic_req = KMSDRM_drmModeAtomicAlloc();
+
+ if (curdata)
+ {
+ KMSDRM_FBInfo *fb = KMSDRM_FBFromBO(curdata->video, curdata->bo);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "FB_ID", fb->fb_id);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_ID", dispdata->crtc->crtc->crtc_id);
+
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "SRC_X", 0);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "SRC_Y", 0);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "SRC_W", curdata->w << 16);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "SRC_H", curdata->h << 16);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_X", x);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_Y", y);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_W", curdata->w);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_H", curdata->h);
+ }
+ else
+ {
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "FB_ID", 0);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_ID", 0);
+
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "SRC_X", 0);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "SRC_Y", 0);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "SRC_W", 0);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "SRC_H", 0);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_W", 0);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_H", 0);
+ }
+
+ /* GPU <-> DISPLAY synchronization is done ON the display_plane,
+ so no need to set any fence props here, we do that only on the main
+ display plane. */
+
+ return 0;
}
+int
+drm_atomic_movecursor(KMSDRM_CursorData *curdata, int x, int y)
+{
+ SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
+
+ /* Do we have a set of changes already in the making? If not, allocate a new one. */
+ if (!dispdata->atomic_req)
+ dispdata->atomic_req = KMSDRM_drmModeAtomicAlloc();
+
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_X", x - curdata->hot_x);
+ add_plane_property(dispdata->atomic_req, dispdata->cursor_plane, "CRTC_Y", y - curdata->hot_y);
+
+ return 0;
+}
int drm_atomic_commit(_THIS, SDL_bool blocking)
{
@@ -464,11 +522,14 @@ int drm_atomic_commit(_THIS, SDL_bool blocking)
dispdata->atomic_flags |= DRM_MODE_ATOMIC_NONBLOCK;
/* Never issue a new atomic commit if previous has not yet completed, or it will error. */
- drm_atomic_wait_pending(_this);
+ drm_atomic_waitpending(_this);
ret = KMSDRM_drmModeAtomicCommit(viddata->drm_fd, dispdata->atomic_req, dispdata->atomic_flags, NULL);
- if (ret)
+ if (ret) {
+ //SDL_SetError("Atomic commit failed, returned %d.", ret);
+ printf("ATOMIC COMMIT FAILED: %d.\n", ret);
goto out;
+ }
if (dispdata->kms_in_fence_fd != -1) {
close(dispdata->kms_in_fence_fd);
@@ -484,7 +545,7 @@ out:
}
void
-drm_atomic_wait_pending(_THIS)
+drm_atomic_waitpending(_THIS)
{
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
@@ -547,7 +608,7 @@ KMSDRM_CreateDevice(int devindex)
}
if (devindex < 0) {
- SDL_SetError("devindex (%d) must be between 0 and 99.\n", devindex);
+ SDL_SetError("devindex (%d) must be between 0 and 99.", devindex);
return NULL;
}
@@ -644,9 +705,10 @@ KMSDRM_FBInfo *
KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo)
{
SDL_VideoData *viddata = ((SDL_VideoData *)_this->driverdata);
- unsigned w,h;
+ unsigned width, height;
+ uint32_t format, strides[4] = {0}, handles[4] = {0}, offsets[4] = {0};
+ const int num_planes = KMSDRM_gbm_bo_get_plane_count(bo);
int ret;
- Uint32 stride, handle;
/* Check for an existing framebuffer */
KMSDRM_FBInfo *fb_info = (KMSDRM_FBInfo *)KMSDRM_gbm_bo_get_user_data(bo);
@@ -655,8 +717,8 @@ KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo)
return fb_info;
}
- /* Create a structure that contains enough info to remove the framebuffer
- when the backing buffer is destroyed */
+ /* Create a structure that contains the info about framebuffer
+ that we need to use it. */
fb_info = (KMSDRM_FBInfo *)SDL_calloc(1, sizeof(KMSDRM_FBInfo));
if (!fb_info) {
@@ -666,22 +728,30 @@ KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo)
fb_info->drm_fd = viddata->drm_fd;
- /* Create framebuffer object for the buffer */
- w = KMSDRM_gbm_bo_get_width(bo);
- h = KMSDRM_gbm_bo_get_height(bo);
- stride = KMSDRM_gbm_bo_get_stride(bo);
- handle = KMSDRM_gbm_bo_get_handle(bo).u32;
- ret = KMSDRM_drmModeAddFB(viddata->drm_fd, w, h, 24, 32, stride, handle,
- &fb_info->fb_id);
+ width = KMSDRM_gbm_bo_get_width(bo);
+ height = KMSDRM_gbm_bo_get_height(bo);
+ format = KMSDRM_gbm_bo_get_format(bo);
+
+ for (int i = 0; i < num_planes; i++) {
+ strides[i] = KMSDRM_gbm_bo_get_stride_for_plane(bo, i);
+ handles[i] = KMSDRM_gbm_bo_get_handle(bo).u32;
+ offsets[i] = KMSDRM_gbm_bo_get_offset(bo, i);
+ }
+
+ /* Create framebuffer object for the buffer.
+ It's VERY important to note that fb_id is what we ise to set the FB_ID prop of a plane
+ when using the ATOMIC interface, and we get fb_id it here. */
+ ret = KMSDRM_drmModeAddFB2(viddata->drm_fd, width, height, format,
+ handles, strides, offsets, &fb_info->fb_id, 0);
+
if (ret) {
SDL_free(fb_info);
return NULL;
}
- SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "New DRM FB (%u): %ux%u, stride %u from BO %p",
- fb_info->fb_id, w, h, stride, (void *)bo);
-
- /* Associate our DRM framebuffer with this buffer object */
+ /* Set the userdata pointer. This pointer is used to store custom data that we need
+ to access in the future, so we store the fb_id here for later use, because fb_id is
+ what we need to set the FB_ID property of a plane when using the ATOMIC interface. */
KMSDRM_gbm_bo_set_user_data(bo, fb_info, KMSDRM_FBDestroyCallback);
return fb_info;
@@ -691,13 +761,20 @@ KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo)
/* SDL Video and Display initialization/handling functions */
/* _this is a SDL_VideoDevice * */
/*****************************************************************************/
+
static void
KMSDRM_DestroySurfaces(_THIS, SDL_Window * window)
{
SDL_WindowData *windata = (SDL_WindowData *)window->driverdata;
+ SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
- /* Wait for pending atomic commit (like pageflips requested in SwapWindow) to complete. */
- drm_atomic_wait_pending(_this);
+ /* CAUTION: Before destroying the GBM ane EGL surfaces, we must disconnect the display plane
+ from the GBM surface buffer it's reading, and make it read the original buffer stored
+ on the CRTC while we recreate the GBM surface.
+ The plane will be pointed to one of the buffers of the new GBM surface on the next pageflip
+ (if there is another pageflip: we could arrive here because we are exiting the program...). */
+ drm_atomic_setbuffer(_this, dispdata->display_plane, dispdata->crtc->crtc->buffer_id);
+ drm_atomic_commit(_this, SDL_TRUE);
if (windata->bo) {
KMSDRM_gbm_surface_release_buffer(windata->gs, windata->bo);
@@ -732,7 +809,7 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
SDL_DisplayData *dispdata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
Uint32 width = dispdata->mode.hdisplay;
Uint32 height = dispdata->mode.vdisplay;
- Uint32 surface_fmt = GBM_FORMAT_XRGB8888;
+ Uint32 surface_fmt = GBM_FORMAT_ARGB8888;
Uint32 surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
#if SDL_VIDEO_OPENGL_EGL
EGLContext egl_context;
@@ -767,9 +844,6 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
windata->egl_surface_dirty = SDL_FALSE;
#endif
- /* Add modeset request to the current change request list. */
- drm_atomic_request_modeset(_this);
-
return 0;
}
@@ -783,8 +857,20 @@ KMSDRM_VideoInit(_THIS)
drmModeEncoder *encoder = NULL;
char devname[32];
SDL_VideoDisplay display = {0};
+ uint32_t display_plane_id, cursor_plane_id;
dispdata = (SDL_DisplayData *) SDL_calloc(1, sizeof(SDL_DisplayData));
+ dispdata->display_plane = calloc(1, sizeof(*dispdata->display_plane));
+ dispdata->cursor_plane = calloc(1, sizeof(*dispdata->cursor_plane));
+ dispdata->crtc = calloc(1, sizeof(*dispdata->crtc));
+ dispdata->connector = calloc(1, sizeof(*dispdata->connector));
+
+ dispdata->atomic_flags = 0;
+ dispdata->atomic_req = NULL;
+ dispdata->kms_fence = NULL;
+ dispdata->gpu_fence = NULL;
+ dispdata->kms_out_fence_fd = -1;
+ dispdata->kms_in_fence_fd = -1;
if (!dispdata) {
return SDL_OutOfMemory();
@@ -829,15 +915,14 @@ KMSDRM_VideoInit(_THIS)
if (conn->connection == DRM_MODE_CONNECTED && conn->count_modes) {
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Found connector %d with %d modes.",
conn->connector_id, conn->count_modes);
- dispdata->connector = conn;
- dispdata->connector_id = conn->connector_id;
+ dispdata->connector->connector = conn;
break;
}
KMSDRM_drmModeFreeConnector(conn);
}
- if (!dispdata->connector) {
+ if (!dispdata->connector->connector) {
ret = SDL_SetError("No currently active connector found.");
goto cleanup;
}
@@ -850,7 +935,7 @@ KMSDRM_VideoInit(_THIS)
continue;
}
- if (encoder->encoder_id == dispdata->connector->encoder_id) {
+ if (encoder->encoder_id == dispdata->connector->connector->encoder_id) {
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Found encoder %d.", encoder->encoder_id);
break;
}
@@ -868,13 +953,13 @@ KMSDRM_VideoInit(_THIS)
continue;
}
- for (j = 0; j < dispdata->connector->count_encoders; j++) {
- if (dispdata->connector->encoders[j] == encoder->encoder_id) {
+ for (j = 0; j < dispdata->connector->connector->count_encoders; j++) {
+ if (dispdata->connector->connector->encoders[j] == encoder->encoder_id) {
break;
}
}
- if (j != dispdata->connector->count_encoders) {
+ if (j != dispdata->connector->connector->count_encoders) {
break;
}
@@ -891,58 +976,34 @@ KMSDRM_VideoInit(_THIS)
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Found encoder %d.", encoder->encoder_id);
/* Try to find a CRTC connected to this encoder */
- dispdata->crtc = KMSDRM_drmModeGetCrtc(viddata->drm_fd, encoder->crtc_id);
+ dispdata->crtc->crtc = KMSDRM_drmModeGetCrtc(viddata->drm_fd, encoder->crtc_id);
/* If no CRTC was connected to the encoder, find the first CRTC that is supported by the encoder, and use that. */
- if (!dispdata->crtc) {
+ if (!dispdata->crtc->crtc) {
for (int i = 0; i < resources->count_crtcs; i++) {
if (encoder->possible_crtcs & (1 << i)) {
encoder->crtc_id = resources->crtcs[i];
- dispdata->crtc = KMSDRM_drmModeGetCrtc(viddata->drm_fd, encoder->crtc_id);
+ dispdata->crtc->crtc = KMSDRM_drmModeGetCrtc(viddata->drm_fd, encoder->crtc_id);
break;
}
}
}
- if (!dispdata->crtc) {
+ if (!dispdata->crtc->crtc) {
ret = SDL_SetError("No CRTC found.");
goto cleanup;
}
- /* SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Saved crtc_id %u, fb_id %u, (%u,%u), %ux%u",
- dispdata->crtc->crtc_id, dispdata->crtc->buffer_id, dispdata->crtc->x,
- dispdata->crtc->y, dispdata->crtc->width, dispdata->crtc->height);
- */
-
- dispdata->crtc_id = dispdata->crtc->crtc_id;
- dispdata->crtc = KMSDRM_drmModeGetCrtc(viddata->drm_fd, dispdata->crtc_id);
-
- /****************/
- /* Atomic block */
- /****************/
-
- /* Initialize the atomic dispdata members. */
- dispdata->atomic_flags = 0;
- dispdata->atomic_req = NULL;
- dispdata->kms_fence = NULL;
- dispdata->gpu_fence = NULL;
- dispdata->kms_out_fence_fd = -1,
- dispdata->kms_in_fence_fd = -1,
-
- /*********************/
- /* Atomic block ends */
- /*********************/
-
/* Figure out the default mode to be set. If the current CRTC's mode isn't
valid, select the first mode supported by the connector
FIXME find first mode that specifies DRM_MODE_TYPE_PREFERRED */
- dispdata->mode = dispdata->crtc->mode;
+ dispdata->mode = dispdata->crtc->crtc->mode;
- if (dispdata->crtc->mode_valid == 0) {
+ if (dispdata->crtc->crtc->mode_valid == 0) {
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO,
"Current mode is invalid, selecting connector's mode #0.");
- dispdata->mode = dispdata->connector->modes[0];
+ dispdata->mode = dispdata->connector->connector->modes[0];
}
/* Setup the single display that's available */
@@ -963,8 +1024,8 @@ KMSDRM_VideoInit(_THIS)
so look for it in the DRM modes array.
This is needed because SetDisplayMode() uses the mode index, and some programs
change to fullscreen desktop video mode as they start. */
- for (int i = 0; i < dispdata->connector->count_modes; i++) {
- if (!SDL_memcmp(dispdata->connector->modes + i, &dispdata->crtc->mode, sizeof(drmModeModeInfo))) {
+ for (int i = 0; i < dispdata->connector->connector->count_modes; i++) {
+ if (!SDL_memcmp(dispdata->connector->connector->modes + i, &dispdata->crtc->crtc->mode, sizeof(drmModeModeInfo))) {
SDL_DisplayModeData *modedata = SDL_calloc(1, sizeof(SDL_DisplayModeData));
if (modedata) {
modedata->mode_index = i;
@@ -993,58 +1054,79 @@ KMSDRM_VideoInit(_THIS)
goto cleanup;
}
- dispdata->plane_id = get_plane_id(_this, resources);
- if (!dispdata->plane_id) {
- ret = SDL_SetError("could not find a suitable plane.");
- goto cleanup;
- }
-
- dispdata->plane = KMSDRM_drmModeGetPlane(viddata->drm_fd, dispdata->plane_id);
-
/* Use this if you ever need to see info on all available planes. */
#if 0
get_planes_info(_this);
#endif
- /* We only do single plane to single crtc to single connector, no
- * fancy multi-monitor or multi-plane stuff. So just grab the
- * plane/crtc/connector property info for one of each:
- */
+ /* Get DISPLAY PLANE (simply a primary plane that can use our CRTC).
+ It has to be a PRIMARY plane because there's no guarantee that
+ we have overlays in every hardware: we can really only count
+ on having one primary plane). */
+ display_plane_id = get_plane_id(_this, resources, DRM_PLANE_TYPE_PRIMARY);
+ if (!display_plane_id) {
+ ret = SDL_SetError("could not find a suitable display plane.");
+ goto cleanup;
+ }
+ dispdata->display_plane->plane = KMSDRM_drmModeGetPlane(viddata->drm_fd, display_plane_id);
+
+ /* Get DISPLAY PLANE properties */
+ dispdata->display_plane->props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd,
+ dispdata->display_plane->plane->plane_id, DRM_MODE_OBJECT_PLANE);
- /* Get PLANE properties */
- dispdata->plane_props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd,
- dispdata->plane_id, DRM_MODE_OBJECT_PLANE);
+ dispdata->display_plane->props_info = SDL_calloc(dispdata->display_plane->props->count_props,
+ sizeof(dispdata->display_plane->props_info));
- dispdata->plane_props_info = SDL_calloc(dispdata->plane_props->count_props,
- sizeof(dispdata->plane_props_info));
+ for (int i = 0; i < dispdata->display_plane->props->count_props; i++) {
+ dispdata->display_plane->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
+ dispdata->display_plane->props->props[i]);
+ }
- for (int i = 0; i < dispdata->plane_props->count_props; i++) {
- dispdata->plane_props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
- dispdata->plane_props->props[i]);
+ /* Get CURSOR PLANE (simply a cursor plane that can use our CRTC).
+ Not having a cursor plane available should not be fatal, just throw an error.
+ All functions using this plane should first test if it exists. */
+ cursor_plane_id = get_plane_id(_this, resources, DRM_PLANE_TYPE_CURSOR);
+ if (!cursor_plane_id) {
+ SDL_SetError("could not find a suitable cursor plane.");
+ }
+ dispdata->cursor_plane->plane = KMSDRM_drmModeGetPlane(viddata->drm_fd, cursor_plane_id);
+
+ /* Get CURSOR PLANE properties */
+ if (dispdata->cursor_plane->plane) {
+ dispdata->cursor_plane->props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd,
+ dispdata->cursor_plane->plane->plane_id, DRM_MODE_OBJECT_PLANE);
+
+ dispdata->cursor_plane->props_info = SDL_calloc(dispdata->cursor_plane->props->count_props,
+ sizeof(dispdata->cursor_plane->props_info));
+
+ for (int i = 0; i < dispdata->cursor_plane->props->count_props; i++) {
+ dispdata->cursor_plane->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
+ dispdata->cursor_plane->props->props[i]);
+ }
}
/* Get CRTC properties */
- dispdata->crtc_props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd,
- dispdata->crtc_id, DRM_MODE_OBJECT_CRTC);
+ dispdata->crtc->props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd,
+ dispdata->crtc->crtc->crtc_id, DRM_MODE_OBJECT_CRTC);
- dispdata->crtc_props_info = SDL_calloc(dispdata->crtc_props->count_props,
- sizeof(dispdata->crtc_props_info));
+ dispdata->crtc->props_info = SDL_calloc(dispdata->crtc->props->count_props,
+ sizeof(dispdata->crtc->props_info));
- for (int i = 0; i < dispdata->crtc_props->count_props; i++) {
- dispdata->crtc_props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
- dispdata->crtc_props->props[i]);
+ for (int i = 0; i < dispdata->crtc->props->count_props; i++) {
+ dispdata->crtc->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
+ dispdata->crtc->props->props[i]);
}
/* Get connector properties */
- dispdata->connector_props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd,
- dispdata->connector_id, DRM_MODE_OBJECT_CONNECTOR);
+ dispdata->connector->props = KMSDRM_drmModeObjectGetProperties(viddata->drm_fd,
+ dispdata->connector->connector->connector_id, DRM_MODE_OBJECT_CONNECTOR);
- dispdata->connector_props_info = SDL_calloc(dispdata->connector_props->count_props,
- sizeof(dispdata->connector_props_info));
+ dispdata->connector->props_info = SDL_calloc(dispdata->connector->props->count_props,
+ sizeof(dispdata->connector->props_info));
- for (int i = 0; i < dispdata->connector_props->count_props; i++) {
- dispdata->connector_props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
- dispdata->connector_props->props[i]);
+ for (int i = 0; i < dispdata->connector->props->count_props; i++) {
+ dispdata->connector->props_info[i] = KMSDRM_drmModeGetProperty(viddata->drm_fd,
+ dispdata->connector->props->props[i]);
}
/*********************/
@@ -1055,29 +1137,22 @@ KMSDRM_VideoInit(_THIS)
SDL_EVDEV_Init();
#endif
- if (encoder)
- KMSDRM_drmModeFreeEncoder(encoder);
- if (resources)
- KMSDRM_drmModeFreeResources(resources);
-
KMSDRM_InitMouse(_this);
- return ret;
-
cleanup:
+
if (encoder)
KMSDRM_drmModeFreeEncoder(encoder);
if (resources)
KMSDRM_drmModeFreeResources(resources);
-
if (ret != 0) {
/* Error (complete) cleanup */
- if (dispdata->connector) {
- KMSDRM_drmModeFreeConnector(dispdata->connector);
+ if (dispdata->connector->connector) {
+ KMSDRM_drmModeFreeConnector(dispdata->connector->connector);
dispdata->connector = NULL;
}
- if (dispdata->crtc) {
- KMSDRM_drmModeFreeCrtc(dispdata->crtc);
+ if (dispdata->crtc->crtc) {
+ KMSDRM_drmModeFreeCrtc(dispdata->crtc->crtc);
dispdata->crtc = NULL;
}
if (viddata->gbm_dev) {
@@ -1090,6 +1165,7 @@ cleanup:
}
SDL_free(dispdata);
}
+
return ret;
}
@@ -1108,16 +1184,19 @@ KMSDRM_VideoQuit(_THIS)
viddata->num_windows = 0;
/* Restore original buffer. */
- if (viddata->drm_fd >= 0 && dispdata && dispdata->connector && dispdata->crtc) {
+ if (viddata->drm_fd >= 0 && dispdata && dispdata->connector->connector && dispdata->crtc->crtc) {
/***********************************************************/
/* Atomic block for original crt->buffer restoration */
/***********************************************************/
/* Issue sync/blocking atomic commit that points crtc to original buffer.
- SDL_video has already called SetDisplayMode() to set the original display mode at this point.
- We are not doing pageflips anymore, so we can't rely on the SwapWindow() atomic commit
- so we are explicitly calling it here. */
- drm_atomic_request_pageflip(_this, dispdata->crtc->buffer_id);
+ SDL_video has already called SetDisplayMode() to set the original
+ display mode at this point.
+ We are not doing pageflips anymore, so we can't rely on the SwapWindow()
+ atomic_commit() call, hence we are explicitly calling atomic_commit() here.
+ */
+
+ drm_atomic_setbuffer(_this, dispdata->display_plane, dispdata->crtc->crtc->buffer_id);
ret = drm_atomic_commit(_this, SDL_TRUE);
/*********************/
@@ -1133,32 +1212,32 @@ KMSDRM_VideoQuit(_THIS)
SDL_GL_UnloadLibrary();
}
- /**************************************************/
- /* Atomic block for freeing up property pointers. */
- /**************************************************/
- if (dispdata && dispdata->connector_props_info) {
- SDL_free(dispdata->connector_props_info);
- dispdata->connector_props_info = NULL;
+ /**********************************************/
+ /* Atomic block for freeing up property sets. */
+ /**********************************************/
+ if (dispdata && dispdata->connector->props_info) {
+ SDL_free(dispdata->connector->props_info);
+ dispdata->connector->props_info = NULL;
}
- if (dispdata && dispdata->crtc_props_info) {
- SDL_free(dispdata->crtc_props_info);
- dispdata->crtc_props_info = NULL;
+ if (dispdata && dispdata->crtc->props_info) {
+ SDL_free(dispdata->crtc->props_info);
+ dispdata->crtc->props_info = NULL;
}
- if (dispdata && dispdata->plane_props_info) {
- SDL_free(dispdata->plane_props_info);
- dispdata->plane_props_info = NULL;
+ if (dispdata && dispdata->display_plane->props_info) {
+ SDL_free(dispdata->display_plane->props_info);
+ dispdata->display_plane->props_info = NULL;
}
/*********************/
/* Atomic block ends */
/*********************/
- if (dispdata && dispdata->connector) {
- KMSDRM_drmModeFreeConnector(dispdata->connector);
+ if (dispdata && dispdata->connector->connector != NULL) {
+ KMSDRM_drmModeFreeConnector(dispdata->connector->connector);
dispdata->connector = NULL;
}
- if (dispdata && dispdata->crtc) {
- KMSDRM_drmModeFreeCrtc(dispdata->crtc);
- dispdata->crtc = NULL;
+ if (dispdata && dispdata->crtc->crtc != NULL) {
+ KMSDRM_drmModeFreeCrtc(dispdata->crtc->crtc);
+ dispdata->crtc->crtc = NULL;
}
if (viddata->gbm_dev) {
KMSDRM_gbm_device_destroy(viddata->gbm_dev);
@@ -1178,7 +1257,7 @@ void
KMSDRM_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
{
SDL_DisplayData *dispdata = display->driverdata;
- drmModeConnector *conn = dispdata->connector;
+ drmModeConnector *conn = dispdata->connector->connector;
SDL_DisplayMode mode;
for (int i = 0; i < conn->count_modes; i++) {
@@ -1204,24 +1283,21 @@ int
KMSDRM_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
{
SDL_VideoData *viddata = (SDL_VideoData *)_this->driverdata;
- SDL_DisplayData *dispdata = (SDL_DisplayData *)display->driverdata;
SDL_DisplayModeData *modedata = (SDL_DisplayModeData *)mode->driverdata;
- drmModeConnector *conn = dispdata->connector;
if (!modedata) {
return SDL_SetError("Mode doesn't have an associated index");
}
- dispdata->mode = conn->modes[modedata->mode_index];
- drm_atomic_request_modeset(_this);
+ /* Set new videomode for the connector in use. */
+ drm_atomic_modeset(_this, modedata->mode_index);
for (int i = 0; i < viddata->num_windows; i++) {
SDL_Window *window = viddata->windows[i];
/* Re-create GBM and EGL surfaces everytime we change the display mode. */
- if (KMSDRM_CreateSurfaces(_this, window)) {
- return -1;
- }
+ KMSDRM_DestroySurfaces(_this, window);
+ KMSDRM_CreateSurfaces(_this, window);
/* Tell app about the resize */
SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, mode->w, mode->h);
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.h b/src/video/kmsdrm/SDL_kmsdrmvideo.h
index 4812e02..8c249fe 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.h
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.h
@@ -54,37 +54,37 @@ typedef struct SDL_DisplayModeData
int mode_index;
} SDL_DisplayModeData;
+struct plane {
+ drmModePlane *plane;
+ drmModeObjectProperties *props;
+ drmModePropertyRes **props_info;
+};
+
+struct crtc {
+ drmModeCrtc *crtc;
+ drmModeObjectProperties *props;
+ drmModePropertyRes **props_info;
+};
+
+struct connector {
+ drmModeConnector *connector;
+ drmModeObjectProperties *props;
+ drmModePropertyRes **props_info;
+};
typedef struct SDL_DisplayData
{
-
drmModeModeInfo mode;
- uint32_t plane_id;
- uint32_t cusor_plane_id;
- uint32_t crtc_id;
- uint32_t connector_id;
uint32_t atomic_flags;
/* All changes will be requested via this one and only atomic request,
that will be sent to the kernel in the one and only atomic_commit() call
that takes place in SwapWindow(). */
drmModeAtomicReq *atomic_req;
-
- drmModePlane *plane;
- drmModeObjectProperties *plane_props;
- drmModePropertyRes **plane_props_info;
-
- drmModePlane *cursor_plane;
- drmModeObjectProperties *cursor_plane_props;
- drmModePropertyRes **cursor_plane_props_info;
-
- drmModeCrtc *crtc;
- drmModeObjectProperties *crtc_props;
- drmModePropertyRes **crtc_props_info;
-
- drmModeConnector *connector;
- drmModeObjectProperties *connector_props;
- drmModePropertyRes **connector_props_info;
+ struct plane *display_plane;
+ struct plane *cursor_plane;
+ struct crtc *crtc;
+ struct connector *connector;
int kms_in_fence_fd;
int kms_out_fence_fd;
@@ -114,15 +114,31 @@ typedef struct KMSDRM_FBInfo
uint32_t fb_id; /* DRM framebuffer ID */
} KMSDRM_FBInfo;
+/* Driver-side info about the cursor. It's here so we know about it in SDL_kmsdrmvideo.c
+ because drm_atomic_setcursor() receives a KMSDRM_CursorData parameter as a cursor. */
+typedef struct _KMSDRM_CursorData
+{
+ struct gbm_bo *bo;
+ uint32_t crtc_id;
+ int hot_x, hot_y;
+ int w, h;
+ /* The video devide implemented on SDL_kmsdrmvideo.c
+ * to be used as _THIS pointer in SDL_kmsdrmvideo.c
+ * functions that need it. */
+ SDL_VideoDevice *video;
+} KMSDRM_CursorData;
+
/* Helper functions */
int KMSDRM_CreateSurfaces(_THIS, SDL_Window * window);
KMSDRM_FBInfo *KMSDRM_FBFromBO(_THIS, struct gbm_bo *bo);
-/* Atomic functions that are used from SDL_kmsdrmopengles.c */
-void drm_atomic_request_modeset(_THIS);
-void drm_atomic_request_pageflip(_THIS, uint32_t fb_id);
+/* Atomic functions that are used from SDL_kmsdrmopengles.c and SDL_kmsdrmmouse.c */
+void drm_atomic_modeset(_THIS, int mode_index);
+void drm_atomic_setbuffer(_THIS, struct plane *plane, uint32_t fb_id);
+void drm_atomic_waitpending(_THIS);
int drm_atomic_commit(_THIS, SDL_bool blocking);
-void drm_atomic_wait_pending(_THIS);
+int drm_atomic_setcursor(KMSDRM_CursorData *curdata, int x, int y);
+int drm_atomic_movecursor(KMSDRM_CursorData *curdata, int x, int y);
/****************************************************************************/
/* SDL_VideoDevice functions declaration */