public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-16 11:44:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/stm: Use drm_fb_cma_fbdev_init/fini()

Browse source 
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.
Remove duplicate ldev assignment.

Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Philippe Cornu <philippe.cornu@st.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Philippe Cornu <philippe.cornu@st.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171115142001.45358-14-noralf@tronnes.org
This commit is contained in:
Noralf Trønnes 2017-11-15 15:19:52 +01:00
parent 53889c92fd
commit 068b393c1a
2 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/gpu/drm/stm/drv.c
View file

@ -14,6 +14,7 @@
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#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_fb_helper.h>
#include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_cma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
@ -23,35 +24,19 @@
#define STM_MAX_FB_WIDTH 2048 #define STM_MAX_FB_WIDTH 2048
#define STM_MAX_FB_HEIGHT 2048 /* same as width to handle orientation */ #define STM_MAX_FB_HEIGHT 2048 /* same as width to handle orientation */
static void drv_output_poll_changed(struct drm_device *ddev)
{
struct ltdc_device *ldev = ddev->dev_private;
drm_fbdev_cma_hotplug_event(ldev->fbdev);
}
static const struct drm_mode_config_funcs drv_mode_config_funcs = { static const struct drm_mode_config_funcs drv_mode_config_funcs = {
.fb_create = drm_gem_fb_create, .fb_create = drm_gem_fb_create,
.output_poll_changed = drv_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 = drm_atomic_helper_commit, .atomic_commit = drm_atomic_helper_commit,
}; };
static void drv_lastclose(struct drm_device *ddev)
{
struct ltdc_device *ldev = ddev->dev_private;
DRM_DEBUG("%s\n", __func__);
drm_fbdev_cma_restore_mode(ldev->fbdev);
}
DEFINE_DRM_GEM_CMA_FOPS(drv_driver_fops); DEFINE_DRM_GEM_CMA_FOPS(drv_driver_fops);
static struct drm_driver drv_driver = { static struct drm_driver drv_driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |
DRIVER_ATOMIC, DRIVER_ATOMIC,
.lastclose = drv_lastclose, .lastclose = drm_fb_helper_lastclose,
.name = "stm", .name = "stm",
.desc = "STMicroelectronics SoC DRM", .desc = "STMicroelectronics SoC DRM",
.date = "20170330", .date = "20170330",
@ -78,7 +63,6 @@ static struct drm_driver drv_driver = {
static int drv_load(struct drm_device *ddev) static int drv_load(struct drm_device *ddev)
{ {
struct platform_device *pdev = to_platform_device(ddev->dev); struct platform_device *pdev = to_platform_device(ddev->dev);
struct drm_fbdev_cma *fbdev;
struct ltdc_device *ldev; struct ltdc_device *ldev;
int ret; int ret;
@ -111,14 +95,9 @@ static int drv_load(struct drm_device *ddev)
drm_kms_helper_poll_init(ddev); drm_kms_helper_poll_init(ddev);
if (ddev->mode_config.num_connector) { if (ddev->mode_config.num_connector) {
ldev = ddev->dev_private; ret = drm_fb_cma_fbdev_init(ddev, 16, 0);
fbdev = drm_fbdev_cma_init(ddev, 16, if (ret)
ddev->mode_config.num_connector);
if (IS_ERR(fbdev)) {
DRM_DEBUG("Warning: fails to create fbdev\n"); DRM_DEBUG("Warning: fails to create fbdev\n");
fbdev = NULL;
}
ldev->fbdev = fbdev;
} }
platform_set_drvdata(pdev, ddev); platform_set_drvdata(pdev, ddev);
@ -131,14 +110,9 @@ err:
static void drv_unload(struct drm_device *ddev) static void drv_unload(struct drm_device *ddev)
{ {
struct ltdc_device *ldev = ddev->dev_private;
DRM_DEBUG("%s\n", __func__); DRM_DEBUG("%s\n", __func__);
if (ldev->fbdev) { drm_fb_cma_fbdev_fini(ddev);
drm_fbdev_cma_fini(ldev->fbdev);
ldev->fbdev = NULL;
}
drm_kms_helper_poll_fini(ddev); drm_kms_helper_poll_fini(ddev);
ltdc_unload(ddev); ltdc_unload(ddev);
drm_mode_config_cleanup(ddev); drm_mode_config_cleanup(ddev);

1
drivers/gpu/drm/stm/ltdc.h
View file

@ -20,7 +20,6 @@ struct ltdc_caps {
}; };
struct ltdc_device { struct ltdc_device {
struct drm_fbdev_cma *fbdev;
void __iomem *regs; void __iomem *regs;
struct clk *pixel_clk; /* lcd pixel clock */ struct clk *pixel_clk; /* lcd pixel clock */
struct mutex err_lock; /* protecting error_status */ struct mutex err_lock; /* protecting error_status */