KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600g: put radeon_winsys in screen::winsys, don't include drm_driver in the pipe 

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Marek Olšák 2011-08-02 20:25:13 +02:00
parent 354f76f386
commit 2ce783d8dd
12 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/r600/r600.h
View File

@ -95,11 +95,12 @@ unsigned r600_get_backend_map(struct radeon *radeon);
/* r600_bo.c */ /* r600_bo.c */
struct r600_bo; struct r600_bo;
struct r600_bo *r600_bo(struct radeon *radeon, struct r600_bo *r600_bo(struct radeon *radeon,
unsigned size, unsigned alignment, unsigned size, unsigned alignment,
unsigned binding, unsigned usage); unsigned binding, unsigned usage);
struct r600_bo *r600_bo_handle(struct radeon *radeon, struct r600_bo *r600_bo_handle(struct radeon *radeon, struct winsys_handle *whandle,
unsigned handle, unsigned *array_mode); unsigned *stride, unsigned *array_mode);
void *r600_bo_map(struct radeon *radeon, struct r600_bo *bo, unsigned usage, void *ctx); void *r600_bo_map(struct radeon *radeon, struct r600_bo *bo, unsigned usage, void *ctx);
void r600_bo_unmap(struct radeon *radeon, struct r600_bo *bo); void r600_bo_unmap(struct radeon *radeon, struct r600_bo *bo);
boolean r600_bo_get_winsys_handle(struct radeon *radeon, struct r600_bo *pb_bo, boolean r600_bo_get_winsys_handle(struct radeon *radeon, struct r600_bo *pb_bo,
@ -315,7 +316,7 @@ void evergreen_context_pipe_state_set_fs_resource(struct r600_context *ctx, stru
void evergreen_context_pipe_state_set_ps_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id); void evergreen_context_pipe_state_set_ps_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id);
void evergreen_context_pipe_state_set_vs_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id); void evergreen_context_pipe_state_set_vs_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id);
struct radeon *radeon_decref(struct radeon *radeon); struct radeon *radeon_destroy(struct radeon *radeon);
void _r600_pipe_state_add_reg(struct r600_context *ctx, void _r600_pipe_state_add_reg(struct r600_context *ctx,
struct r600_pipe_state *state, struct r600_pipe_state *state,

23
src/gallium/drivers/r600/r600_buffer.c
View File

@ -33,8 +33,6 @@
#include <util/u_memory.h> #include <util/u_memory.h>
#include "util/u_upload_mgr.h" #include "util/u_upload_mgr.h"
#include "state_tracker/drm_driver.h"
#include <xf86drm.h> #include <xf86drm.h>
#include "radeon_drm.h" #include "radeon_drm.h"
@ -48,7 +46,7 @@ static void r600_buffer_destroy(struct pipe_screen *screen,
struct r600_resource_buffer *rbuffer = r600_buffer(buf); struct r600_resource_buffer *rbuffer = r600_buffer(buf);
if (rbuffer->r.bo) { if (rbuffer->r.bo) {
r600_bo_reference((struct radeon*)screen->winsys, &rbuffer->r.bo, NULL); r600_bo_reference(rscreen->radeon, &rbuffer->r.bo, NULL);
} }
rbuffer->r.bo = NULL; rbuffer->r.bo = NULL;
util_slab_free(&rscreen->pool_buffers, rbuffer); util_slab_free(&rscreen->pool_buffers, rbuffer);
@ -81,12 +79,13 @@ static void *r600_buffer_transfer_map(struct pipe_context *pipe,
struct pipe_transfer *transfer) struct pipe_transfer *transfer)
{ {
struct r600_resource_buffer *rbuffer = r600_buffer(transfer->resource); struct r600_resource_buffer *rbuffer = r600_buffer(transfer->resource);
struct r600_pipe_context *rctx = (struct r600_pipe_context*)pipe;
uint8_t *data; uint8_t *data;
if (rbuffer->r.b.user_ptr) if (rbuffer->r.b.user_ptr)
return (uint8_t*)rbuffer->r.b.user_ptr + transfer->box.x; return (uint8_t*)rbuffer->r.b.user_ptr + transfer->box.x;
data = r600_bo_map((struct radeon*)pipe->winsys, rbuffer->r.bo, transfer->usage, pipe); data = r600_bo_map(rctx->screen->radeon, rbuffer->r.bo, transfer->usage, pipe);
if (!data) if (!data)
return NULL; return NULL;
@ -97,12 +96,13 @@ static void r600_buffer_transfer_unmap(struct pipe_context *pipe,
struct pipe_transfer *transfer) struct pipe_transfer *transfer)
{ {
struct r600_resource_buffer *rbuffer = r600_buffer(transfer->resource); struct r600_resource_buffer *rbuffer = r600_buffer(transfer->resource);
struct r600_pipe_context *rctx = (struct r600_pipe_context*)pipe;
if (rbuffer->r.b.user_ptr) if (rbuffer->r.b.user_ptr)
return; return;
if (rbuffer->r.bo) if (rbuffer->r.bo)
r600_bo_unmap((struct radeon*)pipe->winsys, rbuffer->r.bo); r600_bo_unmap(rctx->screen->radeon, rbuffer->r.bo);
} }
static void r600_buffer_transfer_flush_region(struct pipe_context *pipe, static void r600_buffer_transfer_flush_region(struct pipe_context *pipe,
@ -127,20 +127,21 @@ static void r600_buffer_transfer_inline_write(struct pipe_context *pipe,
unsigned stride, unsigned stride,
unsigned layer_stride) unsigned layer_stride)
{ {
struct radeon *ws = (struct radeon*)pipe->winsys; struct r600_pipe_context *rctx = (struct r600_pipe_context*)pipe;
struct radeon *radeon = rctx->screen->radeon;
struct r600_resource_buffer *rbuffer = r600_buffer(resource); struct r600_resource_buffer *rbuffer = r600_buffer(resource);
uint8_t *map = NULL; uint8_t *map = NULL;
assert(rbuffer->r.b.user_ptr == NULL); assert(rbuffer->r.b.user_ptr == NULL);
map = r600_bo_map(ws, rbuffer->r.bo, map = r600_bo_map(radeon, rbuffer->r.bo,
PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | usage, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | usage,
pipe); pipe);
memcpy(map + box->x, data, box->width); memcpy(map + box->x, data, box->width);
if (rbuffer->r.bo) if (rbuffer->r.bo)
r600_bo_unmap(ws, rbuffer->r.bo); r600_bo_unmap(radeon, rbuffer->r.bo);
} }
static const struct u_resource_vtbl r600_buffer_vtbl = static const struct u_resource_vtbl r600_buffer_vtbl =
@ -175,7 +176,7 @@ struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
rbuffer->r.size = rbuffer->r.b.b.b.width0; rbuffer->r.size = rbuffer->r.b.b.b.width0;
rbuffer->r.bo_size = rbuffer->r.size; rbuffer->r.bo_size = rbuffer->r.size;
bo = r600_bo((struct radeon*)screen->winsys, bo = r600_bo(rscreen->radeon,
rbuffer->r.b.b.b.width0, rbuffer->r.b.b.b.width0,
alignment, rbuffer->r.b.b.b.bind, alignment, rbuffer->r.b.b.b.bind,
rbuffer->r.b.b.b.usage); rbuffer->r.b.b.b.usage);
@ -219,11 +220,11 @@ struct pipe_resource *r600_user_buffer_create(struct pipe_screen *screen,
struct pipe_resource *r600_buffer_from_handle(struct pipe_screen *screen, struct pipe_resource *r600_buffer_from_handle(struct pipe_screen *screen,
struct winsys_handle *whandle) struct winsys_handle *whandle)
{ {
struct radeon *rw = (struct radeon*)screen->winsys; struct radeon *rw = ((struct r600_screen*)screen)->radeon;
struct r600_resource *rbuffer; struct r600_resource *rbuffer;
struct r600_bo *bo = NULL; struct r600_bo *bo = NULL;
bo = r600_bo_handle(rw, whandle->handle, NULL); bo = r600_bo_handle(rw, whandle, NULL, NULL);
if (bo == NULL) { if (bo == NULL) {
return NULL; return NULL;
} }

10
src/gallium/drivers/r600/r600_pipe.c
View File

@ -500,7 +500,8 @@ static void r600_destroy_screen(struct pipe_screen* pscreen)
if (rscreen == NULL) if (rscreen == NULL)
return; return;
radeon_decref(rscreen->radeon); radeon_destroy(rscreen->radeon);
rscreen->ws->destroy(rscreen->ws);
util_slab_destroy(&rscreen->pool_buffers); util_slab_destroy(&rscreen->pool_buffers);
pipe_mutex_destroy(rscreen->mutex_num_contexts); pipe_mutex_destroy(rscreen->mutex_num_contexts);
@ -564,18 +565,19 @@ static boolean r600_fence_finish(struct pipe_screen *pscreen,
return TRUE; return TRUE;
} }
struct pipe_screen *r600_screen_create(struct radeon_winsys *rw) struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
{ {
struct r600_screen *rscreen; struct r600_screen *rscreen;
struct radeon *radeon = r600_drm_winsys_create(rw); struct radeon *radeon = radeon_create(ws);
rscreen = CALLOC_STRUCT(r600_screen); rscreen = CALLOC_STRUCT(r600_screen);
if (rscreen == NULL) { if (rscreen == NULL) {
return NULL; return NULL;
} }
rscreen->ws = ws;
rscreen->radeon = radeon; rscreen->radeon = radeon;
rscreen->screen.winsys = (struct pipe_winsys*)radeon; rscreen->screen.winsys = (struct pipe_winsys*)ws;
rscreen->screen.destroy = r600_destroy_screen; rscreen->screen.destroy = r600_destroy_screen;
rscreen->screen.get_name = r600_get_name; rscreen->screen.get_name = r600_get_name;
rscreen->screen.get_vendor = r600_get_vendor; rscreen->screen.get_vendor = r600_get_vendor;

1
src/gallium/drivers/r600/r600_pipe.h
View File

@ -74,6 +74,7 @@ enum r600_pipe_state_id {
struct r600_screen { struct r600_screen {
struct pipe_screen screen; struct pipe_screen screen;
struct radeon_winsys *ws;
struct radeon *radeon; struct radeon *radeon;
struct r600_tiling_info *tiling_info; struct r600_tiling_info *tiling_info;
struct util_slab_mempool pool_buffers; struct util_slab_mempool pool_buffers;

2
src/gallium/drivers/r600/r600_public.h
View File

@ -25,6 +25,6 @@
struct radeon_winsys; struct radeon_winsys;
struct pipe_screen *r600_screen_create(struct radeon_winsys *rw); struct pipe_screen *r600_screen_create(struct radeon_winsys *ws);
#endif #endif

22
src/gallium/drivers/r600/r600_texture.c
View File

@ -31,7 +31,6 @@
#include <util/u_math.h> #include <util/u_math.h>
#include <util/u_inlines.h> #include <util/u_inlines.h>
#include <util/u_memory.h> #include <util/u_memory.h>
#include "state_tracker/drm_driver.h"
#include "pipebuffer/pb_buffer.h" #include "pipebuffer/pb_buffer.h"
#include "r600_pipe.h" #include "r600_pipe.h"
#include "r600_resource.h" #include "r600_resource.h"
@ -239,7 +238,7 @@ static void r600_setup_miptree(struct pipe_screen *screen,
unsigned array_mode) unsigned array_mode)
{ {
struct pipe_resource *ptex = &rtex->resource.b.b.b; struct pipe_resource *ptex = &rtex->resource.b.b.b;
struct radeon *radeon = (struct radeon *)screen->winsys; struct radeon *radeon = ((struct r600_screen*)screen)->radeon;
enum chip_class chipc = r600_get_family_class(radeon); enum chip_class chipc = r600_get_family_class(radeon);
unsigned size, layer_size, i, offset; unsigned size, layer_size, i, offset;
unsigned nblocksx, nblocksy, extra_size = 0; unsigned nblocksx, nblocksy, extra_size = 0;
@ -329,7 +328,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
{ {
struct r600_resource_texture *rtex = (struct r600_resource_texture*)ptex; struct r600_resource_texture *rtex = (struct r600_resource_texture*)ptex;
struct r600_resource *resource = &rtex->resource; struct r600_resource *resource = &rtex->resource;
struct radeon *radeon = (struct radeon *)screen->winsys; struct radeon *radeon = ((struct r600_screen*)screen)->radeon;
return r600_bo_get_winsys_handle(radeon, resource->bo, return r600_bo_get_winsys_handle(radeon, resource->bo,
rtex->pitch_in_bytes[0], whandle); rtex->pitch_in_bytes[0], whandle);
@ -340,7 +339,7 @@ static void r600_texture_destroy(struct pipe_screen *screen,
{ {
struct r600_resource_texture *rtex = (struct r600_resource_texture*)ptex; struct r600_resource_texture *rtex = (struct r600_resource_texture*)ptex;
struct r600_resource *resource = &rtex->resource; struct r600_resource *resource = &rtex->resource;
struct radeon *radeon = (struct radeon *)screen->winsys; struct radeon *radeon = ((struct r600_screen*)screen)->radeon;
if (rtex->flushed_depth_texture) if (rtex->flushed_depth_texture)
pipe_resource_reference((struct pipe_resource **)&rtex->flushed_depth_texture, NULL); pipe_resource_reference((struct pipe_resource **)&rtex->flushed_depth_texture, NULL);
@ -373,7 +372,7 @@ r600_texture_create_object(struct pipe_screen *screen,
{ {
struct r600_resource_texture *rtex; struct r600_resource_texture *rtex;
struct r600_resource *resource; struct r600_resource *resource;
struct radeon *radeon = (struct radeon *)screen->winsys; struct radeon *radeon = ((struct r600_screen*)screen)->radeon;
rtex = CALLOC_STRUCT(r600_resource_texture); rtex = CALLOC_STRUCT(r600_resource_texture);
if (rtex == NULL) if (rtex == NULL)
@ -483,8 +482,9 @@ struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen,
const struct pipe_resource *templ, const struct pipe_resource *templ,
struct winsys_handle *whandle) struct winsys_handle *whandle)
{ {
struct radeon *rw = (struct radeon*)screen->winsys; struct radeon *rw = ((struct r600_screen*)screen)->radeon;
struct r600_bo *bo = NULL; struct r600_bo *bo = NULL;
unsigned stride = 0;
unsigned array_mode = 0; unsigned array_mode = 0;
/* Support only 2D textures without mipmaps */ /* Support only 2D textures without mipmaps */
@ -492,15 +492,13 @@ struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen,
templ->depth0 != 1 || templ->last_level != 0) templ->depth0 != 1 || templ->last_level != 0)
return NULL; return NULL;
bo = r600_bo_handle(rw, whandle->handle, &array_mode); bo = r600_bo_handle(rw, whandle, &stride, &array_mode);
if (bo == NULL) { if (bo == NULL) {
return NULL; return NULL;
} }
return (struct pipe_resource *)r600_texture_create_object(screen, templ, array_mode, return (struct pipe_resource *)r600_texture_create_object(screen, templ, array_mode,
whandle->stride, stride, 0, bo);
0,
bo);
} }
int r600_texture_depth_flush(struct pipe_context *ctx, int r600_texture_depth_flush(struct pipe_context *ctx,
@ -687,7 +685,7 @@ void* r600_texture_transfer_map(struct pipe_context *ctx,
struct r600_transfer *rtransfer = (struct r600_transfer*)transfer; struct r600_transfer *rtransfer = (struct r600_transfer*)transfer;
struct r600_bo *bo; struct r600_bo *bo;
enum pipe_format format = transfer->resource->format; enum pipe_format format = transfer->resource->format;
struct radeon *radeon = (struct radeon *)ctx->screen->winsys; struct radeon *radeon = ((struct r600_screen*)ctx->screen)->radeon;
unsigned offset = 0; unsigned offset = 0;
char *map; char *map;
@ -717,7 +715,7 @@ void r600_texture_transfer_unmap(struct pipe_context *ctx,
struct pipe_transfer* transfer) struct pipe_transfer* transfer)
{ {
struct r600_transfer *rtransfer = (struct r600_transfer*)transfer; struct r600_transfer *rtransfer = (struct r600_transfer*)transfer;
struct radeon *radeon = (struct radeon *)ctx->screen->winsys; struct radeon *radeon = ((struct r600_screen*)ctx->screen)->radeon;
struct r600_bo *bo; struct r600_bo *bo;
if (rtransfer->staging_texture) { if (rtransfer->staging_texture) {

1
src/gallium/winsys/r600/drm/evergreen_hw_context.c
View File

@ -902,6 +902,7 @@ int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon)
memset(ctx, 0, sizeof(struct r600_context)); memset(ctx, 0, sizeof(struct r600_context));
ctx->radeon = radeon; ctx->radeon = radeon;
LIST_INITHEAD(&ctx->query_list); LIST_INITHEAD(&ctx->query_list);
/* init dirty list */ /* init dirty list */

11
src/gallium/winsys/r600/drm/r600_bo.c
View File

@ -86,23 +86,26 @@ struct r600_bo *r600_bo(struct radeon *radeon,
return bo; return bo;
} }
struct r600_bo *r600_bo_handle(struct radeon *radeon, struct r600_bo *r600_bo_handle(struct radeon *radeon, struct winsys_handle *whandle,
unsigned handle, unsigned *array_mode) unsigned *stride, unsigned *array_mode)
{ {
struct r600_bo *bo = calloc(1, sizeof(struct r600_bo)); struct r600_bo *bo = calloc(1, sizeof(struct r600_bo));
struct radeon_bo *rbo; struct radeon_bo *rbo;
rbo = bo->bo = radeon_bo(radeon, handle, 0, 0, 0); rbo = bo->bo = radeon_bo(radeon, whandle->handle, 0, 0, 0);
if (rbo == NULL) { if (rbo == NULL) {
free(bo); free(bo);
return NULL; return NULL;
} }
pipe_reference_init(&bo->reference, 1);
bo->size = rbo->size; bo->size = rbo->size;
bo->domains = (RADEON_GEM_DOMAIN_CPU | bo->domains = (RADEON_GEM_DOMAIN_CPU |
RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_GTT |
RADEON_GEM_DOMAIN_VRAM); RADEON_GEM_DOMAIN_VRAM);
pipe_reference_init(&bo->reference, 1); if (stride)
*stride = whandle->stride;
radeon_bo_get_tiling_flags(radeon, rbo, &bo->tiling_flags, &bo->kernel_pitch); radeon_bo_get_tiling_flags(radeon, rbo, &bo->tiling_flags, &bo->kernel_pitch);
if (array_mode) { if (array_mode) {

18
src/gallium/winsys/r600/drm/r600_drm.c
View File

@ -28,6 +28,7 @@
#include "r600_priv.h" #include "r600_priv.h"
#include "r600_drm_public.h" #include "r600_drm_public.h"
#include "util/u_memory.h"
#include <radeon_drm.h> #include <radeon_drm.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <errno.h> #include <errno.h>
@ -244,22 +245,21 @@ static int handle_compare(void *key1, void *key2)
return PTR_TO_UINT(key1) != PTR_TO_UINT(key2); return PTR_TO_UINT(key1) != PTR_TO_UINT(key2);
} }
struct radeon *r600_drm_winsys_create(struct radeon_winsys *rw) struct radeon *radeon_create(struct radeon_winsys *ws)
{ {
struct radeon *radeon;
int r; int r;
struct radeon *radeon = CALLOC_STRUCT(radeon);
radeon = calloc(1, sizeof(*radeon));
if (radeon == NULL) { if (radeon == NULL) {
return NULL; return NULL;
} }
rw->query_info(rw, &radeon->info); radeon->ws = ws;
ws->query_info(ws, &radeon->info);
radeon->family = radeon_family_from_device(radeon->info.pci_id); radeon->family = radeon_family_from_device(radeon->info.pci_id);
if (radeon->family == CHIP_UNKNOWN) { if (radeon->family == CHIP_UNKNOWN) {
fprintf(stderr, "Unknown chipset 0x%04X\n", radeon->info.pci_id); fprintf(stderr, "Unknown chipset 0x%04X\n", radeon->info.pci_id);
return radeon_decref(radeon); return radeon_destroy(radeon);
} }
/* setup class */ /* setup class */
switch (radeon->family) { switch (radeon->family) {
@ -323,7 +323,7 @@ struct radeon *r600_drm_winsys_create(struct radeon_winsys *rw)
} }
r = radeon_init_fence(radeon); r = radeon_init_fence(radeon);
if (r) { if (r) {
radeon_decref(radeon); radeon_destroy(radeon);
return NULL; return NULL;
} }
@ -332,7 +332,7 @@ struct radeon *r600_drm_winsys_create(struct radeon_winsys *rw)
return radeon; return radeon;
} }
struct radeon *radeon_decref(struct radeon *radeon) struct radeon *radeon_destroy(struct radeon *radeon)
{ {
if (radeon == NULL) if (radeon == NULL)
return NULL; return NULL;
@ -346,6 +346,6 @@ struct radeon *radeon_decref(struct radeon *radeon)
if (radeon->bomgr) if (radeon->bomgr)
r600_bomgr_destroy(radeon->bomgr); r600_bomgr_destroy(radeon->bomgr);
free(radeon); FREE(radeon);
return NULL; return NULL;
} }

2
src/gallium/winsys/r600/drm/r600_drm_public.h
View File

@ -28,6 +28,6 @@
struct radeon_winsys; struct radeon_winsys;
struct radeon *r600_drm_winsys_create(struct radeon_winsys *rw); struct radeon *radeon_create(struct radeon_winsys *ws);
#endif #endif

1
src/gallium/winsys/r600/drm/r600_hw_context.c
View File

@ -874,6 +874,7 @@ int r600_context_init(struct r600_context *ctx, struct radeon *radeon)
memset(ctx, 0, sizeof(struct r600_context)); memset(ctx, 0, sizeof(struct r600_context));
ctx->radeon = radeon; ctx->radeon = radeon;
LIST_INITHEAD(&ctx->query_list); LIST_INITHEAD(&ctx->query_list);
/* init dirty list */ /* init dirty list */

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

@ -38,6 +38,7 @@ struct r600_bomgr;
struct r600_bo; struct r600_bo;
struct radeon { struct radeon {
struct radeon_winsys *ws;
struct radeon_info info; struct radeon_info info;
unsigned family; unsigned family;
enum chip_class chip_class; enum chip_class chip_class;