drm/hisilicon/hibmc: Add support for frame buffer (d1667b86) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/hisilicon/hibmc/Makefile

+1 −1

Original line number	Diff line number	Diff line
		ccflags-y := -Iinclude/drm
		hibmc-drm-y := hibmc_drm_drv.o hibmc_ttm.o
		hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_fbdev.o hibmc_ttm.o

		obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -202,6 +202,7 @@ static int hibmc_unload(struct drm_device *dev)
		{
		struct hibmc_drm_private *priv = dev->dev_private;

		hibmc_fbdev_fini(priv);
		hibmc_mm_fini(priv);
		dev->dev_private = NULL;
		return 0;
		@@ -228,6 +229,12 @@ static int hibmc_load(struct drm_device *dev)
		if (ret)
		goto err;

		ret = hibmc_fbdev_init(priv);
		if (ret) {
		DRM_ERROR("failed to initialize fbdev: %d\n", ret);
		goto err;
		}

		return 0;

		err:

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -20,9 +20,21 @@
		#define HIBMC_DRM_DRV_H

		#include <drm/drmP.h>
		#include <drm/drm_fb_helper.h>
		#include <drm/drm_gem.h>
		#include <drm/ttm/ttm_bo_driver.h>

		struct hibmc_framebuffer {
		struct drm_framebuffer fb;
		struct drm_gem_object *obj;
		};

		struct hibmc_fbdev {
		struct drm_fb_helper helper;
		struct hibmc_framebuffer *fb;
		int size;
		};

		struct hibmc_drm_private {
		/* hw */
		void __iomem *mmio;
		@@ -39,9 +51,13 @@ struct hibmc_drm_private {
		struct ttm_bo_device bdev;
		bool initialized;

		/* fbdev */
		struct hibmc_fbdev *fbdev;
		bool mm_inited;
		};

		#define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb)

		struct hibmc_bo {
		struct ttm_buffer_object bo;
		struct ttm_placement placement;
		@@ -66,8 +82,16 @@ void hibmc_set_power_mode(struct hibmc_drm_private *priv,
		void hibmc_set_current_gate(struct hibmc_drm_private *priv,
		unsigned int gate);

		int hibmc_fbdev_init(struct hibmc_drm_private *priv);
		void hibmc_fbdev_fini(struct hibmc_drm_private *priv);

		int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
		struct drm_gem_object **obj);
		struct hibmc_framebuffer *
		hibmc_framebuffer_init(struct drm_device *dev,
		const struct drm_mode_fb_cmd2 *mode_cmd,
		struct drm_gem_object *obj);

		int hibmc_mm_init(struct hibmc_drm_private *hibmc);
		void hibmc_mm_fini(struct hibmc_drm_private *hibmc);
		int hibmc_bo_pin(struct hibmc_bo bo, u32 pl_flag, u64 gpu_addr);

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c

0 → 100644

+267 −0

Original line number	Diff line number	Diff line
		/* Hisilicon Hibmc SoC drm driver
		*
		* Based on the bochs drm driver.
		*
		* Copyright (c) 2016 Huawei Limited.
		*
		* Author:
		* Rongrong Zou <zourongrong@huawei.com>
		* Rongrong Zou <zourongrong@gmail.com>
		* Jianhua Li <lijianhua@huawei.com>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		*/

		#include <drm/drm_crtc.h>
		#include <drm/drm_crtc_helper.h>
		#include <drm/drm_fb_helper.h>

		#include "hibmc_drm_drv.h"

		static int hibmcfb_create_object(
		struct hibmc_drm_private *priv,
		const struct drm_mode_fb_cmd2 *mode_cmd,
		struct drm_gem_object **gobj_p)
		{
		struct drm_gem_object *gobj;
		struct drm_device *dev = priv->dev;
		u32 size;
		int ret = 0;

		size = mode_cmd->pitches[0] * mode_cmd->height;
		ret = hibmc_gem_create(dev, size, true, &gobj);
		if (ret)
		return ret;

		*gobj_p = gobj;
		return ret;
		}

		static struct fb_ops hibmc_drm_fb_ops = {
		.owner = THIS_MODULE,
		.fb_check_var = drm_fb_helper_check_var,
		.fb_set_par = drm_fb_helper_set_par,
		.fb_fillrect = drm_fb_helper_sys_fillrect,
		.fb_copyarea = drm_fb_helper_sys_copyarea,
		.fb_imageblit = drm_fb_helper_sys_imageblit,
		.fb_pan_display = drm_fb_helper_pan_display,
		.fb_blank = drm_fb_helper_blank,
		.fb_setcmap = drm_fb_helper_setcmap,
		};

		static int hibmc_drm_fb_create(struct drm_fb_helper *helper,
		struct drm_fb_helper_surface_size *sizes)
		{
		struct hibmc_fbdev *hi_fbdev =
		container_of(helper, struct hibmc_fbdev, helper);
		struct hibmc_drm_private *priv = helper->dev->dev_private;
		struct fb_info *info;
		struct drm_mode_fb_cmd2 mode_cmd;
		struct drm_gem_object *gobj = NULL;
		int ret = 0;
		int ret1;
		size_t size;
		unsigned int bytes_per_pixel;
		struct hibmc_bo *bo = NULL;

		DRM_DEBUG_DRIVER("surface width(%d), height(%d) and bpp(%d)\n",
		sizes->surface_width, sizes->surface_height,
		sizes->surface_bpp);
		sizes->surface_depth = 32;

		bytes_per_pixel = DIV_ROUND_UP(sizes->surface_bpp, 8);

		mode_cmd.width = sizes->surface_width;
		mode_cmd.height = sizes->surface_height;
		mode_cmd.pitches[0] = mode_cmd.width * bytes_per_pixel;
		mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
		sizes->surface_depth);

		size = PAGE_ALIGN(mode_cmd.pitches[0] * mode_cmd.height);

		ret = hibmcfb_create_object(priv, &mode_cmd, &gobj);
		if (ret) {
		DRM_ERROR("failed to create fbcon backing object: %d\n", ret);
		return -ENOMEM;
		}

		bo = gem_to_hibmc_bo(gobj);

		ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
		if (ret) {
		DRM_ERROR("failed to reserve ttm_bo: %d\n", ret);
		goto out_unref_gem;
		}

		ret = hibmc_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
		if (ret) {
		DRM_ERROR("failed to pin fbcon: %d\n", ret);
		goto out_unreserve_ttm_bo;
		}

		ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);
		if (ret) {
		DRM_ERROR("failed to kmap fbcon: %d\n", ret);
		goto out_unpin_bo;
		}
		ttm_bo_unreserve(&bo->bo);

		info = drm_fb_helper_alloc_fbi(helper);
		if (IS_ERR(info)) {
		ret = PTR_ERR(info);
		DRM_ERROR("failed to allocate fbi: %d\n", ret);
		goto out_release_fbi;
		}

		info->par = hi_fbdev;

		hi_fbdev->fb = hibmc_framebuffer_init(priv->dev, &mode_cmd, gobj);
		if (IS_ERR(hi_fbdev->fb)) {
		ret = PTR_ERR(info);
		DRM_ERROR("failed to initialize framebuffer: %d\n", ret);
		goto out_release_fbi;
		}

		priv->fbdev->size = size;
		hi_fbdev->helper.fb = &hi_fbdev->fb->fb;

		strcpy(info->fix.id, "hibmcdrmfb");

		info->flags = FBINFO_DEFAULT;
		info->fbops = &hibmc_drm_fb_ops;

		drm_fb_helper_fill_fix(info, hi_fbdev->fb->fb.pitches[0],
		hi_fbdev->fb->fb.depth);
		drm_fb_helper_fill_var(info, &priv->fbdev->helper, sizes->fb_width,
		sizes->fb_height);

		info->screen_base = bo->kmap.virtual;
		info->screen_size = size;

		info->fix.smem_start = bo->bo.mem.bus.offset + bo->bo.mem.bus.base;
		info->fix.smem_len = size;
		return 0;

		out_release_fbi:
		drm_fb_helper_release_fbi(helper);
		ret1 = ttm_bo_reserve(&bo->bo, true, false, NULL);
		if (ret1) {
		DRM_ERROR("failed to rsv ttm_bo when release fbi: %d\n", ret1);
		goto out_unref_gem;
		}
		ttm_bo_kunmap(&bo->kmap);
		out_unpin_bo:
		hibmc_bo_unpin(bo);
		out_unreserve_ttm_bo:
		ttm_bo_unreserve(&bo->bo);
		out_unref_gem:
		drm_gem_object_unreference_unlocked(gobj);

		return ret;
		}

		static void hibmc_fbdev_destroy(struct hibmc_fbdev *fbdev)
		{
		struct hibmc_framebuffer *gfb = fbdev->fb;
		struct drm_fb_helper *fbh = &fbdev->helper;

		drm_fb_helper_unregister_fbi(fbh);
		drm_fb_helper_release_fbi(fbh);

		drm_fb_helper_fini(fbh);

		if (gfb)
		drm_framebuffer_unreference(&gfb->fb);
		}

		static const struct drm_fb_helper_funcs hibmc_fbdev_helper_funcs = {
		.fb_probe = hibmc_drm_fb_create,
		};

		int hibmc_fbdev_init(struct hibmc_drm_private *priv)
		{
		int ret;
		struct fb_var_screeninfo *var;
		struct fb_fix_screeninfo *fix;
		struct hibmc_fbdev *hifbdev;

		hifbdev = devm_kzalloc(priv->dev->dev, sizeof(*hifbdev), GFP_KERNEL);
		if (!hifbdev) {
		DRM_ERROR("failed to allocate hibmc_fbdev\n");
		return -ENOMEM;
		}

		priv->fbdev = hifbdev;
		drm_fb_helper_prepare(priv->dev, &hifbdev->helper,
		&hibmc_fbdev_helper_funcs);

		/* Now just one crtc and one channel */
		ret = drm_fb_helper_init(priv->dev,
		&hifbdev->helper, 1, 1);
		if (ret) {
		DRM_ERROR("failed to initialize fb helper: %d\n", ret);
		return ret;
		}

		ret = drm_fb_helper_single_add_all_connectors(&hifbdev->helper);
		if (ret) {
		DRM_ERROR("failed to add all connectors: %d\n", ret);
		goto fini;
		}

		ret = drm_fb_helper_initial_config(&hifbdev->helper, 16);
		if (ret) {
		DRM_ERROR("failed to setup initial conn config: %d\n", ret);
		goto fini;
		}

		var = &hifbdev->helper.fbdev->var;
		fix = &hifbdev->helper.fbdev->fix;

		DRM_DEBUG_DRIVER("Member of info->var is :\n"
		"xres=%d\n"
		"yres=%d\n"
		"xres_virtual=%d\n"
		"yres_virtual=%d\n"
		"xoffset=%d\n"
		"yoffset=%d\n"
		"bits_per_pixel=%d\n"
		"...\n", var->xres, var->yres, var->xres_virtual,
		var->yres_virtual, var->xoffset, var->yoffset,
		var->bits_per_pixel);
		DRM_DEBUG_DRIVER("Member of info->fix is :\n"
		"smem_start=%lx\n"
		"smem_len=%d\n"
		"type=%d\n"
		"type_aux=%d\n"
		"visual=%d\n"
		"xpanstep=%d\n"
		"ypanstep=%d\n"
		"ywrapstep=%d\n"
		"line_length=%d\n"
		"accel=%d\n"
		"capabilities=%d\n"
		"...\n", fix->smem_start, fix->smem_len, fix->type,
		fix->type_aux, fix->visual, fix->xpanstep,
		fix->ypanstep, fix->ywrapstep, fix->line_length,
		fix->accel, fix->capabilities);

		return 0;

		fini:
		drm_fb_helper_fini(&hifbdev->helper);
		return ret;
		}

		void hibmc_fbdev_fini(struct hibmc_drm_private *priv)
		{
		if (!priv->fbdev)
		return;

		hibmc_fbdev_destroy(priv->fbdev);
		priv->fbdev = NULL;
		}

drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c

+67 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		*
		*/

		#include <drm/drm_atomic_helper.h>
		#include <ttm/ttm_page_alloc.h>

		#include "hibmc_drm_drv.h"
		@@ -483,3 +484,69 @@ int hibmc_dumb_mmap_offset(struct drm_file file, struct drm_device dev,
		drm_gem_object_unreference_unlocked(obj);
		return 0;
		}

		static void hibmc_user_framebuffer_destroy(struct drm_framebuffer *fb)
		{
		struct hibmc_framebuffer *hibmc_fb = to_hibmc_framebuffer(fb);

		drm_gem_object_unreference_unlocked(hibmc_fb->obj);
		drm_framebuffer_cleanup(fb);
		kfree(hibmc_fb);
		}

		static const struct drm_framebuffer_funcs hibmc_fb_funcs = {
		.destroy = hibmc_user_framebuffer_destroy,
		};

		struct hibmc_framebuffer *
		hibmc_framebuffer_init(struct drm_device *dev,
		const struct drm_mode_fb_cmd2 *mode_cmd,
		struct drm_gem_object *obj)
		{
		struct hibmc_framebuffer *hibmc_fb;
		int ret;

		hibmc_fb = kzalloc(sizeof(*hibmc_fb), GFP_KERNEL);
		if (!hibmc_fb) {
		DRM_ERROR("failed to allocate hibmc_fb\n");
		return ERR_PTR(-ENOMEM);
		}

		drm_helper_mode_fill_fb_struct(&hibmc_fb->fb, mode_cmd);
		hibmc_fb->obj = obj;
		ret = drm_framebuffer_init(dev, &hibmc_fb->fb, &hibmc_fb_funcs);
		if (ret) {
		DRM_ERROR("drm_framebuffer_init failed: %d\n", ret);
		kfree(hibmc_fb);
		return ERR_PTR(ret);
		}

		return hibmc_fb;
		}

		static struct drm_framebuffer *
		hibmc_user_framebuffer_create(struct drm_device *dev,
		struct drm_file *filp,
		const struct drm_mode_fb_cmd2 *mode_cmd)
		{
		struct drm_gem_object *obj;
		struct hibmc_framebuffer *hibmc_fb;

		DRM_DEBUG_DRIVER("%dx%d, format %c%c%c%c\n",
		mode_cmd->width, mode_cmd->height,
		(mode_cmd->pixel_format) & 0xff,
		(mode_cmd->pixel_format >> 8) & 0xff,
		(mode_cmd->pixel_format >> 16) & 0xff,
		(mode_cmd->pixel_format >> 24) & 0xff);

		obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
		if (!obj)
		return ERR_PTR(-ENOENT);

		hibmc_fb = hibmc_framebuffer_init(dev, mode_cmd, obj);
		if (IS_ERR(hibmc_fb)) {
		drm_gem_object_unreference_unlocked(obj);
		return ERR_PTR((long)hibmc_fb);
		}
		return &hibmc_fb->fb;
		}