Skip to content

Commit

Permalink
drm/tegra: Remove bogus tegra_framebuffer structure
Browse files Browse the repository at this point in the history
Tegra uses the CMA FB helpers so framebuffers passed to the driver need
to use the corresponding functions to access the underlying GEM objects.

This used to work because struct tegra_framebuffer was sufficiently
similar to struct drm_fb_cma but that isn't guaranteed to stay that way.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
  • Loading branch information
Thierry Reding committed Feb 22, 2013
1 parent 8cf1e98 commit 894752b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/tegra/dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ static int tegra_crtc_mode_set(struct drm_crtc *crtc,
struct drm_display_mode *adjusted,
int x, int y, struct drm_framebuffer *old_fb)
{
struct tegra_framebuffer *fb = to_tegra_fb(crtc->fb);
struct drm_gem_cma_object *gem = drm_fb_cma_get_gem_obj(crtc->fb, 0);
struct tegra_dc *dc = to_tegra_dc(crtc);
unsigned int h_dda, v_dda, bpp;
struct tegra_dc_window win;
Expand Down
11 changes: 0 additions & 11 deletions drivers/gpu/drm/tegra/drm.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_fixed.h>

struct tegra_framebuffer {
struct drm_framebuffer base;
struct drm_gem_cma_object *obj;
};

static inline struct tegra_framebuffer *to_tegra_fb(struct drm_framebuffer *fb)
{
return container_of(fb, struct tegra_framebuffer, base);
}

struct host1x {
struct drm_device *drm;
struct device *dev;
Expand All @@ -44,7 +34,6 @@ struct host1x {
struct list_head clients;

struct drm_fbdev_cma *fbdev;
struct tegra_framebuffer fb;
};

struct host1x_client;
Expand Down

0 comments on commit 894752b

Please sign in to comment.