PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "minui: Clean up graphics_adf.cpp." am: d592e1d5e1 am: 46829c326e

Browse Source 
am: ffd5c03711

Change-Id: Idb949b2caa2b168677730c70ace20914bd21b42e
This commit is contained in:
Tao Bao
2017-02-09 20:16:48 +00:00
committed by android-build-merger
parent 0f38c6da12 ffd5c03711
commit ff7a320971
1 changed files with 164 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minui/graphics_adf.cpp
+164 -199
View File
@@ -16,14 +16,10 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/cdefs.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h>
#include <adf/adf.h> #include <adf/adf.h>
#include <sync/sync.h> #include <sync/sync.h>
@@ -31,243 +27,212 @@
#include "graphics.h" #include "graphics.h"
struct adf_surface_pdata { struct adf_surface_pdata {
GRSurface base; GRSurface base;
int fence_fd; int fence_fd;
int fd; int fd;
__u32 offset; __u32 offset;
__u32 pitch; __u32 pitch;
}; };
struct adf_pdata { struct adf_pdata {
minui_backend base; minui_backend base;
int intf_fd; int intf_fd;
adf_id_t eng_id; adf_id_t eng_id;
__u32 format; __u32 format;
adf_device dev; adf_device dev;
unsigned int current_surface; unsigned int current_surface;
unsigned int n_surfaces; unsigned int n_surfaces;
adf_surface_pdata surfaces[2]; adf_surface_pdata surfaces[2];
}; };
static GRSurface* adf_flip(minui_backend *backend); static GRSurface* adf_flip(minui_backend* backend);
static void adf_blank(minui_backend *backend, bool blank); static void adf_blank(minui_backend* backend, bool blank);
static int adf_surface_init(adf_pdata *pdata, drm_mode_modeinfo *mode, adf_surface_pdata *surf) { static int adf_surface_init(adf_pdata* pdata, drm_mode_modeinfo* mode, adf_surface_pdata* surf) {
memset(surf, 0, sizeof(*surf)); *surf = {};
surf->fence_fd = -1;
surf->fd = adf_interface_simple_buffer_alloc(pdata->intf_fd, mode->hdisplay, mode->vdisplay,
pdata->format, &surf->offset, &surf->pitch);
if (surf->fd < 0) {
return surf->fd;
}
surf->fence_fd = -1; surf->base.width = mode->hdisplay;
surf->fd = adf_interface_simple_buffer_alloc(pdata->intf_fd, mode->hdisplay, surf->base.height = mode->vdisplay;
mode->vdisplay, pdata->format, &surf->offset, &surf->pitch); surf->base.row_bytes = surf->pitch;
if (surf->fd < 0) surf->base.pixel_bytes = (pdata->format == DRM_FORMAT_RGB565) ? 2 : 4;
return surf->fd;
surf->base.width = mode->hdisplay; surf->base.data = static_cast<uint8_t*>(mmap(nullptr, surf->pitch * surf->base.height, PROT_WRITE,
surf->base.height = mode->vdisplay; MAP_SHARED, surf->fd, surf->offset));
surf->base.row_bytes = surf->pitch; if (surf->base.data == MAP_FAILED) {
surf->base.pixel_bytes = (pdata->format == DRM_FORMAT_RGB565) ? 2 : 4; close(surf->fd);
return -errno;
}
surf->base.data = static_cast<uint8_t*>(mmap(NULL, return 0;
surf->pitch * surf->base.height, PROT_WRITE,
MAP_SHARED, surf->fd, surf->offset));
if (surf->base.data == MAP_FAILED) {
close(surf->fd);
return -errno;
}
return 0;
} }
static int adf_interface_init(adf_pdata *pdata) static int adf_interface_init(adf_pdata* pdata) {
{ adf_interface_data intf_data;
adf_interface_data intf_data; int err = adf_get_interface_data(pdata->intf_fd, &intf_data);
int ret = 0; if (err < 0) return err;
int err;
err = adf_get_interface_data(pdata->intf_fd, &intf_data); int ret = 0;
if (err < 0) err = adf_surface_init(pdata, &intf_data.current_mode, &pdata->surfaces[0]);
return err; if (err < 0) {
fprintf(stderr, "allocating surface 0 failed: %s\n", strerror(-err));
ret = err;
goto done;
}
err = adf_surface_init(pdata, &intf_data.current_mode, &pdata->surfaces[0]); err = adf_surface_init(pdata, &intf_data.current_mode, &pdata->surfaces[1]);
if (err < 0) { if (err < 0) {
fprintf(stderr, "allocating surface 0 failed: %s\n", strerror(-err)); fprintf(stderr, "allocating surface 1 failed: %s\n", strerror(-err));
ret = err; pdata->surfaces[1] = {};
goto done; pdata->n_surfaces = 1;
} } else {
pdata->n_surfaces = 2;
err = adf_surface_init(pdata, &intf_data.current_mode, }
&pdata->surfaces[1]);
if (err < 0) {
fprintf(stderr, "allocating surface 1 failed: %s\n", strerror(-err));
memset(&pdata->surfaces[1], 0, sizeof(pdata->surfaces[1]));
pdata->n_surfaces = 1;
} else {
pdata->n_surfaces = 2;
}
done: done:
adf_free_interface_data(&intf_data); adf_free_interface_data(&intf_data);
return ret; return ret;
} }
static int adf_device_init(adf_pdata *pdata, adf_device *dev) static int adf_device_init(adf_pdata* pdata, adf_device* dev) {
{ adf_id_t intf_id;
adf_id_t intf_id; int err = adf_find_simple_post_configuration(dev, &pdata->format, 1, &intf_id, &pdata->eng_id);
int intf_fd; if (err < 0) return err;
int err;
err = adf_find_simple_post_configuration(dev, &pdata->format, 1, &intf_id, err = adf_device_attach(dev, pdata->eng_id, intf_id);
&pdata->eng_id); if (err < 0 && err != -EALREADY) return err;
if (err < 0)
return err;
err = adf_device_attach(dev, pdata->eng_id, intf_id); pdata->intf_fd = adf_interface_open(dev, intf_id, O_RDWR);
if (err < 0 && err != -EALREADY) if (pdata->intf_fd < 0) return pdata->intf_fd;
return err;
pdata->intf_fd = adf_interface_open(dev, intf_id, O_RDWR); err = adf_interface_init(pdata);
if (pdata->intf_fd < 0) if (err < 0) {
return pdata->intf_fd; close(pdata->intf_fd);
pdata->intf_fd = -1;
}
err = adf_interface_init(pdata); return err;
if (err < 0) {
close(pdata->intf_fd);
pdata->intf_fd = -1;
}
return err;
} }
static GRSurface* adf_init(minui_backend *backend) static GRSurface* adf_init(minui_backend* backend) {
{ adf_pdata* pdata = reinterpret_cast<adf_pdata*>(backend);
adf_pdata *pdata = (adf_pdata *)backend;
adf_id_t *dev_ids = NULL;
ssize_t n_dev_ids, i;
GRSurface* ret;
#if defined(RECOVERY_ABGR) #if defined(RECOVERY_ABGR)
pdata->format = DRM_FORMAT_ABGR8888; pdata->format = DRM_FORMAT_ABGR8888;
#elif defined(RECOVERY_BGRA) #elif defined(RECOVERY_BGRA)
pdata->format = DRM_FORMAT_BGRA8888; pdata->format = DRM_FORMAT_BGRA8888;
#elif defined(RECOVERY_RGBX) #elif defined(RECOVERY_RGBX)
pdata->format = DRM_FORMAT_RGBX8888; pdata->format = DRM_FORMAT_RGBX8888;
#else #else
pdata->format = DRM_FORMAT_RGB565; pdata->format = DRM_FORMAT_RGB565;
#endif #endif
n_dev_ids = adf_devices(&dev_ids); adf_id_t* dev_ids = nullptr;
if (n_dev_ids == 0) { ssize_t n_dev_ids = adf_devices(&dev_ids);
return NULL; if (n_dev_ids == 0) {
} else if (n_dev_ids < 0) { return nullptr;
fprintf(stderr, "enumerating adf devices failed: %s\n", } else if (n_dev_ids < 0) {
strerror(-n_dev_ids)); fprintf(stderr, "enumerating adf devices failed: %s\n", strerror(-n_dev_ids));
return NULL; return nullptr;
}
pdata->intf_fd = -1;
for (ssize_t i = 0; i < n_dev_ids && pdata->intf_fd < 0; i++) {
int err = adf_device_open(dev_ids[i], O_RDWR, &pdata->dev);
if (err < 0) {
fprintf(stderr, "opening adf device %u failed: %s\n", dev_ids[i], strerror(-err));
continue;
} }
pdata->intf_fd = -1; err = adf_device_init(pdata, &pdata->dev);
if (err < 0) {
fprintf(stderr, "initializing adf device %u failed: %s\n", dev_ids[i], strerror(-err));
adf_device_close(&pdata->dev);
}
}
for (i = 0; i < n_dev_ids && pdata->intf_fd < 0; i++) { free(dev_ids);
int err = adf_device_open(dev_ids[i], O_RDWR, &pdata->dev); if (pdata->intf_fd < 0) return nullptr;
if (err < 0) {
fprintf(stderr, "opening adf device %u failed: %s\n", dev_ids[i],
strerror(-err));
continue;
}
err = adf_device_init(pdata, &pdata->dev); GRSurface* ret = adf_flip(backend);
if (err < 0) {
fprintf(stderr, "initializing adf device %u failed: %s\n", adf_blank(backend, true);
dev_ids[i], strerror(-err)); adf_blank(backend, false);
adf_device_close(&pdata->dev);
} return ret;
}
static void adf_sync(adf_surface_pdata* surf) {
static constexpr unsigned int warningTimeout = 3000;
if (surf == nullptr) return;
if (surf->fence_fd >= 0) {
int err = sync_wait(surf->fence_fd, warningTimeout);
if (err < 0) {
perror("adf sync fence wait error\n");
} }
free(dev_ids);
if (pdata->intf_fd < 0)
return NULL;
ret = adf_flip(backend);
adf_blank(backend, true);
adf_blank(backend, false);
return ret;
}
static void adf_sync(adf_surface_pdata *surf)
{
unsigned int warningTimeout = 3000;
if (surf == NULL)
return;
if (surf->fence_fd >= 0){
int err = sync_wait(surf->fence_fd, warningTimeout);
if (err < 0)
perror("adf sync fence wait error\n");
close(surf->fence_fd);
surf->fence_fd = -1;
}
}
static GRSurface* adf_flip(minui_backend *backend)
{
adf_pdata *pdata = (adf_pdata *)backend;
adf_surface_pdata *surf = &pdata->surfaces[pdata->current_surface];
int fence_fd = adf_interface_simple_post(pdata->intf_fd, pdata->eng_id,
surf->base.width, surf->base.height, pdata->format, surf->fd,
surf->offset, surf->pitch, -1);
if (fence_fd >= 0)
surf->fence_fd = fence_fd;
pdata->current_surface = (pdata->current_surface + 1) % pdata->n_surfaces;
adf_sync(&pdata->surfaces[pdata->current_surface]);
return &pdata->surfaces[pdata->current_surface].base;
}
static void adf_blank(minui_backend *backend, bool blank)
{
adf_pdata *pdata = (adf_pdata *)backend;
adf_interface_blank(pdata->intf_fd,
blank ? DRM_MODE_DPMS_OFF : DRM_MODE_DPMS_ON);
}
static void adf_surface_destroy(adf_surface_pdata *surf)
{
munmap(surf->base.data, surf->pitch * surf->base.height);
close(surf->fence_fd); close(surf->fence_fd);
close(surf->fd); surf->fence_fd = -1;
}
} }
static void adf_exit(minui_backend *backend) static GRSurface* adf_flip(minui_backend* backend) {
{ adf_pdata* pdata = reinterpret_cast<adf_pdata*>(backend);
adf_pdata *pdata = (adf_pdata *)backend; adf_surface_pdata* surf = &pdata->surfaces[pdata->current_surface];
unsigned int i;
adf_device_close(&pdata->dev); int fence_fd =
for (i = 0; i < pdata->n_surfaces; i++) adf_interface_simple_post(pdata->intf_fd, pdata->eng_id, surf->base.width, surf->base.height,
adf_surface_destroy(&pdata->surfaces[i]); pdata->format, surf->fd, surf->offset, surf->pitch, -1);
if (pdata->intf_fd >= 0) if (fence_fd >= 0) surf->fence_fd = fence_fd;
close(pdata->intf_fd);
free(pdata); pdata->current_surface = (pdata->current_surface + 1) % pdata->n_surfaces;
adf_sync(&pdata->surfaces[pdata->current_surface]);
return &pdata->surfaces[pdata->current_surface].base;
} }
minui_backend *open_adf() static void adf_blank(minui_backend* backend, bool blank) {
{ adf_pdata* pdata = reinterpret_cast<adf_pdata*>(backend);
adf_pdata* pdata = static_cast<adf_pdata*>(calloc(1, sizeof(*pdata))); adf_interface_blank(pdata->intf_fd, blank ? DRM_MODE_DPMS_OFF : DRM_MODE_DPMS_ON);
if (!pdata) { }
perror("allocating adf backend failed");
return NULL; static void adf_surface_destroy(adf_surface_pdata* surf) {
} munmap(surf->base.data, surf->pitch * surf->base.height);
close(surf->fence_fd);
pdata->base.init = adf_init; close(surf->fd);
pdata->base.flip = adf_flip; }
pdata->base.blank = adf_blank;
pdata->base.exit = adf_exit; static void adf_exit(minui_backend* backend) {
return &pdata->base; adf_pdata* pdata = reinterpret_cast<adf_pdata*>(backend);
adf_device_close(&pdata->dev);
for (unsigned int i = 0; i < pdata->n_surfaces; i++) {
adf_surface_destroy(&pdata->surfaces[i]);
}
if (pdata->intf_fd >= 0) close(pdata->intf_fd);
free(pdata);
}
minui_backend* open_adf() {
adf_pdata* pdata = static_cast<adf_pdata*>(calloc(1, sizeof(*pdata)));
if (!pdata) {
perror("allocating adf backend failed");
return nullptr;
}
pdata->base.init = adf_init;
pdata->base.flip = adf_flip;
pdata->base.blank = adf_blank;
pdata->base.exit = adf_exit;
return &pdata->base;
} }