diff options
author | Dave Airlie <airlied@redhat.com> | 2013-04-15 23:24:25 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-04-15 23:33:36 -0400 |
commit | 6d01f1f54c01877baad11389291c1aeab9c11e0f (patch) | |
tree | 39a0c5375c2197f7566382913739be2a867c30c7 | |
parent | dea14dfab9d1fdf5695ae61dc72c587533706edc (diff) |
drm/qxl: make lots of things static.
/usr/lib/gcc/x86_64-linux-gnu/4.7/include/stddef.h:414:9: sparse: preprocessor token offsetof redefined
include/linux/stddef.h:17:9: this was the original definition
>> drivers/gpu/drm/qxl/qxl_drv.c:49:5: sparse: symbol 'qxl_modeset' was not declared. Should it be static?
Reported-by: kbuild test robot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_cmd.c | 23 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_display.c | 18 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_fb.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_gem.c | 29 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_ioctl.c | 22 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_kms.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_release.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_ttm.c | 6 |
9 files changed, 31 insertions, 77 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c index 804b411a60ca..736365e6ca80 100644 --- a/drivers/gpu/drm/qxl/qxl_cmd.c +++ b/drivers/gpu/drm/qxl/qxl_cmd.c | |||
@@ -144,8 +144,8 @@ int qxl_ring_push(struct qxl_ring *ring, | |||
144 | return 0; | 144 | return 0; |
145 | } | 145 | } |
146 | 146 | ||
147 | bool qxl_ring_pop(struct qxl_ring *ring, | 147 | static bool qxl_ring_pop(struct qxl_ring *ring, |
148 | void *element) | 148 | void *element) |
149 | { | 149 | { |
150 | volatile struct qxl_ring_header *header = &(ring->ring->header); | 150 | volatile struct qxl_ring_header *header = &(ring->ring->header); |
151 | volatile uint8_t *ring_elt; | 151 | volatile uint8_t *ring_elt; |
@@ -169,23 +169,6 @@ bool qxl_ring_pop(struct qxl_ring *ring, | |||
169 | return true; | 169 | return true; |
170 | } | 170 | } |
171 | 171 | ||
172 | void qxl_ring_wait_idle(struct qxl_ring *ring) | ||
173 | { | ||
174 | struct qxl_ring_header *header = &(ring->ring->header); | ||
175 | unsigned long flags; | ||
176 | |||
177 | spin_lock_irqsave(&ring->lock, flags); | ||
178 | if (ring->ring->header.cons < ring->ring->header.prod) { | ||
179 | header->notify_on_cons = header->prod; | ||
180 | mb(); | ||
181 | spin_unlock_irqrestore(&ring->lock, flags); | ||
182 | wait_event_interruptible(*ring->push_event, | ||
183 | qxl_check_idle(ring)); | ||
184 | spin_lock_irqsave(&ring->lock, flags); | ||
185 | } | ||
186 | spin_unlock_irqrestore(&ring->lock, flags); | ||
187 | } | ||
188 | |||
189 | int | 172 | int |
190 | qxl_push_command_ring_release(struct qxl_device *qdev, struct qxl_release *release, | 173 | qxl_push_command_ring_release(struct qxl_device *qdev, struct qxl_release *release, |
191 | uint32_t type, bool interruptible) | 174 | uint32_t type, bool interruptible) |
@@ -609,7 +592,7 @@ retry: | |||
609 | return ret; | 592 | return ret; |
610 | } | 593 | } |
611 | 594 | ||
612 | void qxl_surface_evict_locked(struct qxl_device *qdev, struct qxl_bo *surf, bool do_update_area) | 595 | static void qxl_surface_evict_locked(struct qxl_device *qdev, struct qxl_bo *surf, bool do_update_area) |
613 | { | 596 | { |
614 | /* no need to update area if we are just freeing the surface normally */ | 597 | /* no need to update area if we are just freeing the surface normally */ |
615 | if (do_update_area) | 598 | if (do_update_area) |
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index c80ddfedbbab..567a5328cfc4 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c | |||
@@ -413,11 +413,11 @@ static void qxl_user_framebuffer_destroy(struct drm_framebuffer *fb) | |||
413 | kfree(qxl_fb); | 413 | kfree(qxl_fb); |
414 | } | 414 | } |
415 | 415 | ||
416 | int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, | 416 | static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, |
417 | struct drm_file *file_priv, | 417 | struct drm_file *file_priv, |
418 | unsigned flags, unsigned color, | 418 | unsigned flags, unsigned color, |
419 | struct drm_clip_rect *clips, | 419 | struct drm_clip_rect *clips, |
420 | unsigned num_clips) | 420 | unsigned num_clips) |
421 | { | 421 | { |
422 | /* TODO: vmwgfx where this was cribbed from had locking. Why? */ | 422 | /* TODO: vmwgfx where this was cribbed from had locking. Why? */ |
423 | struct qxl_framebuffer *qxl_fb = to_qxl_framebuffer(fb); | 423 | struct qxl_framebuffer *qxl_fb = to_qxl_framebuffer(fb); |
@@ -619,7 +619,7 @@ static void qxl_crtc_commit(struct drm_crtc *crtc) | |||
619 | DRM_DEBUG("\n"); | 619 | DRM_DEBUG("\n"); |
620 | } | 620 | } |
621 | 621 | ||
622 | void qxl_crtc_load_lut(struct drm_crtc *crtc) | 622 | static void qxl_crtc_load_lut(struct drm_crtc *crtc) |
623 | { | 623 | { |
624 | DRM_DEBUG("\n"); | 624 | DRM_DEBUG("\n"); |
625 | } | 625 | } |
@@ -633,7 +633,7 @@ static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = { | |||
633 | .load_lut = qxl_crtc_load_lut, | 633 | .load_lut = qxl_crtc_load_lut, |
634 | }; | 634 | }; |
635 | 635 | ||
636 | int qdev_crtc_init(struct drm_device *dev, int num_crtc) | 636 | static int qdev_crtc_init(struct drm_device *dev, int num_crtc) |
637 | { | 637 | { |
638 | struct qxl_crtc *qxl_crtc; | 638 | struct qxl_crtc *qxl_crtc; |
639 | 639 | ||
@@ -764,7 +764,7 @@ static int qxl_conn_mode_valid(struct drm_connector *connector, | |||
764 | return MODE_OK; | 764 | return MODE_OK; |
765 | } | 765 | } |
766 | 766 | ||
767 | struct drm_encoder *qxl_best_encoder(struct drm_connector *connector) | 767 | static struct drm_encoder *qxl_best_encoder(struct drm_connector *connector) |
768 | { | 768 | { |
769 | struct qxl_output *qxl_output = | 769 | struct qxl_output *qxl_output = |
770 | drm_connector_to_qxl_output(connector); | 770 | drm_connector_to_qxl_output(connector); |
@@ -855,7 +855,7 @@ static const struct drm_encoder_funcs qxl_enc_funcs = { | |||
855 | .destroy = qxl_enc_destroy, | 855 | .destroy = qxl_enc_destroy, |
856 | }; | 856 | }; |
857 | 857 | ||
858 | int qdev_output_init(struct drm_device *dev, int num_output) | 858 | static int qdev_output_init(struct drm_device *dev, int num_output) |
859 | { | 859 | { |
860 | struct qxl_output *qxl_output; | 860 | struct qxl_output *qxl_output; |
861 | struct drm_connector *connector; | 861 | struct drm_connector *connector; |
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index d337da0a9759..aa291d8a98a2 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c | |||
@@ -46,7 +46,7 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { | |||
46 | }; | 46 | }; |
47 | MODULE_DEVICE_TABLE(pci, pciidlist); | 47 | MODULE_DEVICE_TABLE(pci, pciidlist); |
48 | 48 | ||
49 | int qxl_modeset = -1; | 49 | static int qxl_modeset = -1; |
50 | 50 | ||
51 | MODULE_PARM_DESC(modeset, "Disable/Enable modesetting"); | 51 | MODULE_PARM_DESC(modeset, "Disable/Enable modesetting"); |
52 | module_param_named(modeset, qxl_modeset, int, 0400); | 52 | module_param_named(modeset, qxl_modeset, int, 0400); |
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 232b52b50194..b3c51275df5c 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c | |||
@@ -159,7 +159,7 @@ static void qxl_deferred_io(struct fb_info *info, | |||
159 | }; | 159 | }; |
160 | 160 | ||
161 | 161 | ||
162 | struct fb_deferred_io qxl_defio = { | 162 | static struct fb_deferred_io qxl_defio = { |
163 | .delay = QXL_DIRTY_DELAY, | 163 | .delay = QXL_DIRTY_DELAY, |
164 | .deferred_io = qxl_deferred_io, | 164 | .deferred_io = qxl_deferred_io, |
165 | }; | 165 | }; |
diff --git a/drivers/gpu/drm/qxl/qxl_gem.c b/drivers/gpu/drm/qxl/qxl_gem.c index adc1ee2cf7fb..a235693aabba 100644 --- a/drivers/gpu/drm/qxl/qxl_gem.c +++ b/drivers/gpu/drm/qxl/qxl_gem.c | |||
@@ -127,35 +127,6 @@ void qxl_gem_object_unpin(struct drm_gem_object *obj) | |||
127 | } | 127 | } |
128 | } | 128 | } |
129 | 129 | ||
130 | int qxl_gem_set_domain(struct drm_gem_object *gobj, | ||
131 | uint32_t rdomain, uint32_t wdomain) | ||
132 | { | ||
133 | struct qxl_bo *qobj; | ||
134 | uint32_t domain; | ||
135 | int r; | ||
136 | |||
137 | /* FIXME: reeimplement */ | ||
138 | qobj = gobj->driver_private; | ||
139 | /* work out where to validate the buffer to */ | ||
140 | domain = wdomain; | ||
141 | if (!domain) | ||
142 | domain = rdomain; | ||
143 | if (!domain) { | ||
144 | /* Do nothings */ | ||
145 | pr_warn("Set domain withou domain !\n"); | ||
146 | return 0; | ||
147 | } | ||
148 | if (domain == QXL_GEM_DOMAIN_CPU) { | ||
149 | /* Asking for cpu access wait for object idle */ | ||
150 | r = qxl_bo_wait(qobj, NULL, false); | ||
151 | if (r) { | ||
152 | pr_err("Failed to wait for object !\n"); | ||
153 | return r; | ||
154 | } | ||
155 | } | ||
156 | return 0; | ||
157 | } | ||
158 | |||
159 | int qxl_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv) | 130 | int qxl_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv) |
160 | { | 131 | { |
161 | return 0; | 132 | return 0; |
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c index 83ca4f713f88..cec617222585 100644 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c | |||
@@ -30,8 +30,8 @@ | |||
30 | * TODO: allocating a new gem(in qxl_bo) for each request. | 30 | * TODO: allocating a new gem(in qxl_bo) for each request. |
31 | * This is wasteful since bo's are page aligned. | 31 | * This is wasteful since bo's are page aligned. |
32 | */ | 32 | */ |
33 | int qxl_alloc_ioctl(struct drm_device *dev, void *data, | 33 | static int qxl_alloc_ioctl(struct drm_device *dev, void *data, |
34 | struct drm_file *file_priv) | 34 | struct drm_file *file_priv) |
35 | { | 35 | { |
36 | struct qxl_device *qdev = dev->dev_private; | 36 | struct qxl_device *qdev = dev->dev_private; |
37 | struct drm_qxl_alloc *qxl_alloc = data; | 37 | struct drm_qxl_alloc *qxl_alloc = data; |
@@ -58,8 +58,8 @@ int qxl_alloc_ioctl(struct drm_device *dev, void *data, | |||
58 | return 0; | 58 | return 0; |
59 | } | 59 | } |
60 | 60 | ||
61 | int qxl_map_ioctl(struct drm_device *dev, void *data, | 61 | static int qxl_map_ioctl(struct drm_device *dev, void *data, |
62 | struct drm_file *file_priv) | 62 | struct drm_file *file_priv) |
63 | { | 63 | { |
64 | struct qxl_device *qdev = dev->dev_private; | 64 | struct qxl_device *qdev = dev->dev_private; |
65 | struct drm_qxl_map *qxl_map = data; | 65 | struct drm_qxl_map *qxl_map = data; |
@@ -101,9 +101,9 @@ apply_surf_reloc(struct qxl_device *qdev, struct qxl_bo *dst, uint64_t dst_off, | |||
101 | } | 101 | } |
102 | 102 | ||
103 | /* return holding the reference to this object */ | 103 | /* return holding the reference to this object */ |
104 | struct qxl_bo *qxlhw_handle_to_bo(struct qxl_device *qdev, | 104 | static struct qxl_bo *qxlhw_handle_to_bo(struct qxl_device *qdev, |
105 | struct drm_file *file_priv, uint64_t handle, | 105 | struct drm_file *file_priv, uint64_t handle, |
106 | struct qxl_reloc_list *reloc_list) | 106 | struct qxl_reloc_list *reloc_list) |
107 | { | 107 | { |
108 | struct drm_gem_object *gobj; | 108 | struct drm_gem_object *gobj; |
109 | struct qxl_bo *qobj; | 109 | struct qxl_bo *qobj; |
@@ -129,8 +129,8 @@ struct qxl_bo *qxlhw_handle_to_bo(struct qxl_device *qdev, | |||
129 | * However, the command as passed from user space must *not* contain the initial | 129 | * However, the command as passed from user space must *not* contain the initial |
130 | * QXLReleaseInfo struct (first XXX bytes) | 130 | * QXLReleaseInfo struct (first XXX bytes) |
131 | */ | 131 | */ |
132 | int qxl_execbuffer_ioctl(struct drm_device *dev, void *data, | 132 | static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data, |
133 | struct drm_file *file_priv) | 133 | struct drm_file *file_priv) |
134 | { | 134 | { |
135 | struct qxl_device *qdev = dev->dev_private; | 135 | struct qxl_device *qdev = dev->dev_private; |
136 | struct drm_qxl_execbuffer *execbuffer = data; | 136 | struct drm_qxl_execbuffer *execbuffer = data; |
@@ -266,8 +266,8 @@ int qxl_execbuffer_ioctl(struct drm_device *dev, void *data, | |||
266 | return 0; | 266 | return 0; |
267 | } | 267 | } |
268 | 268 | ||
269 | int qxl_update_area_ioctl(struct drm_device *dev, void *data, | 269 | static int qxl_update_area_ioctl(struct drm_device *dev, void *data, |
270 | struct drm_file *file) | 270 | struct drm_file *file) |
271 | { | 271 | { |
272 | struct qxl_device *qdev = dev->dev_private; | 272 | struct qxl_device *qdev = dev->dev_private; |
273 | struct drm_qxl_update_area *update_area = data; | 273 | struct drm_qxl_update_area *update_area = data; |
diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index 036e0de13412..85127ed24cfd 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c | |||
@@ -230,7 +230,7 @@ int qxl_device_init(struct qxl_device *qdev, | |||
230 | return 0; | 230 | return 0; |
231 | } | 231 | } |
232 | 232 | ||
233 | void qxl_device_fini(struct qxl_device *qdev) | 233 | static void qxl_device_fini(struct qxl_device *qdev) |
234 | { | 234 | { |
235 | if (qdev->current_release_bo[0]) | 235 | if (qdev->current_release_bo[0]) |
236 | qxl_bo_unref(&qdev->current_release_bo[0]); | 236 | qxl_bo_unref(&qdev->current_release_bo[0]); |
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index 1600781d8cbc..c4267c71dd2d 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c | |||
@@ -117,8 +117,8 @@ qxl_release_add_res(struct qxl_device *qdev, struct qxl_release *release, | |||
117 | release->bos[release->bo_count++] = qxl_bo_ref(bo); | 117 | release->bos[release->bo_count++] = qxl_bo_ref(bo); |
118 | } | 118 | } |
119 | 119 | ||
120 | int qxl_release_bo_alloc(struct qxl_device *qdev, | 120 | static int qxl_release_bo_alloc(struct qxl_device *qdev, |
121 | struct qxl_bo **bo) | 121 | struct qxl_bo **bo) |
122 | { | 122 | { |
123 | int ret; | 123 | int ret; |
124 | ret = qxl_bo_create(qdev, PAGE_SIZE, false, QXL_GEM_DOMAIN_VRAM, NULL, | 124 | ret = qxl_bo_create(qdev, PAGE_SIZE, false, QXL_GEM_DOMAIN_VRAM, NULL, |
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index aa9fb9afca0b..1a86242eedb0 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c | |||
@@ -315,9 +315,9 @@ static void qxl_ttm_tt_unpopulate(struct ttm_tt *ttm) | |||
315 | ttm_pool_unpopulate(ttm); | 315 | ttm_pool_unpopulate(ttm); |
316 | } | 316 | } |
317 | 317 | ||
318 | struct ttm_tt *qxl_ttm_tt_create(struct ttm_bo_device *bdev, | 318 | static struct ttm_tt *qxl_ttm_tt_create(struct ttm_bo_device *bdev, |
319 | unsigned long size, uint32_t page_flags, | 319 | unsigned long size, uint32_t page_flags, |
320 | struct page *dummy_read_page) | 320 | struct page *dummy_read_page) |
321 | { | 321 | { |
322 | struct qxl_device *qdev; | 322 | struct qxl_device *qdev; |
323 | struct qxl_ttm_tt *gtt; | 323 | struct qxl_ttm_tt *gtt; |