Commit f99995a4 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/via: Embed via_dmablit in via_dri1 



Embed some of the header file in via_drv.h and
the rest in via_dri1.c
While embedding deleted extra empty lines and functions that
has no external users are made static.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Kevin Brace <kevinbrace@bracecomputerlab.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220713170202.1798216-8-sam@ravnborg.org
parent b0b3a879

drivers/gpu/drm/via/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



via-y    := via_dri1.o via_verifier.o via_dmablit.o

via-y    := via_dri1.o via_verifier.o



obj-$(CONFIG_DRM_VIA)	+=via.o

drivers/gpu/drm/via/via_dmablit.c

deleted100644 → 0
+0 −807

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/via/via_dmablit.h

deleted100644 → 0
+0 −140

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/via/via_dri1.c

+786 −0

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/via/via_drv.h

+48 −8
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#ifndef _VIA_DRV_H_

#define _VIA_DRV_H_



#include <linux/dma-mapping.h>

#include <linux/irqreturn.h>

#include <linux/jiffies.h>

#include <linux/sched.h>
@@ -47,12 +48,57 @@ 


#include "via_verifier.h"



#include "via_dmablit.h"



#define VIA_PCI_BUF_SIZE 60000

#define VIA_FIRE_BUF_SIZE  1024

#define VIA_NUM_IRQS 4





#define VIA_NUM_BLIT_ENGINES 2

#define VIA_NUM_BLIT_SLOTS 8



struct _drm_via_descriptor;



typedef struct _drm_via_sg_info {

	struct page **pages;

	unsigned long num_pages;

	struct _drm_via_descriptor **desc_pages;

	int num_desc_pages;

	int num_desc;

	enum dma_data_direction direction;

	unsigned char *bounce_buffer;

	dma_addr_t chain_start;

	uint32_t free_on_sequence;

	unsigned int descriptors_per_page;

	int aborted;

	enum {

		dr_via_device_mapped,

		dr_via_desc_pages_alloc,

		dr_via_pages_locked,

		dr_via_pages_alloc,

		dr_via_sg_init

	} state;

} drm_via_sg_info_t;



typedef struct _drm_via_blitq {

	struct drm_device *dev;

	uint32_t cur_blit_handle;

	uint32_t done_blit_handle;

	unsigned serviced;

	unsigned head;

	unsigned cur;

	unsigned num_free;

	unsigned num_outstanding;

	unsigned long end;

	int aborting;

	int is_active;

	drm_via_sg_info_t *blits[VIA_NUM_BLIT_SLOTS];

	spinlock_t blit_lock;

	wait_queue_head_t blit_queue[VIA_NUM_BLIT_SLOTS];

	wait_queue_head_t busy_queue;

	struct work_struct wq;

	struct timer_list poll_timer;

} drm_via_blitq_t;



typedef struct drm_via_ring_buffer {

	drm_local_map_t map;

	char *virtual_start;
@@ -183,9 +229,6 @@ do { \ 
	remove_wait_queue(&(queue), &entry);			\

} while (0)



extern int via_dma_blit_sync(struct drm_device *dev, void *data, struct drm_file *file_priv);

extern int via_dma_blit(struct drm_device *dev, void *data, struct drm_file *file_priv);



extern int via_init_context(struct drm_device *dev, int context);



extern int via_do_cleanup_map(struct drm_device *dev);
@@ -194,7 +237,4 @@ extern int via_dma_cleanup(struct drm_device *dev); 
extern void via_init_command_verifier(void);

extern int via_driver_dma_quiescent(struct drm_device *dev);



extern void via_dmablit_handler(struct drm_device *dev, int engine, int from_irq);

extern void via_init_dmablit(struct drm_device *dev);



#endif