Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9876d50 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161114090255.31595-6-daniel.vetter@ffwll.ch
parent 2d1e331f

drivers/gpu/drm/drm_internal.h

+5 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
#define DRM_IF_MAJOR 1

#define DRM_IF_MINOR 4



/* drm_irq.c */

extern unsigned int drm_timestamp_monotonic;



/* drm_fops.c */

extern struct mutex drm_global_mutex;

void drm_lastclose(struct drm_device *dev);
@@ -56,6 +53,11 @@ int drm_clients_info(struct seq_file *m, void* data); 
int drm_gem_name_info(struct seq_file *m, void *data);



/* drm_irq.c */

extern unsigned int drm_timestamp_monotonic;



/* IOCTLS */

int drm_wait_vblank(struct drm_device *dev, void *data,

		    struct drm_file *filp);

int drm_control(struct drm_device *dev, void *data,

		struct drm_file *file_priv);

int drm_modeset_ctl(struct drm_device *dev, void *data,

include/drm/drm_irq.h

+29 −31
Original line number Diff line number Diff line
@@ -130,38 +130,36 @@ struct drm_vblank_crtc { 
	bool enabled;

};



extern int drm_irq_install(struct drm_device *dev, int irq);

extern int drm_irq_uninstall(struct drm_device *dev);

int drm_irq_install(struct drm_device *dev, int irq);

int drm_irq_uninstall(struct drm_device *dev);



extern int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);

extern int drm_wait_vblank(struct drm_device *dev, void *data,

			   struct drm_file *filp);

extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);

extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,

int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);

u32 drm_crtc_vblank_count(struct drm_crtc *crtc);

u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,

				   struct timeval *vblanktime);

extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,

void drm_crtc_send_vblank_event(struct drm_crtc *crtc,

			       struct drm_pending_vblank_event *e);

extern void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,

void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,

			      struct drm_pending_vblank_event *e);

extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);

extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc);

extern int drm_crtc_vblank_get(struct drm_crtc *crtc);

extern void drm_crtc_vblank_put(struct drm_crtc *crtc);

extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);

extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);

extern void drm_crtc_vblank_off(struct drm_crtc *crtc);

extern void drm_crtc_vblank_reset(struct drm_crtc *crtc);

extern void drm_crtc_vblank_on(struct drm_crtc *crtc);

extern void drm_vblank_cleanup(struct drm_device *dev);

extern u32 drm_accurate_vblank_count(struct drm_crtc *crtc);

extern u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe);

bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);

bool drm_crtc_handle_vblank(struct drm_crtc *crtc);

int drm_crtc_vblank_get(struct drm_crtc *crtc);

void drm_crtc_vblank_put(struct drm_crtc *crtc);

void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);

void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);

void drm_crtc_vblank_off(struct drm_crtc *crtc);

void drm_crtc_vblank_reset(struct drm_crtc *crtc);

void drm_crtc_vblank_on(struct drm_crtc *crtc);

void drm_vblank_cleanup(struct drm_device *dev);

u32 drm_accurate_vblank_count(struct drm_crtc *crtc);

u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe);



extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,

int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,

					  unsigned int pipe, int *max_error,

					  struct timeval *vblank_time,

					  unsigned flags,

					  const struct drm_display_mode *mode);

extern void drm_calc_timestamping_constants(struct drm_crtc *crtc,

void drm_calc_timestamping_constants(struct drm_crtc *crtc,

				     const struct drm_display_mode *mode);



/**