summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/via/via_drv.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2011-10-25 23:37:09 +0200
committerDave Airlie <airlied@redhat.com>2012-07-19 22:48:28 -0400
commit834859c3abf9272bf55bd0d0c95e5a892f24dadc (patch)
tree2029970d5992422f8e7cecdcc893e0d167599bcd /drivers/gpu/drm/via/via_drv.c
parent5bd42f69fbedfc12cd8161323a9ffab0b2586a2a (diff)
downloadop-kernel-dev-834859c3abf9272bf55bd0d0c95e5a892f24dadc.zip
op-kernel-dev-834859c3abf9272bf55bd0d0c95e5a892f24dadc.tar.gz
drm/via: clean up reclaim_buffers
A few things - kill reclaim_buffers, it's never ever called because via does not set DRIVER_HAVE_DMA - inline the idlelock dance into the buffer reclaim logic and make it a simple preclose cleanup function - directly call the the dma_quiescent function and kill the needless if check. v2: Actually drop the idlelock when we take it. Reported by James Simmons. v3: Rebased onto latest drm-next. v4: Fixup the refactor. v5: More fixup the refactor - I've accidentally changed the check for any master to checking whether the closing fd is the master. v6: Don't forget to drop the idlelock in the early return path, too. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/via/via_drv.c')
-rw-r--r--drivers/gpu/drm/via/via_drv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 02661f3..e927b4c 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -75,6 +75,7 @@ static struct drm_driver driver = {
.load = via_driver_load,
.unload = via_driver_unload,
.open = via_driver_open,
+ .preclose = via_reclaim_buffers_locked,
.postclose = via_driver_postclose,
.context_dtor = via_final_context,
.get_vblank_counter = via_get_vblank_counter,
@@ -85,9 +86,6 @@ static struct drm_driver driver = {
.irq_uninstall = via_driver_irq_uninstall,
.irq_handler = via_driver_irq_handler,
.dma_quiescent = via_driver_dma_quiescent,
- .reclaim_buffers = drm_core_reclaim_buffers,
- .reclaim_buffers_locked = NULL,
- .reclaim_buffers_idlelocked = via_reclaim_buffers_locked,
.lastclose = via_lastclose,
.ioctls = via_ioctls,
.fops = &via_driver_fops,
OpenPOWER on IntegriCloud