Commit 8f8ed7f8 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/via: Embed via_verifier in via_dri1 



Embed the header file in via_drv.h and the code in via_dri1.
All functions are made static as there are no more external users.

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-9-sam@ravnborg.org
parent f99995a4

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-y    := via_dri1.o



obj-$(CONFIG_DRM_VIA)	+=via.o

drivers/gpu/drm/via/via_dri1.c

+1071 −0

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/via/via_drv.h

+27 −2
Original line number Diff line number Diff line
@@ -46,7 +46,33 @@ 
#define DRIVER_MINOR		11

#define DRIVER_PATCHLEVEL	1



#include "via_verifier.h"

typedef enum {

	no_sequence = 0,

	z_address,

	dest_address,

	tex_address

} drm_via_sequence_t;



typedef struct {

	unsigned texture;

	uint32_t z_addr;

	uint32_t d_addr;

	uint32_t t_addr[2][10];

	uint32_t pitch[2][10];

	uint32_t height[2][10];

	uint32_t tex_level_lo[2];

	uint32_t tex_level_hi[2];

	uint32_t tex_palette_size[2];

	uint32_t tex_npot[2];

	drm_via_sequence_t unfinished;

	int agp_texture;

	int multitex;

	struct drm_device *dev;

	drm_local_map_t *map_cache;

	uint32_t vertex_count;

	int agp;

	const uint32_t *buf_start;

} drm_via_state_t;



#define VIA_PCI_BUF_SIZE 60000

#define VIA_FIRE_BUF_SIZE  1024
@@ -234,7 +260,6 @@ extern int via_init_context(struct drm_device *dev, int context); 
extern int via_do_cleanup_map(struct drm_device *dev);



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);



#endif

drivers/gpu/drm/via/via_verifier.c

deleted100644 → 0
+0 −1110

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/via/via_verifier.h

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
/*

 * Copyright 2004 The Unichrome Project. All Rights Reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sub license,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the

 * next paragraph) shall be included in all copies or substantial portions

 * of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL

 * THE UNICHROME PROJECT, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 *

 * Author: Thomas Hellström 2004.

 */



#ifndef _VIA_VERIFIER_H_

#define _VIA_VERIFIER_H_



typedef enum {

	no_sequence = 0,

	z_address,

	dest_address,

	tex_address

} drm_via_sequence_t;



typedef struct {

	unsigned texture;

	uint32_t z_addr;

	uint32_t d_addr;

	uint32_t t_addr[2][10];

	uint32_t pitch[2][10];

	uint32_t height[2][10];

	uint32_t tex_level_lo[2];

	uint32_t tex_level_hi[2];

	uint32_t tex_palette_size[2];

	uint32_t tex_npot[2];

	drm_via_sequence_t unfinished;

	int agp_texture;

	int multitex;

	struct drm_device *dev;

	drm_local_map_t *map_cache;

	uint32_t vertex_count;

	int agp;

	const uint32_t *buf_start;

} drm_via_state_t;



extern int via_verify_command_stream(const uint32_t *buf, unsigned int size,

				     struct drm_device *dev, int agp);

extern int via_parse_command_stream(struct drm_device *dev, const uint32_t *buf,

				    unsigned int size);



#endif