530.30.02

This commit is contained in:
Andy Ritger
2023-02-28 11:12:44 -08:00
parent e598191e8e
commit 4397463e73
928 changed files with 124728 additions and 88525 deletions

View File

@@ -35,6 +35,8 @@ NvBool nv3dAllocChannelObject(
NvPushChannelPtr pPushChannel = pParams->pPushChannel;
NvPushDevicePtr pPushDevice = pPushChannel->pDevice;
const NvU32 classNumber = p3dChannel->p3dDevice->classNumber;
const NvU32 numChannels =
pPushDevice->clientSli ? pPushDevice->numSubDevices : 1;
int sd;
/*
@@ -44,15 +46,13 @@ NvBool nv3dAllocChannelObject(
nvAssert(p3dChannel->p3dDevice->pPushDevice ==
pParams->pPushChannel->pDevice);
for (sd = 0;
sd < ARRAY_LEN(pPushChannel->channelHandle) &&
pPushChannel->channelHandle[sd] != 0;
sd++) {
for (sd = 0; sd < numChannels; sd++) {
if (nvPushIsAModel(pPushDevice)) {
nvAssert(sd == 0);
} else {
const NvPushImports *pImports = pPushDevice->pImports;
nvAssert(pPushChannel->channelHandle[sd] != 0);
nvAssert(pParams->handle[sd] != 0);
NvU32 ret = pImports->rmApiAlloc(pPushDevice,
pPushChannel->channelHandle[sd],

View File

@@ -102,10 +102,6 @@ void _nv3dUploadDataInlineKepler(
nvPushSetMethodDataU64(p, gpuBaseAddress + offset + bytesSoFar);
nvPushSetMethodData(p, bytesThisChunk); // NVA097_PITCH_OUT
nvPushMethod(p, NVA06F_SUBCHANNEL_3D, NVA097_SET_DST_WIDTH, 2);
nvPushSetMethodData(p, bytesThisChunk);
nvPushSetMethodData(p, 1); // NVA097_SET_DST_HEIGHT
nvPushMethodOneIncr(p, NVA06F_SUBCHANNEL_3D, NVA097_LAUNCH_DMA,
1 + dwordsThisChunk);
nvPushSetMethodData(p,