summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2009-01-20 01:49:34 -0800
committerCorbin Simpson <[email protected]>2009-02-01 23:30:24 -0800
commit502ddfcd57ff7ed1f2dac9171f51c45893ea3d92 (patch)
tree794ab4d3c88643efa517721088e26ae078ab79b3 /src/gallium/winsys
parent43f20357c8db2c90ae1f8360dbc2c71762a0478e (diff)
r300: Add path for pci_id in winsys.
Needs to be hooked up to the getparam from the kernel.
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r--src/gallium/winsys/drm/amd/amd_context.c4
-rw-r--r--src/gallium/winsys/drm/amd/amd_r300.c4
-rw-r--r--src/gallium/winsys/drm/amd/amd_r300.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/winsys/drm/amd/amd_context.c b/src/gallium/winsys/drm/amd/amd_context.c
index 7784964867f..53311684ded 100644
--- a/src/gallium/winsys/drm/amd/amd_context.c
+++ b/src/gallium/winsys/drm/amd/amd_context.c
@@ -244,9 +244,11 @@ GLboolean amd_context_create(const __GLcontextModes *visual,
if (GL_TRUE) {
fprintf(stderr, "Creating r300 context...");
+ /* XXX today we pretend to be a very lame R300 vvvvvv */
pipe = r300_create_context(NULL,
amd_context->pipe_winsys,
- amd_create_r300_winsys(amd_context->drm_fd));
+ amd_create_r300_winsys(amd_context->drm_fd,
+ 0x4144));
} else {
pipe = amd_create_softpipe(amd_context);
}
diff --git a/src/gallium/winsys/drm/amd/amd_r300.c b/src/gallium/winsys/drm/amd/amd_r300.c
index 0f543df9e10..a7a70fdd7ff 100644
--- a/src/gallium/winsys/drm/amd/amd_r300.c
+++ b/src/gallium/winsys/drm/amd/amd_r300.c
@@ -43,12 +43,14 @@ static void amd_r300_flush_cs(struct radeon_cs* cs)
radeon_cs_erase(cs);
}
-struct r300_winsys* amd_create_r300_winsys(int fd)
+struct r300_winsys* amd_create_r300_winsys(int fd, uint32_t pci_id)
{
struct r300_winsys* winsys = calloc(1, sizeof(struct r300_winsys));
struct radeon_cs_manager* csm = radeon_cs_manager_gem_ctor(fd);
+ winsys->pci_id = pci_id;
+
winsys->cs = radeon_cs_create(csm, 1024 * 64 / 4);
winsys->check_cs = amd_r300_check_cs;
diff --git a/src/gallium/winsys/drm/amd/amd_r300.h b/src/gallium/winsys/drm/amd/amd_r300.h
index ef269454b37..0d229fe0c4c 100644
--- a/src/gallium/winsys/drm/amd/amd_r300.h
+++ b/src/gallium/winsys/drm/amd/amd_r300.h
@@ -26,4 +26,4 @@
#include "amd_buffer.h"
-struct r300_winsys* amd_create_r300_winsys(int fd);
+struct r300_winsys* amd_create_r300_winsys(int fd, uint32_t pci_id);