tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm: drm_irq.h header cleanup
- Drop extern for functions, it's noise.
- Move&consolidate drm.ko internal parts into drm-internal.h.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161114090255.31595-6-daniel.vetter@ffwll.ch
+34
-34
+5
-3
drivers/gpu/drm/drm_internal.h
+5
-3
drivers/gpu/drm/drm_internal.h
···
24
24
#define DRM_IF_MAJOR 1
25
25
#define DRM_IF_MINOR 4
26
26
27
-
/* drm_irq.c */
28
-
extern unsigned int drm_timestamp_monotonic;
29
-
30
27
/* drm_fops.c */
31
28
extern struct mutex drm_global_mutex;
32
29
void drm_lastclose(struct drm_device *dev);
···
53
56
int drm_gem_name_info(struct seq_file *m, void *data);
54
57
55
58
/* drm_irq.c */
59
+
extern unsigned int drm_timestamp_monotonic;
60
+
61
+
/* IOCTLS */
62
+
int drm_wait_vblank(struct drm_device *dev, void *data,
63
+
struct drm_file *filp);
56
64
int drm_control(struct drm_device *dev, void *data,
57
65
struct drm_file *file_priv);
58
66
int drm_modeset_ctl(struct drm_device *dev, void *data,
+29
-31
include/drm/drm_irq.h
+29
-31
include/drm/drm_irq.h
···
130
130
bool enabled;
131
131
};
132
132
133
-
extern int drm_irq_install(struct drm_device *dev, int irq);
134
-
extern int drm_irq_uninstall(struct drm_device *dev);
133
+
int drm_irq_install(struct drm_device *dev, int irq);
134
+
int drm_irq_uninstall(struct drm_device *dev);
135
135
136
-
extern int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);
137
-
extern int drm_wait_vblank(struct drm_device *dev, void *data,
138
-
struct drm_file *filp);
139
-
extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
140
-
extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
141
-
struct timeval *vblanktime);
142
-
extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
143
-
struct drm_pending_vblank_event *e);
144
-
extern void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
145
-
struct drm_pending_vblank_event *e);
146
-
extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
147
-
extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
148
-
extern int drm_crtc_vblank_get(struct drm_crtc *crtc);
149
-
extern void drm_crtc_vblank_put(struct drm_crtc *crtc);
150
-
extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);
151
-
extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);
152
-
extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
153
-
extern void drm_crtc_vblank_reset(struct drm_crtc *crtc);
154
-
extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
155
-
extern void drm_vblank_cleanup(struct drm_device *dev);
156
-
extern u32 drm_accurate_vblank_count(struct drm_crtc *crtc);
157
-
extern u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe);
136
+
int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);
137
+
u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
138
+
u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
139
+
struct timeval *vblanktime);
140
+
void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
141
+
struct drm_pending_vblank_event *e);
142
+
void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
143
+
struct drm_pending_vblank_event *e);
144
+
bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
145
+
bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
146
+
int drm_crtc_vblank_get(struct drm_crtc *crtc);
147
+
void drm_crtc_vblank_put(struct drm_crtc *crtc);
148
+
void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);
149
+
void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);
150
+
void drm_crtc_vblank_off(struct drm_crtc *crtc);
151
+
void drm_crtc_vblank_reset(struct drm_crtc *crtc);
152
+
void drm_crtc_vblank_on(struct drm_crtc *crtc);
153
+
void drm_vblank_cleanup(struct drm_device *dev);
154
+
u32 drm_accurate_vblank_count(struct drm_crtc *crtc);
155
+
u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe);
158
156
159
-
extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
160
-
unsigned int pipe, int *max_error,
161
-
struct timeval *vblank_time,
162
-
unsigned flags,
163
-
const struct drm_display_mode *mode);
164
-
extern void drm_calc_timestamping_constants(struct drm_crtc *crtc,
165
-
const struct drm_display_mode *mode);
157
+
int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
158
+
unsigned int pipe, int *max_error,
159
+
struct timeval *vblank_time,
160
+
unsigned flags,
161
+
const struct drm_display_mode *mode);
162
+
void drm_calc_timestamping_constants(struct drm_crtc *crtc,
163
+
const struct drm_display_mode *mode);
166
164
167
165
/**
168
166
* drm_crtc_vblank_waitqueue - get vblank waitqueue for the CRTC