diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-10-25 17:42:59 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-07-19 22:49:17 -0400 |
commit | ea5e437406701838751ebc0f797d8b1c31df8121 (patch) | |
tree | 58a2fc21ddfb474f25cd045744324e148078f47c /drivers/gpu/drm/sis/sis_drv.c | |
parent | 834859c3abf9272bf55bd0d0c95e5a892f24dadc (diff) |
drm/sis: clean up reclaim_buffers
Like for via.
v2: Actually drop the idlelock again if taken.
v3: Fixup.
v4: Fixup the "has master" vs. "is master" confusion the refactor
introduced.
v5: Drop the idlelock in the early return path.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/sis/sis_drv.c')
-rw-r--r-- | drivers/gpu/drm/sis/sis_drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c index dd14cd1a0033..7f119870147c 100644 --- a/drivers/gpu/drm/sis/sis_drv.c +++ b/drivers/gpu/drm/sis/sis_drv.c | |||
@@ -105,10 +105,9 @@ static struct drm_driver driver = { | |||
105 | .load = sis_driver_load, | 105 | .load = sis_driver_load, |
106 | .unload = sis_driver_unload, | 106 | .unload = sis_driver_unload, |
107 | .open = sis_driver_open, | 107 | .open = sis_driver_open, |
108 | .preclose = sis_reclaim_buffers_locked, | ||
108 | .postclose = sis_driver_postclose, | 109 | .postclose = sis_driver_postclose, |
109 | .dma_quiescent = sis_idle, | 110 | .dma_quiescent = sis_idle, |
110 | .reclaim_buffers = NULL, | ||
111 | .reclaim_buffers_idlelocked = sis_reclaim_buffers_locked, | ||
112 | .lastclose = sis_lastclose, | 111 | .lastclose = sis_lastclose, |
113 | .ioctls = sis_ioctls, | 112 | .ioctls = sis_ioctls, |
114 | .fops = &sis_driver_fops, | 113 | .fops = &sis_driver_fops, |