summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_context.c36
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_context.h5
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_device.c13
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_device.h1
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_winsys.c8
-rw-r--r--src/gallium/winsys/dri/nouveau/nv04_surface.c15
6 files changed, 41 insertions, 37 deletions
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.c b/src/gallium/winsys/dri/nouveau/nouveau_context.c
index ff08a870db1..e65b057335c 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_context.c
@@ -43,7 +43,7 @@ nouveau_channel_context_destroy(struct nouveau_channel_context *nvc)
}
static struct nouveau_channel_context *
-nouveau_channel_context_create(struct nouveau_device *nvdev, unsigned chipset)
+nouveau_channel_context_create(struct nouveau_device *dev)
{
struct nouveau_channel_context *nvc;
int ret;
@@ -51,9 +51,8 @@ nouveau_channel_context_create(struct nouveau_device *nvdev, unsigned chipset)
nvc = CALLOC_STRUCT(nouveau_channel_context);
if (!nvc)
return NULL;
- nvc->chipset = chipset;
- if ((ret = nouveau_channel_alloc(nvdev, 0x8003d001, 0x8003d002,
+ if ((ret = nouveau_channel_alloc(dev, 0x8003d001, 0x8003d002,
&nvc->channel))) {
NOUVEAU_ERR("Error creating GPU channel: %d\n", ret);
nouveau_channel_context_destroy(nvc);
@@ -75,7 +74,7 @@ nouveau_channel_context_create(struct nouveau_device *nvdev, unsigned chipset)
return NULL;
}
- switch (chipset & 0xf0) {
+ switch (dev->chipset & 0xf0) {
case 0x50:
case 0x80:
case 0x90:
@@ -103,25 +102,17 @@ nouveau_context_create(const __GLcontextModes *glVis,
__DRIscreenPrivate *driScrnPriv = driContextPriv->driScreenPriv;
struct nouveau_screen *nv_screen = driScrnPriv->private;
struct nouveau_context *nv = CALLOC_STRUCT(nouveau_context);
- struct nouveau_device_priv *nvdev;
struct pipe_context *pipe = NULL;
struct st_context *st_share = NULL;
struct nouveau_channel_context *nvc = NULL;
+ struct nouveau_device *dev = nv_screen->device;
int i, ret;
if (sharedContextPrivate) {
st_share = ((struct nouveau_context *)sharedContextPrivate)->st;
}
- /* Check for supported arch */
- if ((ret = nouveau_device_get_param(nv_screen->device,
- NOUVEAU_GETPARAM_CHIPSET_ID,
- &nv->chipset))) {
- NOUVEAU_ERR("Error determining chipset id: %d\n", ret);
- return GL_FALSE;
- }
-
- switch (nv->chipset & 0xf0) {
+ switch (dev->chipset & 0xf0) {
case 0x10:
case 0x20:
/* NV10 */
@@ -136,7 +127,7 @@ nouveau_context_create(const __GLcontextModes *glVis,
/* G80 */
break;
default:
- NOUVEAU_ERR("Unsupported chipset: NV%02x\n", (int)nv->chipset);
+ NOUVEAU_ERR("Unsupported chipset: NV%02x\n", dev->chipset);
return GL_FALSE;
}
@@ -144,9 +135,12 @@ nouveau_context_create(const __GLcontextModes *glVis,
nv->nv_screen = nv_screen;
nv->dri_screen = driScrnPriv;
- nvdev = nouveau_device(nv_screen->device);
- nvdev->ctx = driContextPriv->hHWContext;
- nvdev->lock = (drmLock *)&driScrnPriv->pSAREA->lock;
+ {
+ struct nouveau_device_priv *nvdev = nouveau_device(dev);
+
+ nvdev->ctx = driContextPriv->hHWContext;
+ nvdev->lock = (drmLock *)&driScrnPriv->pSAREA->lock;
+ }
driParseConfigFiles(&nv->dri_option_cache, &nv_screen->option_cache,
nv->dri_screen->myNum, "nouveau");
@@ -201,7 +195,7 @@ nouveau_context_create(const __GLcontextModes *glVis,
}
/*XXX: temporary - disable multi-context/single-channel on pre-NV4x */
- switch (nv->chipset & 0xf0) {
+ switch (dev->chipset & 0xf0) {
case 0x40:
case 0x60:
/* NV40 class */
@@ -216,7 +210,7 @@ nouveau_context_create(const __GLcontextModes *glVis,
}
if (!nvc) {
- nvc = nouveau_channel_context_create(&nvdev->base, nv->chipset);
+ nvc = nouveau_channel_context_create(dev);
if (!nvc) {
NOUVEAU_ERR("Failed initialising GPU context\n");
return GL_FALSE;
@@ -244,7 +238,7 @@ nouveau_context_create(const __GLcontextModes *glVis,
}
/* Create pipe */
- switch (nv->chipset & 0xf0) {
+ switch (dev->chipset & 0xf0) {
case 0x50:
case 0x80:
case 0x90:
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.h b/src/gallium/winsys/dri/nouveau/nouveau_context.h
index 872ef93807a..9872d6b6914 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_context.h
@@ -21,8 +21,6 @@ struct nouveau_channel_context {
unsigned nr_pctx;
struct pipe_context **pctx;
- unsigned chipset;
-
struct nouveau_channel *channel;
struct nouveau_notifier *sync_notifier;
@@ -47,9 +45,6 @@ struct nouveau_channel_context {
struct nouveau_context {
struct st_context *st;
- /* Misc HW info */
- uint64_t chipset;
-
/* DRI stuff */
__DRIscreenPrivate *dri_screen;
__DRIdrawablePrivate *dri_drawable;
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_device.c b/src/gallium/winsys/dri/nouveau/nouveau_device.c
index 409e4415f76..0b452fcd02d 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_device.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_device.c
@@ -50,6 +50,19 @@ nouveau_device_open_existing(struct nouveau_device **dev, int close,
return ret;
}
+ {
+ uint64_t value;
+
+ ret = nouveau_device_get_param(&nvdev->base,
+ NOUVEAU_GETPARAM_CHIPSET_ID,
+ &value);
+ if (ret) {
+ nouveau_device_close((void *)&nvdev);
+ return ret;
+ }
+ nvdev->base.chipset = value;
+ }
+
*dev = &nvdev->base;
return 0;
}
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_device.h b/src/gallium/winsys/dri/nouveau/nouveau_device.h
index 744a89f74bf..e25e89fedda 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_device.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_device.h
@@ -24,6 +24,7 @@
#define __NOUVEAU_DEVICE_H__
struct nouveau_device {
+ unsigned chipset;
};
#endif
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
index 60fdbb8dfdf..635fd478a94 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
@@ -1,6 +1,7 @@
#include "pipe/p_util.h"
#include "nouveau_context.h"
+#include "nouveau_screen.h"
#include "nouveau_winsys_pipe.h"
#include "nouveau/nouveau_winsys.h"
@@ -94,11 +95,12 @@ nouveau_pipe_create(struct nouveau_context *nv)
unsigned chipset);
struct pipe_context *(*hw_create)(struct pipe_screen *, unsigned);
struct pipe_winsys *ws;
+ unsigned chipset = nv->nv_screen->device->chipset;
if (!nvws)
return NULL;
- switch (nv->chipset & 0xf0) {
+ switch (chipset & 0xf0) {
case 0x10:
case 0x20:
hws_create = nv10_screen_create;
@@ -120,7 +122,7 @@ nouveau_pipe_create(struct nouveau_context *nv)
hw_create = nv50_create;
break;
default:
- NOUVEAU_ERR("Unknown chipset NV%02x\n", (int)nv->chipset);
+ NOUVEAU_ERR("Unknown chipset NV%02x\n", chipset);
return NULL;
}
@@ -150,7 +152,7 @@ nouveau_pipe_create(struct nouveau_context *nv)
ws = nouveau_create_pipe_winsys(nv);
if (!nvc->pscreen)
- nvc->pscreen = hws_create(ws, nvws, nv->chipset);
+ nvc->pscreen = hws_create(ws, nvws, chipset);
nvc->pctx[nv->pctx_id] = hw_create(nvc->pscreen, nv->pctx_id);
return nvc->pctx[nv->pctx_id];
}
diff --git a/src/gallium/winsys/dri/nouveau/nv04_surface.c b/src/gallium/winsys/dri/nouveau/nv04_surface.c
index f61bd1477ff..dc167e4acfb 100644
--- a/src/gallium/winsys/dri/nouveau/nv04_surface.c
+++ b/src/gallium/winsys/dri/nouveau/nv04_surface.c
@@ -179,7 +179,7 @@ int
nouveau_surface_channel_create_nv04(struct nouveau_channel_context *nvc)
{
struct nouveau_channel *chan = nvc->channel;
- unsigned class;
+ unsigned chipset = nvc->channel->device->chipset, class;
int ret;
if ((ret = nouveau_grobj_alloc(chan, nvc->next_handle++, 0x39,
@@ -192,8 +192,8 @@ nouveau_surface_channel_create_nv04(struct nouveau_channel_context *nvc)
NV04_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 1);
OUT_RING (chan, nvc->sync_notifier->handle);
- class = nvc->chipset < 0x10 ? NV04_CONTEXT_SURFACES_2D :
- NV10_CONTEXT_SURFACES_2D;
+ class = chipset < 0x10 ? NV04_CONTEXT_SURFACES_2D :
+ NV10_CONTEXT_SURFACES_2D;
if ((ret = nouveau_grobj_alloc(chan, nvc->next_handle++, class,
&nvc->NvCtxSurf2D))) {
NOUVEAU_ERR("Error creating 2D surface object: %d\n", ret);
@@ -205,8 +205,7 @@ nouveau_surface_channel_create_nv04(struct nouveau_channel_context *nvc)
OUT_RING (chan, nvc->channel->vram->handle);
OUT_RING (chan, nvc->channel->vram->handle);
- class = nvc->chipset < 0x10 ? NV04_IMAGE_BLIT :
- NV12_IMAGE_BLIT;
+ class = chipset < 0x10 ? NV04_IMAGE_BLIT : NV12_IMAGE_BLIT;
if ((ret = nouveau_grobj_alloc(chan, nvc->next_handle++, class,
&nvc->NvImageBlit))) {
NOUVEAU_ERR("Error creating blit object: %d\n", ret);
@@ -237,7 +236,7 @@ nouveau_surface_channel_create_nv04(struct nouveau_channel_context *nvc)
NV04_GDI_RECTANGLE_TEXT_MONOCHROME_FORMAT, 1);
OUT_RING (chan, NV04_GDI_RECTANGLE_TEXT_MONOCHROME_FORMAT_LE);
- switch (nvc->chipset & 0xf0) {
+ switch (chipset & 0xf0) {
case 0x00:
case 0x10:
class = NV04_SWIZZLED_SURFACE;
@@ -267,10 +266,10 @@ nouveau_surface_channel_create_nv04(struct nouveau_channel_context *nvc)
BIND_RING (chan, nvc->NvSwzSurf, nvc->next_subchannel++);
- if (nvc->chipset < 0x10) {
+ if (chipset < 0x10) {
class = NV04_SCALED_IMAGE_FROM_MEMORY;
} else
- if (nvc->chipset < 0x40) {
+ if (chipset < 0x40) {
class = NV10_SCALED_IMAGE_FROM_MEMORY;
} else {
class = NV40_SCALED_IMAGE_FROM_MEMORY;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 14:58:54 +0000