rooty/rpi-vk-driver
1
0
Fork 0
mirror of https://github.com/Yours3lf/rpi-vk-driver.git synced 2025-01-18 10:52:14 +01:00
Code Issues Releases Wiki Activity

fixed modesetting, now it's async! vsync to be added later

Browse Source
This commit is contained in:
yours3lf 2020-05-19 17:42:57 +01:00
parent ae1fbc2698
commit a1be8d9e78
3 changed files with 103 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
driver/modeset.c
View File

@ -149,6 +149,65 @@ void modeset_enum_modes_for_display(int fd, uint32_t display, uint32_t* numModes
tmpModes[tmpNumModes].resWidth = connPtr->modes[c].hdisplay;
tmpModes[tmpNumModes].resHeight = connPtr->modes[c].vdisplay;
// char* typestr = 0;
// switch(connPtr->modes[c].type)
// {
// case DRM_MODE_TYPE_BUILTIN:
// typestr = "DRM_MODE_TYPE_BUILTIN";
// break;
// case DRM_MODE_TYPE_CLOCK_C:
// typestr = "DRM_MODE_TYPE_CLOCK_C";
// break;
// case DRM_MODE_TYPE_CRTC_C:
// typestr = "DRM_MODE_TYPE_CRTC_C";
// break;
// case DRM_MODE_TYPE_PREFERRED:
// typestr = "DRM_MODE_TYPE_PREFERRED";
// break;
// case DRM_MODE_TYPE_DEFAULT:
// typestr = "DRM_MODE_TYPE_DEFAULT";
// break;
// case DRM_MODE_TYPE_USERDEF:
// typestr = "DRM_MODE_TYPE_USERDEF";
// break;
// case DRM_MODE_TYPE_DRIVER:
// typestr = "DRM_MODE_TYPE_DRIVER";
// break;
// default:
// typestr = "UNKNOWN";
// break;
// }
// fprintf(stderr, "\nflags ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_PHSYNC) fprintf(stderr, "DRM_MODE_FLAG_PHSYNC ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_NHSYNC) fprintf(stderr, "DRM_MODE_FLAG_NHSYNC ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_PVSYNC) fprintf(stderr, "DRM_MODE_FLAG_PVSYNC ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_NVSYNC) fprintf(stderr, "DRM_MODE_FLAG_NVSYNC ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_INTERLACE) fprintf(stderr, "DRM_MODE_FLAG_INTERLACE ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_DBLSCAN) fprintf(stderr, "DRM_MODE_FLAG_DBLSCAN ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_CSYNC) fprintf(stderr, "DRM_MODE_FLAG_CSYNC ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_PCSYNC) fprintf(stderr, "DRM_MODE_FLAG_PCSYNC ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_NCSYNC) fprintf(stderr, "DRM_MODE_FLAG_NCSYNC ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_HSKEW) fprintf(stderr, "DRM_MODE_FLAG_HSKEW ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_BCAST) fprintf(stderr, "DRM_MODE_FLAG_BCAST ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_PIXMUX) fprintf(stderr, "DRM_MODE_FLAG_PIXMUX ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_DBLCLK) fprintf(stderr, "DRM_MODE_FLAG_DBLCLK ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_CLKDIV2) fprintf(stderr, "DRM_MODE_FLAG_CLKDIV2 ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_MASK) fprintf(stderr, "DRM_MODE_FLAG_3D_MASK ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_NONE) fprintf(stderr, "DRM_MODE_FLAG_3D_NONE ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_FRAME_PACKING) fprintf(stderr, "DRM_MODE_FLAG_3D_FRAME_PACKING ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE) fprintf(stderr, "DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_LINE_ALTERNATIVE) fprintf(stderr, "DRM_MODE_FLAG_3D_LINE_ALTERNATIVE ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL) fprintf(stderr, "DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_L_DEPTH) fprintf(stderr, "DRM_MODE_FLAG_3D_L_DEPTH ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH) fprintf(stderr, "DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_TOP_AND_BOTTOM) fprintf(stderr, "DRM_MODE_FLAG_3D_TOP_AND_BOTTOM ");
// if(connPtr->modes[c].flags & DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF) fprintf(stderr, "DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF ");
// fprintf(stderr, "\nclock %u vrefresh %u type %s\n", connPtr->modes[c].clock, connPtr->modes[c].vrefresh, typestr);
// fprintf(stderr, "hdisplay %u hsync_start %u hsync_end %u htotal %u hskew %u\n", connPtr->modes[c].hdisplay, connPtr->modes[c].hsync_start, connPtr->modes[c].hsync_end, connPtr->modes[c].htotal, connPtr->modes[c].hskew);
// fprintf(stderr, "vdisplay %u vsync_start %u vsync_end %u vtotal %u vscan %u\n", connPtr->modes[c].vdisplay, connPtr->modes[c].vsync_start, connPtr->modes[c].vsync_end, connPtr->modes[c].vtotal, connPtr->modes[c].vscan);
tmpNumModes++;
assert(tmpNumModes < 1024);
@ -272,16 +331,18 @@ void modeset_present(int fd, _image *buf, modeset_display_surface* surface)
}
}
int ret = drmModeSetCrtc(fd, surface->crtc->crtc_id, buf->fb, 0, 0, &surface->connector->connector_id, 1, &surface->connector->modes[surface->modeID]);
if(ret)
{
fprintf(stderr, "cannot flip CRTC for connector %u (%d): %m\n",
surface->connector->connector_id, errno);
}
saved_state_guard = 0;
}
//fprintf(stderr, "present connector id %i, crtc id %i, fb %i\n", surface->connector->connector_id, surface->crtc->crtc_id, buf->fb);
int ret = drmModeSetCrtc(fd, surface->crtc->crtc_id, buf->fb, 0, 0, &surface->connector->connector_id, 1, &surface->connector->modes[surface->modeID]);
if(ret)
{
fprintf(stderr, "cannot flip CRTC for connector %u (%d): %m\n",
surface->connector->connector_id, errno);
}
//TODO add vsync support eventually
drmModePageFlip(fd, surface->crtc->crtc_id, buf->fb, 0, 0);
//modeset_debug_print(fd);
}

34
driver/profiler.c
View File

@ -14,6 +14,8 @@ extern "C" {
static profiler* globalProfiler = 0;
static atomic_int globalProfilerGuard = 0;
#define SKIPPED_FRAMES 100
void initProfiler()
{
if(!globalProfiler)
@ -81,13 +83,16 @@ void endMeasure(void* func)
assert(data->inProgress);
data->inProgress = 0;
if((end.tv_nsec - data->start.tv_nsec) < 0)
if(globalProfiler->frameCounter > SKIPPED_FRAMES)
{
data->timeSpent += (end.tv_sec - data->start.tv_sec - 1) * 0.001 + (1000000000 + end.tv_nsec - data->start.tv_nsec) / MILLION;
}
else
{
data->timeSpent += (end.tv_sec - data->start.tv_sec) * 0.001 + (end.tv_nsec - data->start.tv_nsec) / MILLION;
if((end.tv_nsec - data->start.tv_nsec) < 0)
{
data->timeSpent += (end.tv_sec - data->start.tv_sec - 1) * 0.001 + (1000000000 + end.tv_nsec - data->start.tv_nsec) / MILLION;
}
else
{
data->timeSpent += (end.tv_sec - data->start.tv_sec) * 0.001 + (end.tv_nsec - data->start.tv_nsec) / MILLION;
}
}
globalProfilerGuard = 0;
@ -117,7 +122,7 @@ double getTimeSpent(void* func)
return 0;
}
return data->timeSpent / (double)globalProfiler->frameCounter;
return data->timeSpent / (double)(globalProfiler->frameCounter - SKIPPED_FRAMES);
}
void profilePrintResults()
@ -173,11 +178,24 @@ void profilePrintResults()
}
//print most time spent first
fprintf(stderr, "\nNum frames: %u\n", globalProfiler->frameCounter - SKIPPED_FRAMES);
fprintf(stderr, "Num functions touched: %u\n", numFunctions);
double overHead = 0.0;
for(int32_t c = numFunctions - 1; c >= 0; --c)
{
overHead += profileResults[c].timeSpent;
}
//
fprintf(stderr, "Total driver overhead: %lf ms\n", (overHead - profileResults[numFunctions - 1].timeSpent) / (double)(globalProfiler->frameCounter - SKIPPED_FRAMES));
uint32_t counter = 0;
for(int32_t c = numFunctions - 1; c >= 0; --c)
{
fprintf(stderr, "#%u %-30s: %lf ms\n", ++counter, profileResults[c].funcName, profileResults[c].timeSpent / (double)globalProfiler->frameCounter);
double timeSpent = profileResults[c].timeSpent / (double)(globalProfiler->frameCounter - SKIPPED_FRAMES);
if(timeSpent < 0.0001) continue;
fprintf(stderr, "#%u %-30s: %lf ms\n", ++counter, profileResults[c].funcName, timeSpent);
if(counter >= 10)
{
//break;

9
driver/wsi.c
View File

@ -618,6 +618,12 @@ VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkQueuePresentKHR)(
{
PROFILESTART(RPIFUNC(vkQueuePresentKHR));
static unsigned frameProfile = 0;
if(frameProfile)
{
PROFILEEND(&frameProfile);
}
assert(queue);
assert(pPresentInfo);
@ -636,6 +642,9 @@ VKAPI_ATTR VkResult VKAPI_CALL RPIFUNC(vkQueuePresentKHR)(
PROFILEEND(RPIFUNC(vkQueuePresentKHR));
PROFILESTART(&frameProfile);
frameProfile = 1;
endFrame();
return VK_SUCCESS;