forked from Minki/linux
ff1f62d35b
drm_fb_helper_{add,remove}_one_connector() and drm_fb_helper_single_add_all_connectors() are dummy functions now and serve no purpose. Hence remove their calls. This is the preparatory step for removing the drm_fb_helper_{add,remove}_one_connector() functions from drm_fb_helper.h This removal is done using below sementic patch and unused variable compilation warnings are fixed manually. @@ @@ - drm_fb_helper_single_add_all_connectors(...); @@ expression e1; statement S; @@ - e1 = drm_fb_helper_single_add_all_connectors(...); - S @@ @@ - drm_fb_helper_add_one_connector(...); @@ @@ - drm_fb_helper_remove_one_connector(...); Changes since v1: * Squashed warning fixes into the patch that introduced the warnings (into 5/7) (Laurent, Emil, Lyude) Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20200305120434.111091-6-pankaj.laxminarayan.bharadiya@intel.com
168 lines
3.6 KiB
C
168 lines
3.6 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2012 Russell King
|
|
* Written from the i915 driver.
|
|
*/
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
|
|
#include <drm/drm_fb_helper.h>
|
|
#include <drm/drm_fourcc.h>
|
|
|
|
#include "armada_crtc.h"
|
|
#include "armada_drm.h"
|
|
#include "armada_fb.h"
|
|
#include "armada_gem.h"
|
|
|
|
static const struct fb_ops armada_fb_ops = {
|
|
.owner = THIS_MODULE,
|
|
DRM_FB_HELPER_DEFAULT_OPS,
|
|
.fb_fillrect = drm_fb_helper_cfb_fillrect,
|
|
.fb_copyarea = drm_fb_helper_cfb_copyarea,
|
|
.fb_imageblit = drm_fb_helper_cfb_imageblit,
|
|
};
|
|
|
|
static int armada_fbdev_create(struct drm_fb_helper *fbh,
|
|
struct drm_fb_helper_surface_size *sizes)
|
|
{
|
|
struct drm_device *dev = fbh->dev;
|
|
struct drm_mode_fb_cmd2 mode;
|
|
struct armada_framebuffer *dfb;
|
|
struct armada_gem_object *obj;
|
|
struct fb_info *info;
|
|
int size, ret;
|
|
void *ptr;
|
|
|
|
memset(&mode, 0, sizeof(mode));
|
|
mode.width = sizes->surface_width;
|
|
mode.height = sizes->surface_height;
|
|
mode.pitches[0] = armada_pitch(mode.width, sizes->surface_bpp);
|
|
mode.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
|
|
sizes->surface_depth);
|
|
|
|
size = mode.pitches[0] * mode.height;
|
|
obj = armada_gem_alloc_private_object(dev, size);
|
|
if (!obj) {
|
|
DRM_ERROR("failed to allocate fb memory\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
ret = armada_gem_linear_back(dev, obj);
|
|
if (ret) {
|
|
drm_gem_object_put_unlocked(&obj->obj);
|
|
return ret;
|
|
}
|
|
|
|
ptr = armada_gem_map_object(dev, obj);
|
|
if (!ptr) {
|
|
drm_gem_object_put_unlocked(&obj->obj);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
dfb = armada_framebuffer_create(dev, &mode, obj);
|
|
|
|
/*
|
|
* A reference is now held by the framebuffer object if
|
|
* successful, otherwise this drops the ref for the error path.
|
|
*/
|
|
drm_gem_object_put_unlocked(&obj->obj);
|
|
|
|
if (IS_ERR(dfb))
|
|
return PTR_ERR(dfb);
|
|
|
|
info = drm_fb_helper_alloc_fbi(fbh);
|
|
if (IS_ERR(info)) {
|
|
ret = PTR_ERR(info);
|
|
goto err_fballoc;
|
|
}
|
|
|
|
info->fbops = &armada_fb_ops;
|
|
info->fix.smem_start = obj->phys_addr;
|
|
info->fix.smem_len = obj->obj.size;
|
|
info->screen_size = obj->obj.size;
|
|
info->screen_base = ptr;
|
|
fbh->fb = &dfb->fb;
|
|
|
|
drm_fb_helper_fill_info(info, fbh, sizes);
|
|
|
|
DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n",
|
|
dfb->fb.width, dfb->fb.height, dfb->fb.format->cpp[0] * 8,
|
|
(unsigned long long)obj->phys_addr);
|
|
|
|
return 0;
|
|
|
|
err_fballoc:
|
|
dfb->fb.funcs->destroy(&dfb->fb);
|
|
return ret;
|
|
}
|
|
|
|
static int armada_fb_probe(struct drm_fb_helper *fbh,
|
|
struct drm_fb_helper_surface_size *sizes)
|
|
{
|
|
int ret = 0;
|
|
|
|
if (!fbh->fb) {
|
|
ret = armada_fbdev_create(fbh, sizes);
|
|
if (ret == 0)
|
|
ret = 1;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static const struct drm_fb_helper_funcs armada_fb_helper_funcs = {
|
|
.fb_probe = armada_fb_probe,
|
|
};
|
|
|
|
int armada_fbdev_init(struct drm_device *dev)
|
|
{
|
|
struct armada_private *priv = dev->dev_private;
|
|
struct drm_fb_helper *fbh;
|
|
int ret;
|
|
|
|
fbh = devm_kzalloc(dev->dev, sizeof(*fbh), GFP_KERNEL);
|
|
if (!fbh)
|
|
return -ENOMEM;
|
|
|
|
priv->fbdev = fbh;
|
|
|
|
drm_fb_helper_prepare(dev, fbh, &armada_fb_helper_funcs);
|
|
|
|
ret = drm_fb_helper_init(dev, fbh);
|
|
if (ret) {
|
|
DRM_ERROR("failed to initialize drm fb helper\n");
|
|
goto err_fb_helper;
|
|
}
|
|
|
|
ret = drm_fb_helper_initial_config(fbh, 32);
|
|
if (ret) {
|
|
DRM_ERROR("failed to set initial config\n");
|
|
goto err_fb_setup;
|
|
}
|
|
|
|
return 0;
|
|
err_fb_setup:
|
|
drm_fb_helper_fini(fbh);
|
|
err_fb_helper:
|
|
priv->fbdev = NULL;
|
|
return ret;
|
|
}
|
|
|
|
void armada_fbdev_fini(struct drm_device *dev)
|
|
{
|
|
struct armada_private *priv = dev->dev_private;
|
|
struct drm_fb_helper *fbh = priv->fbdev;
|
|
|
|
if (fbh) {
|
|
drm_fb_helper_unregister_fbi(fbh);
|
|
|
|
drm_fb_helper_fini(fbh);
|
|
|
|
if (fbh->fb)
|
|
fbh->fb->funcs->destroy(fbh->fb);
|
|
|
|
priv->fbdev = NULL;
|
|
}
|
|
}
|