mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 05:46:03 +00:00
Discover and propagate the actual PowerVR render node
This commit is contained in:
1 parent
5588fedf1d
commit
3ee7c4afbb
5 files changed
+148
-11
No files matched your search
@@ -73,8 +73,10 @@ struct bl_drm_version {
|
||||
static int is_powervr(int fd) {
|
||||
const char *enabled = getenv("BL_POWERVR_DRM_HANDLES");
|
||||
if (!enabled || strcmp(enabled, "1")) return 0;
|
||||
const char *path = getenv("BL_POWERVR_RENDER_NODE");
|
||||
if (!path || !*path) return 0;
|
||||
struct stat node, candidate;
|
||||
if (stat("/dev/dri/renderD128", &node) || fstat(fd, &candidate) ||
|
||||
if (stat(path, &node) || fstat(fd, &candidate) ||
|
||||
!S_ISCHR(candidate.st_mode) || !S_ISCHR(node.st_mode) ||
|
||||
candidate.st_rdev != node.st_rdev) return 0;
|
||||
char name[16] = {0};
|
||||
|
||||
@@ -25,6 +25,7 @@ static int identity_denied, kgsl_present;
|
||||
static int kernel_error = EINVAL;
|
||||
static int native_imports, native_exports, native_closes;
|
||||
static const char *driver_name = "pvr";
|
||||
static const char *pvr_node = "/dev/dri/renderD129";
|
||||
static int fixture_stat(const char *path, struct stat *st);
|
||||
static long fixture_syscall(long number, ...);
|
||||
static int fixture_fcntl(int fd, int op, int arg);
|
||||
@@ -61,7 +62,9 @@ static int fixture_stat(const char *path, struct stat *st) {
|
||||
errno = ENOENT;
|
||||
return -1;
|
||||
}
|
||||
if (!strcmp(path, "/dev/dri/renderD128")) return stat("/dev/null", st);
|
||||
if (!strcmp(path, pvr_node)) return stat("/dev/null", st);
|
||||
if (!strcmp(path, "/dev/dri/renderD128")) return stat("/dev/zero", st);
|
||||
if (!strncmp(path, "/dev/dri/", 9)) { errno = ENOENT; return -1; }
|
||||
return stat(path, st);
|
||||
}
|
||||
|
||||
@@ -145,10 +148,22 @@ int main(void) {
|
||||
int drm = test_open("/dev/null"), dma = test_open("/dev/zero");
|
||||
uint32_t handle = 0;
|
||||
unsetenv("BL_POWERVR_DRM_HANDLES");
|
||||
setenv("BL_POWERVR_RENDER_NODE", pvr_node, 1);
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) != 0);
|
||||
setenv("BL_POWERVR_DRM_HANDLES", "yes", 1);
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) != 0);
|
||||
setenv("BL_POWERVR_DRM_HANDLES", "1", 1);
|
||||
unsetenv("BL_POWERVR_RENDER_NODE");
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); /* no selected node */
|
||||
setenv("BL_POWERVR_RENDER_NODE", "", 1);
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) != 0);
|
||||
setenv("BL_POWERVR_RENDER_NODE", "/dev/dri/renderD128", 1);
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); /* another GPU owns 128 */
|
||||
setenv("BL_POWERVR_RENDER_NODE", "/dev/dri/renderD130", 1);
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); /* selected node is absent */
|
||||
setenv("BL_POWERVR_RENDER_NODE", __FILE__, 1);
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) != 0); /* regular files are not DRM nodes */
|
||||
setenv("BL_POWERVR_RENDER_NODE", pvr_node, 1);
|
||||
driver_name = "other";
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) != 0);
|
||||
driver_name = "pvr";
|
||||
@@ -238,6 +253,12 @@ int main(void) {
|
||||
fixture_close(out);
|
||||
assert(drmCloseBufferHandle(drm, handle) == 0);
|
||||
|
||||
/* Preserve the original device layout when PowerVR owns renderD128. */
|
||||
pvr_node = "/dev/dri/renderD128";
|
||||
setenv("BL_POWERVR_RENDER_NODE", pvr_node, 1);
|
||||
assert(drmPrimeFDToHandle(drm, dma, &handle) == 0 && (handle & PVR_HANDLE_BIT));
|
||||
assert(drmCloseBufferHandle(drm, handle) == 0);
|
||||
|
||||
/* Retain the old KGSL path with the PowerVR opt-in unset. */
|
||||
unsetenv("BL_POWERVR_DRM_HANDLES");
|
||||
kgsl_present = 1;
|
||||
|
||||
Reference in new issue
Block a user