fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 10:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvc0: enable very initial support for nvf0 (GK110)

Browse source 
Shaders need a lot of work still.  Basic stuff generally works, so this
is basically just fine for gnome-shell, OA etc at this point.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-05-17 14:48:15 +10:00
parent 4dbca8672b
commit c29c6b2b2e
5 changed files with 76 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/nouveau/nv_object.xml.h
View file

@ -189,6 +189,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NVC1_3D_CLASS 0x00009197
#define NVC8_3D_CLASS 0x00009297
#define NVE4_3D_CLASS 0x0000a097
#define NVF0_3D_CLASS 0x0000a197
#define NV50_2D_CLASS 0x0000502d
#define NVC0_2D_CLASS 0x0000902d
#define NV50_COMPUTE_CLASS 0x000050c0
@ -201,6 +202,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define BLOB_NVC0_PCOPY1_CLASS 0x000090b8
#define BLOB_NVC0_PCOPY0_CLASS 0x000090b5
#define NVE4_P2MF_CLASS 0x0000a040
#define NVF0_P2MF_CLASS 0x0000a140
#define NV31_MPEG_CLASS 0x00003174
#define NV84_MPEG_CLASS 0x00008274

62
src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp
View file

@ -1144,13 +1144,45 @@ CodeEmitterGK110::emitPFETCH(const Instruction *i)
void
CodeEmitterGK110::emitVFETCH(const Instruction *i)
{
emitNOP(i); // TODO
uint32_t offset = i->src(0).get()->reg.data.offset;
code[0] = 0x00000002 | (offset << 23);
code[1] = 0x7ec00000 | (offset >> 9);
#if 0
if (i->perPatch)
code[0] |= 0x100;
if (i->getSrc(0)->reg.file == FILE_SHADER_OUTPUT)
code[0] |= 0x200; // yes, TCPs can read from *outputs* of other threads
#endif
emitPredicate(i);
defId(i->def(0), 2);
srcId(i->src(0).getIndirect(0), 10);
srcId(i->src(0).getIndirect(1), 32 + 10); // vertex address
}
void
CodeEmitterGK110::emitEXPORT(const Instruction *i)
{
emitNOP(i); // TODO
uint32_t offset = i->src(0).get()->reg.data.offset;
code[0] = 0x00000002 | (offset << 23);
code[1] = 0x7f000000 | (offset >> 9);
#if 0
if (i->perPatch)
code[0] |= 0x100;
#endif
emitPredicate(i);
assert(i->src(1).getFile() == FILE_GPR);
srcId(i->src(0).getIndirect(0), 10);
srcId(i->src(0).getIndirect(1), 32 + 10); // vertex base address
srcId(i->src(1), 2);
}
void
@ -1162,13 +1194,35 @@ CodeEmitterGK110::emitOUT(const Instruction *i)
void
CodeEmitterGK110::emitInterpMode(const Instruction *i)
{
emitNOP(i); // TODO
code[1] |= i->ipa << 21; // TODO: INTERP_SAMPLEID
}
void
CodeEmitterGK110::emitINTERP(const Instruction *i)
{
emitNOP(i); // TODO
const uint32_t base = i->getSrc(0)->reg.data.offset;
code[0] = 0x00000002 | (base << 31);
code[1] = 0x74800000 | (base >> 1);
if (i->saturate)
code[1] |= 1 << 18;
if (i->op == OP_PINTERP)
srcId(i->src(1), 23);
else
code[0] |= 0xff << 23;
srcId(i->src(0).getIndirect(0), 10);
emitInterpMode(i);
emitPredicate(i);
defId(i->def(0), 2);
if (i->getSampleMode() == NV50_IR_INTERP_OFFSET)
srcId(i->src(i->op == OP_PINTERP ? 2 : 1), 32 + 10);
else
code[1] |= 0xff << 10;
}
void

9
src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp
View file

@ -351,7 +351,14 @@ TargetNVC0::isAccessSupported(DataFile file, DataType ty) const
if (file == FILE_MEMORY_CONST && getChipset() >= 0xe0) // wrong encoding ?
return typeSizeof(ty) <= 8;
if (ty == TYPE_B96)
return (file == FILE_SHADER_INPUT) || (file == FILE_SHADER_OUTPUT);
return false;
if (getChipset() >= 0xf0) {
// XXX: find wide vfetch/export
if (ty == TYPE_B128)
return false;
if (ty == TYPE_U64)
return false;
}
return true;
}

7
src/gallium/drivers/nvc0/nvc0_screen.c
View file

@ -549,6 +549,7 @@ nvc0_screen_create(struct nouveau_device *dev)
case 0xc0:
case 0xd0:
case 0xe0:
case 0xf0:
break;
default:
return NULL;
@ -597,6 +598,9 @@ nvc0_screen_create(struct nouveau_device *dev)
screen->base.fence.update = nvc0_screen_fence_update;
switch (dev->chipset & 0xf0) {
case 0xf0:
obj_class = NVF0_P2MF_CLASS;
break;
case 0xe0:
obj_class = NVE4_P2MF_CLASS;
break;
@ -641,6 +645,9 @@ nvc0_screen_create(struct nouveau_device *dev)
PUSH_DATA (push, screen->fence.bo->offset + 16);
switch (dev->chipset & 0xf0) {
case 0xf0:
obj_class = NVF0_3D_CLASS;
break;
case 0xe0:
obj_class = NVE4_3D_CLASS;
break;

1
src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
View file

@ -35,6 +35,7 @@ nouveau_drm_screen_create(int fd)
case 0xc0:
case 0xd0:
case 0xe0:
case 0xf0:
init = nvc0_screen_create;
break;
default: