tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "minui: Move graphics_{adf,drm,fbdev} into classes." am: 0d14cc279c am: 6585a3c368 am: b8997adc20

Browse source 
am: 1cb8964aac

Change-Id: I8b1fb8ba115f7313f7382b7669e35184eaea3a79
This commit is contained in:
Tao Bao 2017-02-13 18:42:16 +00:00 committed by android-build-merger
commit 16b509535b
8 changed files with 332 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
minui/graphics.cpp
View file

@ -20,11 +20,16 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <memory>
#include "font_10x18.h" #include "font_10x18.h"
#include "graphics_adf.h"
#include "graphics_drm.h"
#include "graphics_fbdev.h"
#include "minui/minui.h" #include "minui/minui.h"
static GRFont* gr_font = NULL; static GRFont* gr_font = NULL;
static minui_backend* gr_backend = NULL; static MinuiBackend* gr_backend = nullptr;
static int overscan_percent = OVERSCAN_PERCENT; static int overscan_percent = OVERSCAN_PERCENT;
static int overscan_offset_x = 0; static int overscan_offset_x = 0;
@ -308,59 +313,52 @@ static void gr_init_font(void)
} }
void gr_flip() { void gr_flip() {
gr_draw = gr_backend->flip(gr_backend); gr_draw = gr_backend->Flip();
} }
int gr_init(void) int gr_init() {
{ gr_init_font();
gr_init_font();
gr_backend = open_adf(); auto backend = std::unique_ptr<MinuiBackend>{ std::make_unique<MinuiBackendAdf>() };
if (gr_backend) { gr_draw = backend->Init();
gr_draw = gr_backend->init(gr_backend);
if (!gr_draw) {
gr_backend->exit(gr_backend);
}
}
if (!gr_draw) { if (!gr_draw) {
gr_backend = open_drm(); backend = std::make_unique<MinuiBackendDrm>();
gr_draw = gr_backend->init(gr_backend); gr_draw = backend->Init();
} }
if (!gr_draw) { if (!gr_draw) {
gr_backend = open_fbdev(); backend = std::make_unique<MinuiBackendFbdev>();
gr_draw = gr_backend->init(gr_backend); gr_draw = backend->Init();
if (gr_draw == NULL) { }
return -1;
}
}
overscan_offset_x = gr_draw->width * overscan_percent / 100; if (!gr_draw) {
overscan_offset_y = gr_draw->height * overscan_percent / 100; return -1;
}
gr_flip(); gr_backend = backend.release();
gr_flip();
return 0; overscan_offset_x = gr_draw->width * overscan_percent / 100;
overscan_offset_y = gr_draw->height * overscan_percent / 100;
gr_flip();
gr_flip();
return 0;
} }
void gr_exit(void) void gr_exit() {
{ delete gr_backend;
gr_backend->exit(gr_backend);
} }
int gr_fb_width(void) int gr_fb_width() {
{ return gr_draw->width - 2 * overscan_offset_x;
return gr_draw->width - 2*overscan_offset_x;
} }
int gr_fb_height(void) int gr_fb_height() {
{ return gr_draw->height - 2 * overscan_offset_y;
return gr_draw->height - 2*overscan_offset_y;
} }
void gr_fb_blank(bool blank) void gr_fb_blank(bool blank) {
{ gr_backend->Blank(blank);
gr_backend->blank(gr_backend, blank);
} }

29
minui/graphics.h
View file

@ -19,25 +19,20 @@
#include "minui/minui.h" #include "minui/minui.h"
// TODO: lose the function pointers. class MinuiBackend {
struct minui_backend { public:
// Initializes the backend and returns a GRSurface* to draw into. // Initializes the backend and returns a GRSurface* to draw into.
GRSurface* (*init)(minui_backend*); virtual GRSurface* Init() = 0;
// Causes the current drawing surface (returned by the most recent // Causes the current drawing surface (returned by the most recent call to Flip() or Init()) to
// call to flip() or init()) to be displayed, and returns a new // be displayed, and returns a new drawing surface.
// drawing surface. virtual GRSurface* Flip() = 0;
GRSurface* (*flip)(minui_backend*);
// Blank (or unblank) the screen. // Blank (or unblank) the screen.
void (*blank)(minui_backend*, bool); virtual void Blank(bool) = 0;
// Device cleanup when drawing is done. // Device cleanup when drawing is done.
void (*exit)(minui_backend*); virtual ~MinuiBackend() {};
}; };
minui_backend* open_fbdev(); #endif // _GRAPHICS_H_
minui_backend* open_adf();
minui_backend* open_drm();
#endif

162
minui/graphics_adf.cpp
View file

@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include "graphics_adf.h"
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
@ -24,49 +26,27 @@
#include <adf/adf.h> #include <adf/adf.h>
#include <sync/sync.h> #include <sync/sync.h>
#include "graphics.h" #include "minui/minui.h"
struct adf_surface_pdata { MinuiBackendAdf::MinuiBackendAdf() : intf_fd(-1), dev(), n_surfaces(0), surfaces() {}
GRSurface base;
int fence_fd;
int fd;
__u32 offset;
__u32 pitch;
};
struct adf_pdata { int MinuiBackendAdf::SurfaceInit(const drm_mode_modeinfo* mode, GRSurfaceAdf* surf) {
minui_backend base;
int intf_fd;
adf_id_t eng_id;
__u32 format;
adf_device dev;
unsigned int current_surface;
unsigned int n_surfaces;
adf_surface_pdata surfaces[2];
};
static GRSurface* adf_flip(minui_backend* backend);
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) {
*surf = {}; *surf = {};
surf->fence_fd = -1; surf->fence_fd = -1;
surf->fd = adf_interface_simple_buffer_alloc(pdata->intf_fd, mode->hdisplay, mode->vdisplay, surf->fd = adf_interface_simple_buffer_alloc(intf_fd, mode->hdisplay, mode->vdisplay, format,
pdata->format, &surf->offset, &surf->pitch); &surf->offset, &surf->pitch);
if (surf->fd < 0) { if (surf->fd < 0) {
return surf->fd; return surf->fd;
} }
surf->base.width = mode->hdisplay; surf->width = mode->hdisplay;
surf->base.height = mode->vdisplay; surf->height = mode->vdisplay;
surf->base.row_bytes = surf->pitch; surf->row_bytes = surf->pitch;
surf->base.pixel_bytes = (pdata->format == DRM_FORMAT_RGB565) ? 2 : 4; surf->pixel_bytes = (format == DRM_FORMAT_RGB565) ? 2 : 4;
surf->base.data = static_cast<uint8_t*>(mmap(nullptr, surf->pitch * surf->base.height, PROT_WRITE, surf->data = static_cast<uint8_t*>(
MAP_SHARED, surf->fd, surf->offset)); mmap(nullptr, surf->pitch * surf->height, PROT_WRITE, MAP_SHARED, surf->fd, surf->offset));
if (surf->base.data == MAP_FAILED) { if (surf->data == MAP_FAILED) {
int saved_errno = errno; int saved_errno = errno;
close(surf->fd); close(surf->fd);
return -saved_errno; return -saved_errno;
@ -75,26 +55,26 @@ static int adf_surface_init(adf_pdata* pdata, drm_mode_modeinfo* mode, adf_surfa
return 0; return 0;
} }
static int adf_interface_init(adf_pdata* pdata) { int MinuiBackendAdf::InterfaceInit() {
adf_interface_data intf_data; adf_interface_data intf_data;
int err = adf_get_interface_data(pdata->intf_fd, &intf_data); int err = adf_get_interface_data(intf_fd, &intf_data);
if (err < 0) return err; if (err < 0) return err;
int ret = 0; int ret = 0;
err = adf_surface_init(pdata, &intf_data.current_mode, &pdata->surfaces[0]); err = SurfaceInit(&intf_data.current_mode, &surfaces[0]);
if (err < 0) { if (err < 0) {
fprintf(stderr, "allocating surface 0 failed: %s\n", strerror(-err)); fprintf(stderr, "allocating surface 0 failed: %s\n", strerror(-err));
ret = err; ret = err;
goto done; goto done;
} }
err = adf_surface_init(pdata, &intf_data.current_mode, &pdata->surfaces[1]); err = SurfaceInit(&intf_data.current_mode, &surfaces[1]);
if (err < 0) { if (err < 0) {
fprintf(stderr, "allocating surface 1 failed: %s\n", strerror(-err)); fprintf(stderr, "allocating surface 1 failed: %s\n", strerror(-err));
pdata->surfaces[1] = {}; surfaces[1] = {};
pdata->n_surfaces = 1; n_surfaces = 1;
} else { } else {
pdata->n_surfaces = 2; n_surfaces = 2;
} }
done: done:
@ -102,37 +82,35 @@ done:
return ret; return ret;
} }
static int adf_device_init(adf_pdata* pdata, adf_device* dev) { int MinuiBackendAdf::DeviceInit(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 err = adf_find_simple_post_configuration(dev, &format, 1, &intf_id, &eng_id);
if (err < 0) return err; if (err < 0) return err;
err = adf_device_attach(dev, pdata->eng_id, intf_id); err = adf_device_attach(dev, eng_id, intf_id);
if (err < 0 && err != -EALREADY) return err; if (err < 0 && err != -EALREADY) return err;
pdata->intf_fd = adf_interface_open(dev, intf_id, O_RDWR); intf_fd = adf_interface_open(dev, intf_id, O_RDWR);
if (pdata->intf_fd < 0) return pdata->intf_fd; if (intf_fd < 0) return intf_fd;
err = adf_interface_init(pdata); err = InterfaceInit();
if (err < 0) { if (err < 0) {
close(pdata->intf_fd); close(intf_fd);
pdata->intf_fd = -1; intf_fd = -1;
} }
return err; return err;
} }
static GRSurface* adf_init(minui_backend* backend) { GRSurface* MinuiBackendAdf::Init() {
adf_pdata* pdata = reinterpret_cast<adf_pdata*>(backend);
#if defined(RECOVERY_ABGR) #if defined(RECOVERY_ABGR)
pdata->format = DRM_FORMAT_ABGR8888; format = DRM_FORMAT_ABGR8888;
#elif defined(RECOVERY_BGRA) #elif defined(RECOVERY_BGRA)
pdata->format = DRM_FORMAT_BGRA8888; format = DRM_FORMAT_BGRA8888;
#elif defined(RECOVERY_RGBX) #elif defined(RECOVERY_RGBX)
pdata->format = DRM_FORMAT_RGBX8888; format = DRM_FORMAT_RGBX8888;
#else #else
pdata->format = DRM_FORMAT_RGB565; format = DRM_FORMAT_RGB565;
#endif #endif
adf_id_t* dev_ids = nullptr; adf_id_t* dev_ids = nullptr;
@ -144,35 +122,35 @@ static GRSurface* adf_init(minui_backend* backend) {
return nullptr; return nullptr;
} }
pdata->intf_fd = -1; intf_fd = -1;
for (ssize_t i = 0; i < n_dev_ids && pdata->intf_fd < 0; i++) { for (ssize_t i = 0; i < n_dev_ids && intf_fd < 0; i++) {
int err = adf_device_open(dev_ids[i], O_RDWR, &pdata->dev); int err = adf_device_open(dev_ids[i], O_RDWR, &dev);
if (err < 0) { if (err < 0) {
fprintf(stderr, "opening adf device %u failed: %s\n", dev_ids[i], strerror(-err)); fprintf(stderr, "opening adf device %u failed: %s\n", dev_ids[i], strerror(-err));
continue; continue;
} }
err = adf_device_init(pdata, &pdata->dev); err = DeviceInit(&dev);
if (err < 0) { if (err < 0) {
fprintf(stderr, "initializing adf device %u failed: %s\n", dev_ids[i], strerror(-err)); fprintf(stderr, "initializing adf device %u failed: %s\n", dev_ids[i], strerror(-err));
adf_device_close(&pdata->dev); adf_device_close(&dev);
} }
} }
free(dev_ids); free(dev_ids);
if (pdata->intf_fd < 0) return nullptr; if (intf_fd < 0) return nullptr;
GRSurface* ret = adf_flip(backend); GRSurface* ret = Flip();
adf_blank(backend, true); Blank(true);
adf_blank(backend, false); Blank(false);
return ret; return ret;
} }
static void adf_sync(adf_surface_pdata* surf) { void MinuiBackendAdf::Sync(GRSurfaceAdf* surf) {
static constexpr unsigned int warningTimeout = 3000; static constexpr unsigned int warningTimeout = 3000;
if (surf == nullptr) return; if (surf == nullptr) return;
@ -188,52 +166,32 @@ static void adf_sync(adf_surface_pdata* surf) {
} }
} }
static GRSurface* adf_flip(minui_backend* backend) { GRSurface* MinuiBackendAdf::Flip() {
adf_pdata* pdata = reinterpret_cast<adf_pdata*>(backend); GRSurfaceAdf* surf = &surfaces[current_surface];
adf_surface_pdata* surf = &pdata->surfaces[pdata->current_surface];
int fence_fd = int fence_fd = adf_interface_simple_post(intf_fd, eng_id, surf->width, surf->height, format,
adf_interface_simple_post(pdata->intf_fd, pdata->eng_id, surf->base.width, surf->base.height, surf->fd, surf->offset, surf->pitch, -1);
pdata->format, surf->fd, surf->offset, surf->pitch, -1);
if (fence_fd >= 0) surf->fence_fd = fence_fd; if (fence_fd >= 0) surf->fence_fd = fence_fd;
pdata->current_surface = (pdata->current_surface + 1) % pdata->n_surfaces; current_surface = (current_surface + 1) % n_surfaces;
adf_sync(&pdata->surfaces[pdata->current_surface]); Sync(&surfaces[current_surface]);
return &pdata->surfaces[pdata->current_surface].base; return &surfaces[current_surface];
} }
static void adf_blank(minui_backend* backend, bool blank) { void MinuiBackendAdf::Blank(bool blank) {
adf_pdata* pdata = reinterpret_cast<adf_pdata*>(backend); adf_interface_blank(intf_fd, blank ? DRM_MODE_DPMS_OFF : DRM_MODE_DPMS_ON);
adf_interface_blank(pdata->intf_fd, blank ? DRM_MODE_DPMS_OFF : DRM_MODE_DPMS_ON);
} }
static void adf_surface_destroy(adf_surface_pdata* surf) { void MinuiBackendAdf::SurfaceDestroy(GRSurfaceAdf* surf) {
munmap(surf->base.data, surf->pitch * surf->base.height); munmap(surf->data, surf->pitch * surf->height);
close(surf->fence_fd); close(surf->fence_fd);
close(surf->fd); close(surf->fd);
} }
static void adf_exit(minui_backend* backend) { MinuiBackendAdf::~MinuiBackendAdf() {
adf_pdata* pdata = reinterpret_cast<adf_pdata*>(backend); adf_device_close(&dev);
adf_device_close(&pdata->dev); for (unsigned int i = 0; i < n_surfaces; i++) {
for (unsigned int i = 0; i < pdata->n_surfaces; i++) { SurfaceDestroy(&surfaces[i]);
adf_surface_destroy(&pdata->surfaces[i]);
} }
if (pdata->intf_fd >= 0) close(pdata->intf_fd); if (intf_fd >= 0) close(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;
} }

58
minui/graphics_adf.h Normal file
View file

@ -0,0 +1,58 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef _GRAPHICS_ADF_H_
#define _GRAPHICS_ADF_H_
#include <adf/adf.h>
#include "graphics.h"
class GRSurfaceAdf : public GRSurface {
private:
int fence_fd;
int fd;
__u32 offset;
__u32 pitch;
friend class MinuiBackendAdf;
};
class MinuiBackendAdf : public MinuiBackend {
public:
GRSurface* Init() override;
GRSurface* Flip() override;
void Blank(bool) override;
~MinuiBackendAdf() override;
MinuiBackendAdf();
private:
int SurfaceInit(const drm_mode_modeinfo* mode, GRSurfaceAdf* surf);
int InterfaceInit();
int DeviceInit(adf_device* dev);
void SurfaceDestroy(GRSurfaceAdf* surf);
void Sync(GRSurfaceAdf* surf);
int intf_fd;
adf_id_t eng_id;
__u32 format;
adf_device dev;
unsigned int current_surface;
unsigned int n_surfaces;
GRSurfaceAdf surfaces[2];
};
#endif // _GRAPHICS_ADF_H_

124
minui/graphics_drm.cpp
View file

@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include "graphics_drm.h"
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -26,25 +28,13 @@
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include "minui/minui.h" #include "minui/minui.h"
#include "graphics.h"
#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*(A))) #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*(A)))
struct drm_surface { MinuiBackendDrm::MinuiBackendDrm()
GRSurface base; : GRSurfaceDrms(), main_monitor_crtc(nullptr), main_monitor_connector(nullptr), drm_fd(-1) {}
uint32_t fb_id;
uint32_t handle;
};
static drm_surface *drm_surfaces[2]; void MinuiBackendDrm::DrmDisableCrtc(int drm_fd, drmModeCrtc* crtc) {
static int current_buffer;
static drmModeCrtc *main_monitor_crtc;
static drmModeConnector *main_monitor_connector;
static int drm_fd = -1;
static void drm_disable_crtc(int drm_fd, drmModeCrtc *crtc) {
if (crtc) { if (crtc) {
drmModeSetCrtc(drm_fd, crtc->crtc_id, drmModeSetCrtc(drm_fd, crtc->crtc_id,
0, // fb_id 0, // fb_id
@ -55,7 +45,7 @@ static void drm_disable_crtc(int drm_fd, drmModeCrtc *crtc) {
} }
} }
static void drm_enable_crtc(int drm_fd, drmModeCrtc* crtc, struct drm_surface* surface) { void MinuiBackendDrm::DrmEnableCrtc(int drm_fd, drmModeCrtc* crtc, GRSurfaceDrm* surface) {
int32_t ret = drmModeSetCrtc(drm_fd, crtc->crtc_id, surface->fb_id, 0, 0, // x,y int32_t ret = drmModeSetCrtc(drm_fd, crtc->crtc_id, surface->fb_id, 0, 0, // x,y
&main_monitor_connector->connector_id, &main_monitor_connector->connector_id,
1, // connector_count 1, // connector_count
@ -66,19 +56,19 @@ static void drm_enable_crtc(int drm_fd, drmModeCrtc* crtc, struct drm_surface* s
} }
} }
static void drm_blank(minui_backend* backend __unused, bool blank) { void MinuiBackendDrm::Blank(bool blank) {
if (blank) { if (blank) {
drm_disable_crtc(drm_fd, main_monitor_crtc); DrmDisableCrtc(drm_fd, main_monitor_crtc);
} else { } else {
drm_enable_crtc(drm_fd, main_monitor_crtc, drm_surfaces[current_buffer]); DrmEnableCrtc(drm_fd, main_monitor_crtc, GRSurfaceDrms[current_buffer]);
} }
} }
static void drm_destroy_surface(struct drm_surface *surface) { void MinuiBackendDrm::DrmDestroySurface(GRSurfaceDrm* surface) {
if (!surface) return; if (!surface) return;
if (surface->base.data) { if (surface->data) {
munmap(surface->base.data, surface->base.row_bytes * surface->base.height); munmap(surface->data, surface->row_bytes * surface->height);
} }
if (surface->fb_id) { if (surface->fb_id) {
@ -98,7 +88,7 @@ static void drm_destroy_surface(struct drm_surface *surface) {
} }
} }
free(surface); delete surface;
} }
static int drm_format_to_bpp(uint32_t format) { static int drm_format_to_bpp(uint32_t format) {
@ -118,12 +108,9 @@ static int drm_format_to_bpp(uint32_t format) {
} }
} }
static drm_surface *drm_create_surface(int width, int height) { GRSurfaceDrm* MinuiBackendDrm::DrmCreateSurface(int width, int height) {
drm_surface* surface = static_cast<drm_surface*>(calloc(1, sizeof(*surface))); GRSurfaceDrm* surface = new GRSurfaceDrm;
if (!surface) { *surface = {};
printf("Can't allocate memory\n");
return nullptr;
}
uint32_t format; uint32_t format;
#if defined(RECOVERY_ABGR) #if defined(RECOVERY_ABGR)
@ -145,7 +132,7 @@ static drm_surface *drm_create_surface(int width, int height) {
int ret = drmIoctl(drm_fd, DRM_IOCTL_MODE_CREATE_DUMB, &create_dumb); int ret = drmIoctl(drm_fd, DRM_IOCTL_MODE_CREATE_DUMB, &create_dumb);
if (ret) { if (ret) {
printf("DRM_IOCTL_MODE_CREATE_DUMB failed ret=%d\n", ret); printf("DRM_IOCTL_MODE_CREATE_DUMB failed ret=%d\n", ret);
drm_destroy_surface(surface); DrmDestroySurface(surface);
return nullptr; return nullptr;
} }
surface->handle = create_dumb.handle; surface->handle = create_dumb.handle;
@ -160,7 +147,7 @@ static drm_surface *drm_create_surface(int width, int height) {
drmModeAddFB2(drm_fd, width, height, format, handles, pitches, offsets, &(surface->fb_id), 0); drmModeAddFB2(drm_fd, width, height, format, handles, pitches, offsets, &(surface->fb_id), 0);
if (ret) { if (ret) {
printf("drmModeAddFB2 failed ret=%d\n", ret); printf("drmModeAddFB2 failed ret=%d\n", ret);
drm_destroy_surface(surface); DrmDestroySurface(surface);
return nullptr; return nullptr;
} }
@ -169,20 +156,20 @@ static drm_surface *drm_create_surface(int width, int height) {
ret = drmIoctl(drm_fd, DRM_IOCTL_MODE_MAP_DUMB, &map_dumb); ret = drmIoctl(drm_fd, DRM_IOCTL_MODE_MAP_DUMB, &map_dumb);
if (ret) { if (ret) {
printf("DRM_IOCTL_MODE_MAP_DUMB failed ret=%d\n", ret); printf("DRM_IOCTL_MODE_MAP_DUMB failed ret=%d\n", ret);
drm_destroy_surface(surface); DrmDestroySurface(surface);
return nullptr; return nullptr;
} }
surface->base.height = height; surface->height = height;
surface->base.width = width; surface->width = width;
surface->base.row_bytes = create_dumb.pitch; surface->row_bytes = create_dumb.pitch;
surface->base.pixel_bytes = create_dumb.bpp / 8; surface->pixel_bytes = create_dumb.bpp / 8;
surface->base.data = surface->data = static_cast<unsigned char*>(mmap(nullptr, surface->height * surface->row_bytes,
static_cast<unsigned char*>(mmap(nullptr, surface->base.height * surface->base.row_bytes, PROT_READ | PROT_WRITE, MAP_SHARED, drm_fd,
PROT_READ | PROT_WRITE, MAP_SHARED, drm_fd, map_dumb.offset)); map_dumb.offset));
if (surface->base.data == MAP_FAILED) { if (surface->data == MAP_FAILED) {
perror("mmap() failed"); perror("mmap() failed");
drm_destroy_surface(surface); DrmDestroySurface(surface);
return nullptr; return nullptr;
} }
@ -256,7 +243,8 @@ static drmModeConnector* find_first_connected_connector(int fd, drmModeRes* reso
return nullptr; return nullptr;
} }
static drmModeConnector* find_main_monitor(int fd, drmModeRes* resources, uint32_t* mode_index) { drmModeConnector* MinuiBackendDrm::FindMainMonitor(int fd, drmModeRes* resources,
uint32_t* mode_index) {
/* Look for LVDS/eDP/DSI connectors. Those are the main screens. */ /* Look for LVDS/eDP/DSI connectors. Those are the main screens. */
static constexpr unsigned kConnectorPriority[] = { static constexpr unsigned kConnectorPriority[] = {
DRM_MODE_CONNECTOR_LVDS, DRM_MODE_CONNECTOR_LVDS,
@ -290,18 +278,18 @@ static drmModeConnector* find_main_monitor(int fd, drmModeRes* resources, uint32
return main_monitor_connector; return main_monitor_connector;
} }
static void disable_non_main_crtcs(int fd, drmModeRes* resources, drmModeCrtc* main_crtc) { void MinuiBackendDrm::DisableNonMainCrtcs(int fd, drmModeRes* resources, drmModeCrtc* main_crtc) {
for (int i = 0; i < resources->count_connectors; i++) { for (int i = 0; i < resources->count_connectors; i++) {
drmModeConnector* connector = drmModeGetConnector(fd, resources->connectors[i]); drmModeConnector* connector = drmModeGetConnector(fd, resources->connectors[i]);
drmModeCrtc* crtc = find_crtc_for_connector(fd, resources, connector); drmModeCrtc* crtc = find_crtc_for_connector(fd, resources, connector);
if (crtc->crtc_id != main_crtc->crtc_id) { if (crtc->crtc_id != main_crtc->crtc_id) {
drm_disable_crtc(fd, crtc); DrmDisableCrtc(fd, crtc);
} }
drmModeFreeCrtc(crtc); drmModeFreeCrtc(crtc);
} }
} }
static GRSurface* drm_init(minui_backend* backend __unused) { GRSurface* MinuiBackendDrm::Init() {
drmModeRes* res = nullptr; drmModeRes* res = nullptr;
/* Consider DRM devices in order. */ /* Consider DRM devices in order. */
@ -344,7 +332,7 @@ static GRSurface* drm_init(minui_backend* backend __unused) {
} }
uint32_t selected_mode; uint32_t selected_mode;
main_monitor_connector = find_main_monitor(drm_fd, res, &selected_mode); main_monitor_connector = FindMainMonitor(drm_fd, res, &selected_mode);
if (!main_monitor_connector) { if (!main_monitor_connector) {
printf("main_monitor_connector not found\n"); printf("main_monitor_connector not found\n");
@ -362,7 +350,7 @@ static GRSurface* drm_init(minui_backend* backend __unused) {
return nullptr; return nullptr;
} }
disable_non_main_crtcs(drm_fd, res, main_monitor_crtc); DisableNonMainCrtcs(drm_fd, res, main_monitor_crtc);
main_monitor_crtc->mode = main_monitor_connector->modes[selected_mode]; main_monitor_crtc->mode = main_monitor_connector->modes[selected_mode];
@ -371,51 +359,37 @@ static GRSurface* drm_init(minui_backend* backend __unused) {
drmModeFreeResources(res); drmModeFreeResources(res);
drm_surfaces[0] = drm_create_surface(width, height); GRSurfaceDrms[0] = DrmCreateSurface(width, height);
drm_surfaces[1] = drm_create_surface(width, height); GRSurfaceDrms[1] = DrmCreateSurface(width, height);
if (!drm_surfaces[0] || !drm_surfaces[1]) { if (!GRSurfaceDrms[0] || !GRSurfaceDrms[1]) {
drm_destroy_surface(drm_surfaces[0]); // GRSurfaceDrms and drm_fd should be freed in d'tor.
drm_destroy_surface(drm_surfaces[1]);
drmModeFreeResources(res);
close(drm_fd);
return nullptr; return nullptr;
} }
current_buffer = 0; current_buffer = 0;
drm_enable_crtc(drm_fd, main_monitor_crtc, drm_surfaces[1]); DrmEnableCrtc(drm_fd, main_monitor_crtc, GRSurfaceDrms[1]);
return &(drm_surfaces[0]->base); return GRSurfaceDrms[0];
} }
static GRSurface* drm_flip(minui_backend* backend __unused) { GRSurface* MinuiBackendDrm::Flip() {
int ret = drmModePageFlip(drm_fd, main_monitor_crtc->crtc_id, drm_surfaces[current_buffer]->fb_id, int ret = drmModePageFlip(drm_fd, main_monitor_crtc->crtc_id,
0, nullptr); GRSurfaceDrms[current_buffer]->fb_id, 0, nullptr);
if (ret < 0) { if (ret < 0) {
printf("drmModePageFlip failed ret=%d\n", ret); printf("drmModePageFlip failed ret=%d\n", ret);
return nullptr; return nullptr;
} }
current_buffer = 1 - current_buffer; current_buffer = 1 - current_buffer;
return &(drm_surfaces[current_buffer]->base); return GRSurfaceDrms[current_buffer];
} }
static void drm_exit(minui_backend* backend __unused) { MinuiBackendDrm::~MinuiBackendDrm() {
drm_disable_crtc(drm_fd, main_monitor_crtc); DrmDisableCrtc(drm_fd, main_monitor_crtc);
drm_destroy_surface(drm_surfaces[0]); DrmDestroySurface(GRSurfaceDrms[0]);
drm_destroy_surface(drm_surfaces[1]); DrmDestroySurface(GRSurfaceDrms[1]);
drmModeFreeCrtc(main_monitor_crtc); drmModeFreeCrtc(main_monitor_crtc);
drmModeFreeConnector(main_monitor_connector); drmModeFreeConnector(main_monitor_connector);
close(drm_fd); close(drm_fd);
drm_fd = -1; drm_fd = -1;
} }
static minui_backend drm_backend = {
.init = drm_init,
.flip = drm_flip,
.blank = drm_blank,
.exit = drm_exit,
};
minui_backend* open_drm() {
return &drm_backend;
}

58
minui/graphics_drm.h Normal file
View file

@ -0,0 +1,58 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef _GRAPHICS_DRM_H_
#define _GRAPHICS_DRM_H_
#include <stdint.h>
#include <xf86drmMode.h>
#include "graphics.h"
#include "minui/minui.h"
class GRSurfaceDrm : public GRSurface {
private:
uint32_t fb_id;
uint32_t handle;
friend class MinuiBackendDrm;
};
class MinuiBackendDrm : public MinuiBackend {
public:
GRSurface* Init() override;
GRSurface* Flip() override;
void Blank(bool) override;
~MinuiBackendDrm() override;
MinuiBackendDrm();
private:
void DrmDisableCrtc(int drm_fd, drmModeCrtc* crtc);
void DrmEnableCrtc(int drm_fd, drmModeCrtc* crtc, GRSurfaceDrm* surface);
GRSurfaceDrm* DrmCreateSurface(int width, int height);
void DrmDestroySurface(GRSurfaceDrm* surface);
void DisableNonMainCrtcs(int fd, drmModeRes* resources, drmModeCrtc* main_crtc);
drmModeConnector* FindMainMonitor(int fd, drmModeRes* resources, uint32_t* mode_index);
GRSurfaceDrm* GRSurfaceDrms[2];
int current_buffer;
drmModeCrtc* main_monitor_crtc;
drmModeConnector* main_monitor_connector;
int drm_fd;
};
#endif // _GRAPHICS_DRM_H_

49
minui/graphics_fbdev.cpp
View file

@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include "graphics_fbdev.h"
#include <fcntl.h> #include <fcntl.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <stdio.h> #include <stdio.h>
@ -25,40 +27,15 @@
#include <unistd.h> #include <unistd.h>
#include "minui/minui.h" #include "minui/minui.h"
#include "graphics.h"
static GRSurface* fbdev_init(minui_backend*); MinuiBackendFbdev::MinuiBackendFbdev() : gr_draw(nullptr), fb_fd(-1) {}
static GRSurface* fbdev_flip(minui_backend*);
static void fbdev_blank(minui_backend*, bool);
static void fbdev_exit(minui_backend*);
static GRSurface gr_framebuffer[2]; void MinuiBackendFbdev::Blank(bool blank) {
static bool double_buffered;
static GRSurface* gr_draw = nullptr;
static int displayed_buffer;
static fb_var_screeninfo vi;
static int fb_fd = -1;
static minui_backend my_backend = {
.init = fbdev_init,
.flip = fbdev_flip,
.blank = fbdev_blank,
.exit = fbdev_exit,
};
minui_backend* open_fbdev() {
return &my_backend;
}
static void fbdev_blank(minui_backend* backend __unused, bool blank) {
int ret = ioctl(fb_fd, FBIOBLANK, blank ? FB_BLANK_POWERDOWN : FB_BLANK_UNBLANK); int ret = ioctl(fb_fd, FBIOBLANK, blank ? FB_BLANK_POWERDOWN : FB_BLANK_UNBLANK);
if (ret < 0) { if (ret < 0) perror("ioctl(): blank");
perror("ioctl(): blank");
}
} }
static void set_displayed_framebuffer(unsigned n) { void MinuiBackendFbdev::SetDisplayedFramebuffer(unsigned n) {
if (n > 1 || !double_buffered) return; if (n > 1 || !double_buffered) return;
vi.yres_virtual = gr_framebuffer[0].height * 2; vi.yres_virtual = gr_framebuffer[0].height * 2;
@ -70,7 +47,7 @@ static void set_displayed_framebuffer(unsigned n) {
displayed_buffer = n; displayed_buffer = n;
} }
static GRSurface* fbdev_init(minui_backend* backend) { GRSurface* MinuiBackendFbdev::Init() {
int fd = open("/dev/graphics/fb0", O_RDWR); int fd = open("/dev/graphics/fb0", O_RDWR);
if (fd == -1) { if (fd == -1) {
perror("cannot open fb0"); perror("cannot open fb0");
@ -154,23 +131,23 @@ static GRSurface* fbdev_init(minui_backend* backend) {
memset(gr_draw->data, 0, gr_draw->height * gr_draw->row_bytes); memset(gr_draw->data, 0, gr_draw->height * gr_draw->row_bytes);
fb_fd = fd; fb_fd = fd;
set_displayed_framebuffer(0); SetDisplayedFramebuffer(0);
printf("framebuffer: %d (%d x %d)\n", fb_fd, gr_draw->width, gr_draw->height); printf("framebuffer: %d (%d x %d)\n", fb_fd, gr_draw->width, gr_draw->height);
fbdev_blank(backend, true); Blank(true);
fbdev_blank(backend, false); Blank(false);
return gr_draw; return gr_draw;
} }
static GRSurface* fbdev_flip(minui_backend* backend __unused) { GRSurface* MinuiBackendFbdev::Flip() {
if (double_buffered) { if (double_buffered) {
// Change gr_draw to point to the buffer currently displayed, // Change gr_draw to point to the buffer currently displayed,
// then flip the driver so we're displaying the other buffer // then flip the driver so we're displaying the other buffer
// instead. // instead.
gr_draw = gr_framebuffer + displayed_buffer; gr_draw = gr_framebuffer + displayed_buffer;
set_displayed_framebuffer(1 - displayed_buffer); SetDisplayedFramebuffer(1 - displayed_buffer);
} else { } else {
// Copy from the in-memory surface to the framebuffer. // Copy from the in-memory surface to the framebuffer.
memcpy(gr_framebuffer[0].data, gr_draw->data, gr_draw->height * gr_draw->row_bytes); memcpy(gr_framebuffer[0].data, gr_draw->data, gr_draw->height * gr_draw->row_bytes);
@ -178,7 +155,7 @@ static GRSurface* fbdev_flip(minui_backend* backend __unused) {
return gr_draw; return gr_draw;
} }
static void fbdev_exit(minui_backend* backend __unused) { MinuiBackendFbdev::~MinuiBackendFbdev() {
close(fb_fd); close(fb_fd);
fb_fd = -1; fb_fd = -1;

44
minui/graphics_fbdev.h Normal file
View file

@ -0,0 +1,44 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef _GRAPHICS_FBDEV_H_
#define _GRAPHICS_FBDEV_H_
#include <linux/fb.h>
#include "graphics.h"
#include "minui/minui.h"
class MinuiBackendFbdev : public MinuiBackend {
public:
GRSurface* Init() override;
GRSurface* Flip() override;
void Blank(bool) override;
~MinuiBackendFbdev() override;
MinuiBackendFbdev();
private:
void SetDisplayedFramebuffer(unsigned n);
GRSurface gr_framebuffer[2];
bool double_buffered;
GRSurface* gr_draw;
int displayed_buffer;
fb_var_screeninfo vi;
int fb_fd;
};
#endif // _GRAPHICS_FBDEV_H_