am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend" (e9f9238a) · Commits · e / os / android_bootable_recovery

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,3 +48,4 @@
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
		# ************************************************
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/recovery_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libminui_intermediates/import_includes)

minui/Android.mk

+4 −1

Original line number	Diff line number	Diff line
		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES := graphics.c graphics_fbdev.c events.c resources.c
		LOCAL_SRC_FILES := graphics.c graphics_adf.c graphics_fbdev.c events.c \
		resources.c

		LOCAL_C_INCLUDES +=\
		external/libpng\
		external/zlib

		LOCAL_WHOLE_STATIC_LIBRARIES += libadf

		LOCAL_MODULE := libminui

		# This used to compare against values in double-quotes (which are just

minui/graphics.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -369,11 +369,21 @@ int gr_init(void)
		return -1;
		}

		gr_backend = open_adf();
		if (gr_backend) {
		gr_draw = gr_backend->init(gr_backend);
		if (!gr_draw) {
		gr_backend->exit(gr_backend);
		}
		}

		if (!gr_draw) {
		gr_backend = open_fbdev();
		gr_draw = gr_backend->init(gr_backend);
		if (gr_draw == NULL) {
		return -1;
		}
		}

		overscan_offset_x = gr_draw->width * overscan_percent / 100;
		overscan_offset_y = gr_draw->height * overscan_percent / 100;

minui/graphics.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ typedef struct minui_backend {
		} minui_backend;

		minui_backend* open_fbdev();
		minui_backend* open_adf();

		#ifdef __cplusplus
		}

minui/graphics_adf.c

0 → 100644

+247 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.
		*/

		#include <errno.h>
		#include <fcntl.h>
		#include <stdbool.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <unistd.h>

		#include <sys/cdefs.h>
		#include <sys/mman.h>

		#include <adf/adf.h>

		#include "graphics.h"

		struct adf_surface_pdata {
		GRSurface base;
		int fd;
		__u32 offset;
		__u32 pitch;
		};

		struct adf_pdata {
		minui_backend base;
		int intf_fd;
		adf_id_t eng_id;
		__u32 format;

		unsigned int current_surface;
		unsigned int n_surfaces;
		struct adf_surface_pdata surfaces[2];
		};

		static gr_surface adf_flip(struct minui_backend *backend);
		static void adf_blank(struct minui_backend *backend, bool blank);

		static int adf_surface_init(struct adf_pdata *pdata,
		struct drm_mode_modeinfo mode, struct adf_surface_pdata surf)
		{
		memset(surf, 0, sizeof(*surf));

		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->base.width = mode->hdisplay;
		surf->base.height = mode->vdisplay;
		surf->base.row_bytes = surf->pitch;
		surf->base.pixel_bytes = (pdata->format == DRM_FORMAT_RGB565) ? 2 : 4;

		surf->base.data = mmap(NULL, 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(struct adf_pdata *pdata)
		{
		struct adf_interface_data intf_data;
		int ret = 0;
		int err;

		err = adf_get_interface_data(pdata->intf_fd, &intf_data);
		if (err < 0)
		return err;

		err = adf_surface_init(pdata, &intf_data.current_mode, &pdata->surfaces[0]);
		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[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:
		adf_free_interface_data(&intf_data);
		return ret;
		}

		static int adf_device_init(struct adf_pdata pdata, struct adf_device dev)
		{
		adf_id_t intf_id;
		int intf_fd;
		int err;

		err = adf_find_simple_post_configuration(dev, &pdata->format, 1, &intf_id,
		&pdata->eng_id);
		if (err < 0)
		return err;

		err = adf_device_attach(dev, pdata->eng_id, intf_id);
		if (err < 0 && err != -EALREADY)
		return err;

		pdata->intf_fd = adf_interface_open(dev, intf_id, O_RDWR);
		if (pdata->intf_fd < 0)
		return pdata->intf_fd;

		err = adf_interface_init(pdata);
		if (err < 0) {
		close(pdata->intf_fd);
		pdata->intf_fd = -1;
		}

		return err;
		}

		static gr_surface adf_init(minui_backend *backend)
		{
		struct adf_pdata pdata = (struct adf_pdata )backend;
		adf_id_t *dev_ids = NULL;
		ssize_t n_dev_ids, i;
		gr_surface ret;

		#if defined(RECOVERY_BGRA)
		pdata->format = DRM_FORMAT_BGRA8888;
		#elif defined(RECOVERY_RGBX)
		pdata->format = DRM_FORMAT_RGBX8888;
		#else
		pdata->format = DRM_FORMAT_RGB565;
		#endif

		n_dev_ids = adf_devices(&dev_ids);
		if (n_dev_ids == 0) {
		return NULL;
		} else if (n_dev_ids < 0) {
		fprintf(stderr, "enumerating adf devices failed: %s\n",
		strerror(-n_dev_ids));
		return NULL;
		}

		pdata->intf_fd = -1;

		for (i = 0; i < n_dev_ids && pdata->intf_fd < 0; i++) {
		struct adf_device dev;

		int err = adf_device_open(dev_ids[i], O_RDWR, &dev);
		if (err < 0) {
		fprintf(stderr, "opening adf device %u failed: %s\n", dev_ids[i],
		strerror(-err));
		continue;
		}

		err = adf_device_init(pdata, &dev);
		if (err < 0)
		fprintf(stderr, "initializing adf device %u failed: %s\n",
		dev_ids[i], strerror(-err));

		adf_device_close(&dev);
		}

		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 gr_surface adf_flip(struct minui_backend *backend)
		{
		struct adf_pdata pdata = (struct adf_pdata )backend;
		struct 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)
		close(fence_fd);

		pdata->current_surface = (pdata->current_surface + 1) % pdata->n_surfaces;
		return &pdata->surfaces[pdata->current_surface].base;
		}

		static void adf_blank(struct minui_backend *backend, bool blank)
		{
		struct adf_pdata pdata = (struct adf_pdata )backend;
		adf_interface_blank(pdata->intf_fd,
		blank ? DRM_MODE_DPMS_OFF : DRM_MODE_DPMS_ON);
		}

		static void adf_surface_destroy(struct adf_surface_pdata *surf)
		{
		munmap(surf->base.data, surf->pitch * surf->base.height);
		close(surf->fd);
		}

		static void adf_exit(struct minui_backend *backend)
		{
		struct adf_pdata pdata = (struct adf_pdata )backend;
		unsigned int i;

		for (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()
		{
		struct adf_pdata pdata = calloc(1, sizeof(pdata));
		if (!pdata) {
		perror("allocating adf backend failed");
		return NULL;
		}

		pdata->base.init = adf_init;
		pdata->base.flip = adf_flip;
		pdata->base.blank = adf_blank;
		pdata->base.exit = adf_exit;
		return &pdata->base;
		}