GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/tegra: tegra_fb -> drm_framebuffer

Browse source 
Since tegra_fb is now the same as drm_framebuffer, we can just replace
the type completely.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-tegra@vger.kernel.org
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Daniel Stone 2018-03-30 15:11:27 +01:00 • committed by Thierry Reding
parent 0bc6af006f
commit dbc33c7d65
2 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/tegra/drm.h
View file

@ -29,14 +29,10 @@
struct reset_control; struct reset_control;
struct tegra_fb {
struct drm_framebuffer base;
};
#ifdef CONFIG_DRM_FBDEV_EMULATION #ifdef CONFIG_DRM_FBDEV_EMULATION
struct tegra_fbdev { struct tegra_fbdev {
struct drm_fb_helper base; struct drm_fb_helper base;
struct tegra_fb *fb; struct drm_framebuffer *fb;
}; };
#endif #endif

34
drivers/gpu/drm/tegra/fb.c
View file

@ -16,11 +16,6 @@
#include "gem.h" #include "gem.h"
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
static inline struct tegra_fb *to_tegra_fb(struct drm_framebuffer *fb)
{
return container_of(fb, struct tegra_fb, base);
}
#ifdef CONFIG_DRM_FBDEV_EMULATION #ifdef CONFIG_DRM_FBDEV_EMULATION
static inline struct tegra_fbdev *to_tegra_fbdev(struct drm_fb_helper *helper) static inline struct tegra_fbdev *to_tegra_fbdev(struct drm_fb_helper *helper)
{ {
@ -99,7 +94,6 @@ int tegra_fb_get_tiling(struct drm_framebuffer *framebuffer,
static void tegra_fb_destroy(struct drm_framebuffer *framebuffer) static void tegra_fb_destroy(struct drm_framebuffer *framebuffer)
{ {
struct tegra_fb *fb = to_tegra_fb(framebuffer);
unsigned int i; unsigned int i;
for (i = 0; i < framebuffer->format->num_planes; i++) { for (i = 0; i < framebuffer->format->num_planes; i++) {
@ -114,7 +108,7 @@ static void tegra_fb_destroy(struct drm_framebuffer *framebuffer)
} }
drm_framebuffer_cleanup(framebuffer); drm_framebuffer_cleanup(framebuffer);
kfree(fb); kfree(framebuffer);
} }
static const struct drm_framebuffer_funcs tegra_fb_funcs = { static const struct drm_framebuffer_funcs tegra_fb_funcs = {
@ -122,12 +116,12 @@ static const struct drm_framebuffer_funcs tegra_fb_funcs = {
.create_handle = drm_gem_fb_create_handle, .create_handle = drm_gem_fb_create_handle,
}; };
static struct tegra_fb *tegra_fb_alloc(struct drm_device *drm, static struct drm_framebuffer *tegra_fb_alloc(struct drm_device *drm,
const struct drm_mode_fb_cmd2 *mode_cmd, const struct drm_mode_fb_cmd2 *mode_cmd,
struct tegra_bo **planes, struct tegra_bo **planes,
unsigned int num_planes) unsigned int num_planes)
{ {
struct tegra_fb *fb; struct drm_framebuffer *fb;
unsigned int i; unsigned int i;
int err; int err;
@ -135,12 +129,12 @@ static struct tegra_fb *tegra_fb_alloc(struct drm_device *drm,
if (!fb) if (!fb)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
drm_helper_mode_fill_fb_struct(drm, &fb->base, mode_cmd); drm_helper_mode_fill_fb_struct(drm, fb, mode_cmd);
for (i = 0; i < fb->base.format->num_planes; i++) for (i = 0; i < fb->format->num_planes; i++)
fb->base.obj[i] = &planes[i]->gem; fb->obj[i] = &planes[i]->gem;
err = drm_framebuffer_init(drm, &fb->base, &tegra_fb_funcs); err = drm_framebuffer_init(drm, fb, &tegra_fb_funcs);
if (err < 0) { if (err < 0) {
dev_err(drm->dev, "failed to initialize framebuffer: %d\n", dev_err(drm->dev, "failed to initialize framebuffer: %d\n",
err); err);
@ -158,7 +152,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
unsigned int hsub, vsub, i; unsigned int hsub, vsub, i;
struct tegra_bo *planes[4]; struct tegra_bo *planes[4];
struct drm_gem_object *gem; struct drm_gem_object *gem;
struct tegra_fb *fb; struct drm_framebuffer *fb;
int err; int err;
hsub = drm_format_horz_chroma_subsampling(cmd->pixel_format); hsub = drm_format_horz_chroma_subsampling(cmd->pixel_format);
@ -194,7 +188,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
goto unreference; goto unreference;
} }
return &fb->base; return fb;
unreference: unreference:
while (i--) while (i--)
@ -275,7 +269,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
return PTR_ERR(fbdev->fb); return PTR_ERR(fbdev->fb);
} }
fb = &fbdev->fb->base; fb = fbdev->fb;
helper->fb = fb; helper->fb = fb;
helper->fbdev = info; helper->fbdev = info;
@ -376,7 +370,7 @@ static void tegra_fbdev_exit(struct tegra_fbdev *fbdev)
drm_fb_helper_unregister_fbi(&fbdev->base); drm_fb_helper_unregister_fbi(&fbdev->base);
if (fbdev->fb) if (fbdev->fb)
drm_framebuffer_remove(&fbdev->fb->base); drm_framebuffer_remove(fbdev->fb);
drm_fb_helper_fini(&fbdev->base); drm_fb_helper_fini(&fbdev->base);
tegra_fbdev_free(fbdev); tegra_fbdev_free(fbdev);