diff options
author | Dave Airlie <airlied@redhat.com> | 2016-06-08 21:02:30 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-06-08 21:02:30 -0400 |
commit | bb4cec0222f984d7ef282c06cc3644069db21bac (patch) | |
tree | 9e8ccb65ef1b5eba9aaa27d53aa25732c58cf8a9 /drivers/gpu/drm/omapdrm/omap_fb.c | |
parent | fa625c1956830c826ebf13324c2b33fcabef7db0 (diff) | |
parent | e1512ee08f00c17918093e75be4a3fa297bcaf9b (diff) |
Merge tag 'topic/lockless-gem-bo-freeing-2016-06-01' of git://anongit.freedesktop.org/drm-intel into drm-next
lockless gem bo freeing patches (and the oddball related patch) for all
the drivers who's maintainers are asleep at the helm - includes you ;-)
I based this on top of drm-fixes to include Chris' fix for the cma issue.
* tag 'topic/lockless-gem-bo-freeing-2016-06-01' of git://anongit.freedesktop.org/drm-intel: (21 commits)
drm/arcpgu: Use lockless gem BO free callback
drm/sun4i: Use lockless gem BO free callback
drm/omapdrm: Nuke dummy fb->dirty callback
drm/msm: Nuke dummy fb->dirty callback
drm/rockchip: Use cma gem vm ops
drm/sti: Use lockless gem BO free callback
drm: sti: remove useless call to dev->struct_mutex
drm/virtio: Use lockless gem BO free callback
drm/tilcdc: Use lockless gem BO free callback
drm/shmob: Use lockless gem BO free callback
drm/rockchip: Use lockless gem BO free callback
drm/rcar-du: Use lockless gem BO free callback
drm/qxl: Use lockless gem BO free callback
drm/nouveau: Use lockless gem BO free callback
drm/mga200g: Use lockless gem BO free callback
drm/fls-dcu: Use lockless gem BO free callback
drm/cirrus: Use lockless gem BO free callback
drm/bochs: Use lockless gem BO free callback
drm/atmel: Use lockless gem BO free callback
drm/ast: Use lockless gem BO free callback
...
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fb.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fb.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index f84570d1636c..664ccf97bc11 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c | |||
@@ -122,17 +122,9 @@ static void omap_framebuffer_destroy(struct drm_framebuffer *fb) | |||
122 | kfree(omap_fb); | 122 | kfree(omap_fb); |
123 | } | 123 | } |
124 | 124 | ||
125 | static int omap_framebuffer_dirty(struct drm_framebuffer *fb, | ||
126 | struct drm_file *file_priv, unsigned flags, unsigned color, | ||
127 | struct drm_clip_rect *clips, unsigned num_clips) | ||
128 | { | ||
129 | return 0; | ||
130 | } | ||
131 | |||
132 | static const struct drm_framebuffer_funcs omap_framebuffer_funcs = { | 125 | static const struct drm_framebuffer_funcs omap_framebuffer_funcs = { |
133 | .create_handle = omap_framebuffer_create_handle, | 126 | .create_handle = omap_framebuffer_create_handle, |
134 | .destroy = omap_framebuffer_destroy, | 127 | .destroy = omap_framebuffer_destroy, |
135 | .dirty = omap_framebuffer_dirty, | ||
136 | }; | 128 | }; |
137 | 129 | ||
138 | static uint32_t get_linear_addr(struct plane *plane, | 130 | static uint32_t get_linear_addr(struct plane *plane, |