OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeon/r200: drop remains of non-libdrm_radeon build

Browse Source 
These wrappers and associated symlinks were from the non-libdrm_radeon build.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2011-10-29 08:11:37 +01:00
parent 4dfee0011a
commit b490fa0172
14 changed files with 4 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/drivers/dri/r200/r200_ioctl.h
View File

@@ -38,7 +38,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/simple_list.h"
#include "radeon_dri.h"
#include "radeon_bocs_wrapper.h"
#include "radeon_bo_gem.h"
#include "radeon_cs_gem.h"
#include "xf86drm.h"
#include "drm.h"

1
src/mesa/drivers/dri/r200/radeon_bo_int_drm.h
View File

@@ -1 +0,0 @@
../radeon/radeon_bo_int_drm.h

1
src/mesa/drivers/dri/r200/radeon_bocs_wrapper.h
View File

@@ -1 +0,0 @@
../radeon/radeon_bocs_wrapper.h

1
src/mesa/drivers/dri/r200/radeon_cs_int_drm.h
View File

@@ -1 +0,0 @@
../radeon/radeon_cs_int_drm.h

1
src/mesa/drivers/dri/r200/radeon_cs_legacy.c
View File

@@ -1 +0,0 @@
../radeon/radeon_cs_legacy.c

75
src/mesa/drivers/dri/radeon/radeon_bo_drm.h
View File

@@ -1,75 +0,0 @@
/*
* Copyright © 2008 Jérôme Glisse
* 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 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 COPYRIGHT HOLDERS, AUTHORS
* 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.
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*/
/*
* Authors:
* Jérôme Glisse <glisse@freedesktop.org>
*/
#ifndef RADEON_BO_H
#define RADEON_BO_H
#include <stdio.h>
#include <stdint.h>
/* bo object */
#define RADEON_BO_FLAGS_MACRO_TILE 1
#define RADEON_BO_FLAGS_MICRO_TILE 2
struct radeon_bo_manager;
struct radeon_cs;
struct radeon_bo {
void *ptr;
uint32_t flags;
uint32_t handle;
uint32_t size;
};
struct radeon_bo_manager;
void radeon_bo_debug(struct radeon_bo *bo,
const char *op);
struct radeon_bo *radeon_bo_open(struct radeon_bo_manager *bom,
uint32_t handle,
uint32_t size,
uint32_t alignment,
uint32_t domains,
uint32_t flags);
void radeon_bo_ref(struct radeon_bo *bo);
struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo);
int radeon_bo_map(struct radeon_bo *bo, int write);
int radeon_bo_unmap(struct radeon_bo *bo);
int radeon_bo_wait(struct radeon_bo *bo);
int radeon_bo_is_busy(struct radeon_bo *bo, uint32_t *domain);
int radeon_bo_set_tiling(struct radeon_bo *bo, uint32_t tiling_flags, uint32_t pitch);
int radeon_bo_get_tiling(struct radeon_bo *bo, uint32_t *tiling_flags, uint32_t *pitch);
int radeon_bo_is_static(struct radeon_bo *bo);
int radeon_bo_is_referenced_by_cs(struct radeon_bo *bo,
struct radeon_cs *cs);
uint32_t radeon_bo_get_handle(struct radeon_bo *bo);
uint32_t radeon_bo_get_src_domain(struct radeon_bo *bo);
#endif

45
src/mesa/drivers/dri/radeon/radeon_bo_int_drm.h
View File

@@ -1,45 +0,0 @@
#ifndef RADEON_BO_INT
#define RADEON_BO_INT
struct radeon_bo_manager {
struct radeon_bo_funcs *funcs;
int fd;
};
struct radeon_bo_int {
void *ptr;
uint32_t flags;
uint32_t handle;
uint32_t size;
/* private members */
uint32_t alignment;
uint32_t domains;
unsigned cref;
struct radeon_bo_manager *bom;
uint32_t space_accounted;
uint32_t referenced_in_cs;
};
/* bo functions */
struct radeon_bo_funcs {
struct radeon_bo *(*bo_open)(struct radeon_bo_manager *bom,
uint32_t handle,
uint32_t size,
uint32_t alignment,
uint32_t domains,
uint32_t flags);
void (*bo_ref)(struct radeon_bo_int *bo);
struct radeon_bo *(*bo_unref)(struct radeon_bo_int *bo);
int (*bo_map)(struct radeon_bo_int *bo, int write);
int (*bo_unmap)(struct radeon_bo_int *bo);
int (*bo_wait)(struct radeon_bo_int *bo);
int (*bo_is_static)(struct radeon_bo_int *bo);
int (*bo_set_tiling)(struct radeon_bo_int *bo, uint32_t tiling_flags,
uint32_t pitch);
int (*bo_get_tiling)(struct radeon_bo_int *bo, uint32_t *tiling_flags,
uint32_t *pitch);
int (*bo_is_busy)(struct radeon_bo_int *bo, uint32_t *domain);
int (*bo_is_referenced_by_cs)(struct radeon_bo_int *bo, struct radeon_cs *cs);
};
#endif

13
src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h
View File

@@ -1,13 +0,0 @@
#ifndef RADEON_CS_WRAPPER_H
#define RADEON_CS_WRAPPER_H
/* to be used to build locally in mesa with no libdrm bits */
#include "../radeon/radeon_bo_drm.h"
#include "../radeon/radeon_cs_drm.h"
#include "radeon_bo.h"
#include "radeon_bo_gem.h"
#include "radeon_cs.h"
#include "radeon_cs_gem.h"
#endif

2
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
View File

@@ -1,8 +1,6 @@
#ifndef COMMON_CMDBUF_H
#define COMMON_CMDBUF_H
#include "radeon_bocs_wrapper.h"
GLboolean rcommonEnsureCmdBufSpace(radeonContextPtr rmesa, int dwords, const char *caller);
int rcommonFlushCmdBuf(radeonContextPtr rmesa, const char *caller);
int rcommonFlushCmdBufLocked(radeonContextPtr rmesa, const char *caller);

1
src/mesa/drivers/dri/radeon/radeon_common.c
View File

@@ -53,7 +53,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "vblank.h"
#include "radeon_common.h"
#include "radeon_bocs_wrapper.h"
#include "radeon_drm.h"
#include "radeon_queryobj.h"

141
src/mesa/drivers/dri/radeon/radeon_cs_drm.h
View File

@@ -1,141 +0,0 @@
/*
* Copyright © 2008 Nicolai Haehnle
* Copyright © 2008 Jérôme Glisse
* 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 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 COPYRIGHT HOLDERS, AUTHORS 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.
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*/
/*
* Authors:
* Aapo Tahkola <aet@rasterburn.org>
* Nicolai Haehnle <prefect_@gmx.net>
* Jérôme Glisse <glisse@freedesktop.org>
*/
#ifndef RADEON_CS_H
#define RADEON_CS_H
#include <stdint.h>
#include <string.h>
#include "drm.h"
#include "radeon_drm.h"
#include "radeon_bo_drm.h"
struct radeon_cs_reloc {
struct radeon_bo *bo;
uint32_t read_domain;
uint32_t write_domain;
uint32_t flags;
};
#define RADEON_CS_SPACE_OK 0
#define RADEON_CS_SPACE_OP_TO_BIG 1
#define RADEON_CS_SPACE_FLUSH 2
struct radeon_cs {
uint32_t *packets;
unsigned cdw;
unsigned ndw;
unsigned section_ndw;
unsigned section_cdw;
};
#define MAX_SPACE_BOS (32)
struct radeon_cs_manager;
extern struct radeon_cs *radeon_cs_create(struct radeon_cs_manager *csm,
uint32_t ndw);
extern int radeon_cs_begin(struct radeon_cs *cs,
uint32_t ndw,
const char *file,
const char *func, int line);
extern int radeon_cs_end(struct radeon_cs *cs,
const char *file,
const char *func,
int line);
extern int radeon_cs_emit(struct radeon_cs *cs);
extern int radeon_cs_destroy(struct radeon_cs *cs);
extern int radeon_cs_erase(struct radeon_cs *cs);
extern int radeon_cs_need_flush(struct radeon_cs *cs);
extern void radeon_cs_print(struct radeon_cs *cs, FILE *file);
extern void radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit);
extern void radeon_cs_space_set_flush(struct radeon_cs *cs, void (*fn)(void *), void *data);
extern int radeon_cs_write_reloc(struct radeon_cs *cs,
struct radeon_bo *bo,
uint32_t read_domain,
uint32_t write_domain,
uint32_t flags);
/*
* add a persistent BO to the list
* a persistent BO is one that will be referenced across flushes,
* i.e. colorbuffer, textures etc.
* They get reset when a new "operation" happens, where an operation
* is a state emission with a color/textures etc followed by a bunch of vertices.
*/
void radeon_cs_space_add_persistent_bo(struct radeon_cs *cs,
struct radeon_bo *bo,
uint32_t read_domains,
uint32_t write_domain);
/* reset the persistent BO list */
void radeon_cs_space_reset_bos(struct radeon_cs *cs);
/* do a space check with the current persistent BO list */
int radeon_cs_space_check(struct radeon_cs *cs);
/* do a space check with the current persistent BO list and a temporary BO
* a temporary BO is like a DMA buffer, which gets flushed with the
* command buffer */
int radeon_cs_space_check_with_bo(struct radeon_cs *cs,
struct radeon_bo *bo,
uint32_t read_domains,
uint32_t write_domain);
static inline void radeon_cs_write_dword(struct radeon_cs *cs, uint32_t dword)
{
cs->packets[cs->cdw++] = dword;
if (cs->section_ndw) {
cs->section_cdw++;
}
}
static inline void radeon_cs_write_qword(struct radeon_cs *cs, uint64_t qword)
{
memcpy(cs->packets + cs->cdw, &qword, sizeof(uint64_t));
cs->cdw += 2;
if (cs->section_ndw) {
cs->section_cdw += 2;
}
}
static inline void radeon_cs_write_table(struct radeon_cs *cs,
void *data, uint32_t size)
{
memcpy(cs->packets + cs->cdw, data, size * 4);
cs->cdw += size;
if (cs->section_ndw) {
cs->section_cdw += size;
}
}
#endif

66
src/mesa/drivers/dri/radeon/radeon_cs_int_drm.h
View File

@@ -1,66 +0,0 @@
#ifndef _RADEON_CS_INT_H_
#define _RADEON_CS_INT_H_
struct radeon_cs_space_check {
struct radeon_bo_int *bo;
uint32_t read_domains;
uint32_t write_domain;
uint32_t new_accounted;
};
struct radeon_cs_int {
/* keep first two in same place */
uint32_t *packets;
unsigned cdw;
unsigned ndw;
unsigned section_ndw;
unsigned section_cdw;
/* private members */
struct radeon_cs_manager *csm;
void *relocs;
unsigned crelocs;
unsigned relocs_total_size;
const char *section_file;
const char *section_func;
int section_line;
struct radeon_cs_space_check bos[MAX_SPACE_BOS];
int bo_count;
void (*space_flush_fn)(void *);
void *space_flush_data;
};
/* cs functions */
struct radeon_cs_funcs {
struct radeon_cs_int *(*cs_create)(struct radeon_cs_manager *csm,
uint32_t ndw);
int (*cs_write_reloc)(struct radeon_cs_int *cs,
struct radeon_bo *bo,
uint32_t read_domain,
uint32_t write_domain,
uint32_t flags);
int (*cs_begin)(struct radeon_cs_int *cs,
uint32_t ndw,
const char *file,
const char *func,
int line);
int (*cs_end)(struct radeon_cs_int *cs,
const char *file, const char *func,
int line);
int (*cs_emit)(struct radeon_cs_int *cs);
int (*cs_destroy)(struct radeon_cs_int *cs);
int (*cs_erase)(struct radeon_cs_int *cs);
int (*cs_need_flush)(struct radeon_cs_int *cs);
void (*cs_print)(struct radeon_cs_int *cs, FILE *file);
};
struct radeon_cs_manager {
struct radeon_cs_funcs *funcs;
int fd;
int32_t vram_limit, gart_limit;
int32_t vram_write_used, gart_write_used;
int32_t read_used;
};
#endif

3
src/mesa/drivers/dri/radeon/radeon_ioctl.h
View File

@@ -37,7 +37,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define __RADEON_IOCTL_H__
#include "main/simple_list.h"
#include "radeon_bocs_wrapper.h"
#include "radeon_bo_gem.h"
#include "radeon_cs_gem.h"
extern void radeonEmitVertexAOS( r100ContextPtr rmesa,
GLuint vertex_size,

2
src/mesa/drivers/dri/radeon/radeon_screen.c
View File

@@ -60,8 +60,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "utils.h"
#include "vblank.h"
#include "radeon_bocs_wrapper.h"
#include "GL/internal/dri_interface.h"
/* Radeon configuration