Commit 8e3aac3b authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Tomi Valkeinen

drm/omapdrm: Remove fbdev from struct omap_drm_private

The DRM device stores a pointer to the fbdev helper. Remove struct
omap_drm_private.fbdev, which contains the same value. No functional
changes.

v2:
	* don't clear dev->fb_helper unnecessarily (Tomi)
	* include omap_fbdev.h in omap_fbdev.c (kernel test robot)
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230403104035.15288-5-tzimmermann@suse.de
parent 194c9e20
...@@ -47,15 +47,15 @@ static int fb_show(struct seq_file *m, void *arg) ...@@ -47,15 +47,15 @@ static int fb_show(struct seq_file *m, void *arg)
{ {
struct drm_info_node *node = (struct drm_info_node *) m->private; struct drm_info_node *node = (struct drm_info_node *) m->private;
struct drm_device *dev = node->minor->dev; struct drm_device *dev = node->minor->dev;
struct omap_drm_private *priv = dev->dev_private; struct drm_fb_helper *helper = dev->fb_helper;
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
seq_printf(m, "fbcon "); seq_printf(m, "fbcon ");
omap_framebuffer_describe(priv->fbdev->fb, m); omap_framebuffer_describe(helper->fb, m);
mutex_lock(&dev->mode_config.fb_lock); mutex_lock(&dev->mode_config.fb_lock);
list_for_each_entry(fb, &dev->mode_config.fb_list, head) { list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
if (fb == priv->fbdev->fb) if (fb == helper->fb)
continue; continue;
seq_printf(m, "user "); seq_printf(m, "user ");
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "omap_dmm_tiler.h" #include "omap_dmm_tiler.h"
#include "omap_drv.h" #include "omap_drv.h"
#include "omap_fbdev.h"
#define DRIVER_NAME MODULE_NAME #define DRIVER_NAME MODULE_NAME
#define DRIVER_DESC "OMAP DRM" #define DRIVER_DESC "OMAP DRM"
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "omap_crtc.h" #include "omap_crtc.h"
#include "omap_encoder.h" #include "omap_encoder.h"
#include "omap_fb.h" #include "omap_fb.h"
#include "omap_fbdev.h"
#include "omap_gem.h" #include "omap_gem.h"
#include "omap_irq.h" #include "omap_irq.h"
#include "omap_plane.h" #include "omap_plane.h"
...@@ -77,8 +76,6 @@ struct omap_drm_private { ...@@ -77,8 +76,6 @@ struct omap_drm_private {
struct drm_private_obj glob_obj; struct drm_private_obj glob_obj;
struct drm_fb_helper *fbdev;
struct workqueue_struct *wq; struct workqueue_struct *wq;
/* lock for obj_list below */ /* lock for obj_list below */
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
#include "omap_drv.h" #include "omap_drv.h"
#include "omap_fbdev.h"
MODULE_PARM_DESC(ywrap, "Enable ywrap scrolling (omap44xx and later, default 'y')"); MODULE_PARM_DESC(ywrap, "Enable ywrap scrolling (omap44xx and later, default 'y')");
static bool ywrap_enabled = true; static bool ywrap_enabled = true;
...@@ -250,8 +251,6 @@ void omap_fbdev_init(struct drm_device *dev) ...@@ -250,8 +251,6 @@ void omap_fbdev_init(struct drm_device *dev)
if (ret) if (ret)
goto fini; goto fini;
priv->fbdev = helper;
return; return;
fini: fini:
...@@ -265,8 +264,7 @@ void omap_fbdev_init(struct drm_device *dev) ...@@ -265,8 +264,7 @@ void omap_fbdev_init(struct drm_device *dev)
void omap_fbdev_fini(struct drm_device *dev) void omap_fbdev_fini(struct drm_device *dev)
{ {
struct omap_drm_private *priv = dev->dev_private; struct drm_fb_helper *helper = dev->fb_helper;
struct drm_fb_helper *helper = priv->fbdev;
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
struct drm_gem_object *bo; struct drm_gem_object *bo;
struct omap_fbdev *fbdev; struct omap_fbdev *fbdev;
...@@ -296,6 +294,4 @@ void omap_fbdev_fini(struct drm_device *dev) ...@@ -296,6 +294,4 @@ void omap_fbdev_fini(struct drm_device *dev)
drm_fb_helper_unprepare(helper); drm_fb_helper_unprepare(helper);
kfree(fbdev); kfree(fbdev);
priv->fbdev = NULL;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment