Commit a8824850 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/hisilicon/hibmc: Switch to generic fbdev emulation 



There's nothing special about hibmc's fbdev emulation that is not
provided by the generic implementation. Switch over and remove the
driver's code.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191203083819.6643-2-tzimmermann@suse.de
parent 0eee6152

drivers/gpu/drm/hisilicon/hibmc/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_fbdev.o hibmc_ttm.o

hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_ttm.o



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

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

+2 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_gem_vram_helper.h>

#include <drm/drm_irq.h>

#include <drm/drm_print.h>
@@ -247,8 +248,6 @@ static int hibmc_unload(struct drm_device *dev) 
{

	struct hibmc_drm_private *priv = dev->dev_private;



	hibmc_fbdev_fini(priv);



	drm_atomic_helper_shutdown(dev);



	if (dev->irq_enabled)
@@ -307,7 +306,7 @@ static int hibmc_load(struct drm_device *dev) 
	/* reset all the states of crtc/plane/encoder/connector */

	drm_mode_config_reset(dev);



	ret = hibmc_fbdev_init(priv);

	ret = drm_fbdev_generic_setup(dev, 16);

	if (ret) {

		DRM_ERROR("failed to initialize fbdev: %d\n", ret);

		goto err;

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

+0 −11
Original line number Diff line number Diff line
@@ -25,12 +25,6 @@ struct hibmc_framebuffer { 
	struct drm_gem_object *obj;

};



struct hibmc_fbdev {

	struct drm_fb_helper helper; /* must be first */

	struct hibmc_framebuffer *fb;

	int size;

};



struct hibmc_drm_private {

	/* hw */

	void __iomem   *mmio;
@@ -42,9 +36,6 @@ struct hibmc_drm_private { 
	/* drm */

	struct drm_device  *dev;

	bool mode_config_initialized;



	/* fbdev */

	struct hibmc_fbdev *fbdev;

};



#define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb)
@@ -56,8 +47,6 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv, 


int hibmc_de_init(struct hibmc_drm_private *priv);

int hibmc_vdac_init(struct hibmc_drm_private *priv);

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);

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

deleted100644 → 0
+0 −240
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/* 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>

 */



#include <drm/drm_crtc.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_vram_helper.h>

#include <drm/drm_probe_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 const 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;

	size_t size;

	unsigned int bytes_per_pixel;

	struct drm_gem_vram_object *gbo = NULL;

	void *base;



	DRM_DEBUG_DRIVER("surface width(%d), height(%d) and bpp(%d)\n",

			 sizes->surface_width, sizes->surface_height,

			 sizes->surface_bpp);



	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;

	}



	gbo = drm_gem_vram_of_gem(gobj);



	ret = drm_gem_vram_pin(gbo, DRM_GEM_VRAM_PL_FLAG_VRAM);

	if (ret) {

		DRM_ERROR("failed to pin fbcon: %d\n", ret);

		goto out_unref_gem;

	}



	base = drm_gem_vram_kmap(gbo, true, NULL);

	if (IS_ERR(base)) {

		ret = PTR_ERR(base);

		DRM_ERROR("failed to kmap fbcon: %d\n", ret);

		goto out_unpin_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;

	}



	hi_fbdev->fb = hibmc_framebuffer_init(priv->dev, &mode_cmd, gobj);

	if (IS_ERR(hi_fbdev->fb)) {

		ret = PTR_ERR(hi_fbdev->fb);

		hi_fbdev->fb = NULL;

		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;



	info->fbops = &hibmc_drm_fb_ops;



	drm_fb_helper_fill_info(info, &priv->fbdev->helper, sizes);



	info->screen_base = base;

	info->screen_size = size;



	info->fix.smem_start = gbo->bo.mem.bus.offset + gbo->bo.mem.bus.base;

	info->fix.smem_len = size;

	return 0;



out_release_fbi:

	drm_gem_vram_kunmap(gbo);

out_unpin_bo:

	drm_gem_vram_unpin(gbo);

out_unref_gem:

	drm_gem_object_put_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_fini(fbh);



	if (gfb)

		drm_framebuffer_put(&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);

	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;

}