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

Commit cc1ef118 authored by Thierry Reding's avatar Thierry Reding Committed by Daniel Vetter
Browse files

drm/irq: Make pipe unsigned and name consistent 



Name all references to the pipe number (CRTC index) consistently to make
it easier to distinguish which is a pipe number and which is a pointer
to struct drm_crtc.

While at it also make all references to the pipe number unsigned because
there is no longer any reason why it should ever be negative.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7d1de851

drivers/gpu/drm/drm_irq.c

+159 −157

File changed.

Preview size limit exceeded, changes collapsed.

include/drm/drmP.h

+16 −16
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ struct drm_minor { 


struct drm_pending_vblank_event {

	struct drm_pending_event base;

	int pipe;

	unsigned int pipe;

	struct drm_event_vblank event;

};
@@ -700,7 +700,7 @@ struct drm_vblank_crtc { 
					/* for wraparound handling */

	u32 last_wait;			/* Last vblank seqno waited per CRTC */

	unsigned int inmodeset;		/* Display driver is setting mode */

	int crtc;			/* crtc index */

	unsigned int pipe;		/* crtc index */

	bool enabled;			/* so we don't call enable more than

					   once per disable */

};
@@ -920,34 +920,34 @@ void drm_clflush_virt_range(void *addr, unsigned long length); 
extern int drm_irq_install(struct drm_device *dev, int irq);

extern int drm_irq_uninstall(struct drm_device *dev);



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

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_vblank_count(struct drm_device *dev, int crtc);

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

extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);

extern u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc,

extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,

				     struct timeval *vblanktime);

extern void drm_send_vblank_event(struct drm_device *dev, int crtc,

extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,

				  struct drm_pending_vblank_event *e);

extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,

				       struct drm_pending_vblank_event *e);

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

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_vblank_get(struct drm_device *dev, int crtc);

extern void drm_vblank_put(struct drm_device *dev, int crtc);

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

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

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, int 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_vblank_off(struct drm_device *dev, int crtc);

extern void drm_vblank_on(struct drm_device *dev, int crtc);

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

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

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 int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,

						 int crtc, int *max_error,

						 unsigned int pipe, int *max_error,

						 struct timeval *vblank_time,

						 unsigned flags,

						 const struct drm_crtc *refcrtc,
@@ -968,8 +968,8 @@ static inline wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc 
}



/* Modesetting support */

extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);

extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);

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

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



				/* Stub support (drm_stub.h) */

extern struct drm_master *drm_master_get(struct drm_master *master);