UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/vc4: Use drm_fb_cma_fbdev_init/fini() 

Use drm_fb_cma_fbdev_init() and drm_fb_cma_fbdev_fini() which relies on
the fact that drm_device holds a pointer to the drm_fb_helper structure.
This means that the driver doesn't have to keep track of that.
Also use the drm_fb_helper functions directly.

Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20171115142001.45358-18-noralf@tronnes.org
This commit is contained in:
Noralf Trønnes 2017-11-15 15:19:56 +01:00
parent 4f054fcf47
commit b8f429a77f
3 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/vc4/vc4_drv.c
View File

@ -111,13 +111,6 @@ static int vc4_get_param_ioctl(struct drm_device *dev, void *data,
return 0; return 0;
} }
static void vc4_lastclose(struct drm_device *dev)
{
struct vc4_dev *vc4 = to_vc4_dev(dev);
drm_fbdev_cma_restore_mode(vc4->fbdev);
}
static const struct vm_operations_struct vc4_vm_ops = { static const struct vm_operations_struct vc4_vm_ops = {
.fault = vc4_fault, .fault = vc4_fault,
.open = drm_gem_vm_open, .open = drm_gem_vm_open,
@ -159,7 +152,7 @@ static struct drm_driver vc4_drm_driver = {
DRIVER_HAVE_IRQ | DRIVER_HAVE_IRQ |
DRIVER_RENDER | DRIVER_RENDER |
DRIVER_PRIME), DRIVER_PRIME),
.lastclose = vc4_lastclose, .lastclose = drm_fb_helper_lastclose,
.irq_handler = vc4_irq, .irq_handler = vc4_irq,
.irq_preinstall = vc4_irq_preinstall, .irq_preinstall = vc4_irq_preinstall,
.irq_postinstall = vc4_irq_postinstall, .irq_postinstall = vc4_irq_postinstall,
@ -301,12 +294,10 @@ static void vc4_drm_unbind(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct drm_device *drm = platform_get_drvdata(pdev); struct drm_device *drm = platform_get_drvdata(pdev);
struct vc4_dev *vc4 = to_vc4_dev(drm);
drm_dev_unregister(drm); drm_dev_unregister(drm);
if (vc4->fbdev) drm_fb_cma_fbdev_fini(drm);
drm_fbdev_cma_fini(vc4->fbdev);
drm_mode_config_cleanup(drm); drm_mode_config_cleanup(drm);

2
drivers/gpu/drm/vc4/vc4_drv.h
View File

@ -39,8 +39,6 @@ struct vc4_dev {
struct vc4_dsi *dsi1; struct vc4_dsi *dsi1;
struct vc4_vec *vec; struct vc4_vec *vec;
struct drm_fbdev_cma *fbdev;
struct vc4_hang_state *hang_state; struct vc4_hang_state *hang_state;
/* The kernel-space BO cache. Tracks buffers that have been /* The kernel-space BO cache. Tracks buffers that have been

18
drivers/gpu/drm/vc4/vc4_kms.c
View File

@ -19,17 +19,11 @@
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
#include "vc4_drv.h" #include "vc4_drv.h"
static void vc4_output_poll_changed(struct drm_device *dev)
{
struct vc4_dev *vc4 = to_vc4_dev(dev);
drm_fbdev_cma_hotplug_event(vc4->fbdev);
}
static void static void
vc4_atomic_complete_commit(struct drm_atomic_state *state) vc4_atomic_complete_commit(struct drm_atomic_state *state)
{ {
@ -194,7 +188,7 @@ static struct drm_framebuffer *vc4_fb_create(struct drm_device *dev,
} }
static const struct drm_mode_config_funcs vc4_mode_funcs = { static const struct drm_mode_config_funcs vc4_mode_funcs = {
.output_poll_changed = vc4_output_poll_changed, .output_poll_changed = drm_fb_helper_output_poll_changed,
.atomic_check = drm_atomic_helper_check, .atomic_check = drm_atomic_helper_check,
.atomic_commit = vc4_atomic_commit, .atomic_commit = vc4_atomic_commit,
.fb_create = vc4_fb_create, .fb_create = vc4_fb_create,
@ -224,12 +218,8 @@ int vc4_kms_load(struct drm_device *dev)
drm_mode_config_reset(dev); drm_mode_config_reset(dev);
if (dev->mode_config.num_connector) { if (dev->mode_config.num_connector)
vc4->fbdev = drm_fbdev_cma_init(dev, 32, drm_fb_cma_fbdev_init(dev, 32, 0);
dev->mode_config.num_connector);
if (IS_ERR(vc4->fbdev))
vc4->fbdev = NULL;
}
drm_kms_helper_poll_init(dev); drm_kms_helper_poll_init(dev);