diff options
| author | Daniel Stone <daniels@collabora.com> | 2018-03-30 15:11:33 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2018-05-18 14:52:36 +0100 |
| commit | ecb8a947855c9658cd0382f3cab39f91a7ebe86a (patch) | |
| tree | a6564a99f98f1d4349c2609d96edff8cd4c94fcb /drivers/gpu/drm/armada/armada_fb.h | |
| parent | 3823da3aeb47c1b5f07974cf7c87443da2a93ad0 (diff) | |
drm/armada: Move GEM BO to drm_framebuffer
Since drm_framebuffer can now store GEM objects directly, place them
there rather than in our own subclass. As this makes the framebuffer
create_handle and destroy functions the same as the GEM framebuffer
helper, we can reuse those.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Russell King <linux@armlinux.org.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180330141138.28987-19-daniels@collabora.com
Diffstat (limited to 'drivers/gpu/drm/armada/armada_fb.h')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_fb.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_fb.h b/drivers/gpu/drm/armada/armada_fb.h index 48073c4f54d8..5c130ff5da77 100644 --- a/drivers/gpu/drm/armada/armada_fb.h +++ b/drivers/gpu/drm/armada/armada_fb.h @@ -10,13 +10,12 @@ struct armada_framebuffer { struct drm_framebuffer fb; - struct armada_gem_object *obj; uint8_t fmt; uint8_t mod; }; #define drm_fb_to_armada_fb(dfb) \ container_of(dfb, struct armada_framebuffer, fb) -#define drm_fb_obj(fb) drm_fb_to_armada_fb(fb)->obj +#define drm_fb_obj(fb) drm_to_armada_gem((fb)->obj[0]) struct armada_framebuffer *armada_framebuffer_create(struct drm_device *, const struct drm_mode_fb_cmd2 *, struct armada_gem_object *); |