fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: don't include radeon_drm.h and xf86drm.h

Browse source 
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Marek Olšák 2011-08-04 06:23:59 +02:00
parent efbccfeca0
commit d6da5185f9
6 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/r600/r600_buffer.c
View file

@ -33,9 +33,6 @@
#include <util/u_memory.h>
#include "util/u_upload_mgr.h"
#include <xf86drm.h>
#include "radeon_drm.h"
#include "r600.h"
#include "r600_pipe.h"

2
src/gallium/winsys/r600/drm/evergreen_hw_context.c
View file

@ -27,8 +27,6 @@
#include "r600_priv.h"
#include "evergreend.h"
#include "util/u_memory.h"
#include "radeon_drm.h"
#include "xf86drm.h"
#include <errno.h>
#define GROUP_FORCE_NEW_BLOCK 0

13
src/gallium/winsys/r600/drm/r600_bo.c
View file

@ -26,7 +26,6 @@
#include "r600_priv.h"
#include "r600d.h"
#include "state_tracker/drm_driver.h"
#include "radeon_drm.h"
struct r600_bo *r600_bo(struct radeon *radeon,
unsigned size, unsigned alignment,
@ -41,22 +40,22 @@ struct r600_bo *r600_bo(struct radeon *radeon,
* resources. We generate them internally for some transfers.
*/
if (usage == PIPE_USAGE_STAGING) {
domains = RADEON_GEM_DOMAIN_GTT;
initial_domain = RADEON_GEM_DOMAIN_GTT;
domains = RADEON_DOMAIN_GTT;
initial_domain = RADEON_DOMAIN_GTT;
} else {
domains = RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM;
domains = RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM;
switch(usage) {
case PIPE_USAGE_DYNAMIC:
case PIPE_USAGE_STREAM:
case PIPE_USAGE_STAGING:
initial_domain = RADEON_GEM_DOMAIN_GTT;
initial_domain = RADEON_DOMAIN_GTT;
break;
case PIPE_USAGE_DEFAULT:
case PIPE_USAGE_STATIC:
case PIPE_USAGE_IMMUTABLE:
default:
initial_domain = RADEON_GEM_DOMAIN_VRAM;
initial_domain = RADEON_DOMAIN_VRAM;
break;
}
}
@ -88,7 +87,7 @@ struct r600_bo *r600_bo_handle(struct radeon *radeon, struct winsys_handle *whan
}
pipe_reference_init(&bo->reference, 1);
bo->domains = RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM;
bo->domains = RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM;
bo->cs_buf = radeon->ws->buffer_get_cs_handle(pb);
if (stride)

2
src/gallium/winsys/r600/drm/r600_drm.c
View file

@ -29,8 +29,6 @@
#include "r600_priv.h"
#include "r600_drm_public.h"
#include "util/u_memory.h"
#include <radeon_drm.h>
#include <xf86drm.h>
#include <errno.h>
#ifndef RADEON_INFO_NUM_TILE_PIPES

2
src/gallium/winsys/r600/drm/r600_hw_context.c
View file

@ -26,8 +26,6 @@
#include "r600_priv.h"
#include "r600d.h"
#include "util/u_memory.h"
#include "radeon_drm.h"
#include "xf86drm.h"
#include <errno.h>
#define GROUP_FORCE_NEW_BLOCK 0

1
src/gallium/winsys/r600/drm/r600_priv.h
View file

@ -30,7 +30,6 @@
#include "../../radeon/drm/radeon_winsys.h"
#include "util/u_hash_table.h"
#include "os/os_thread.h"
#include "radeon_drm.h"
#define PKT_COUNT_C 0xC000FFFF
#define PKT_COUNT_S(x) (((x) & 0x3FFF) << 16)