[Nouveau] [PATCH 03/44] drm/nouveau/nvkm: bump maximum number of NVJPG

[Martin Roukala]

On 10/24/23 11:37, Philipp Stanner wrote:
> On Tue, 2023-09-19 at 06:21 +1000, Ben Skeggs wrote:
>> From: Ben Skeggs <bskeggs at redhat.com>
>>
>> RM (and GH100) support 8 NVJPG instances.
> 
> I don't think the commit message provides enough information.
> Instinctively I would read the RM as "remove", thus "remove support
> [for] 8 NVJPG instances" ???
> 
> Two sentences (with verb and object) would be helpful here, one
> describing the problem being addressed, the other what the commit does.

Agreed. Here is my understanding of what Ben meant to say:

Bump the maximum amount of NVJPG blocks to 8 to matching both what 
nvidia's kernel driver (resource manager) and GH100 support.

I hope this helps!

Martin
> 
> P.
> 
> 
>>
>> Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
>> ---
>>   drivers/gpu/drm/nouveau/include/nvkm/core/layout.h | 2 +-
>>   drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c    | 2 +-
>>   drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c    | 2 +-
>>   3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
>> b/drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
>> index f326b09680be..6af0352a4873 100644
>> --- a/drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
>> +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
>> @@ -44,7 +44,7 @@ NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSPPP   , struct
>> nvkm_engine  ,    msppp)
>>   NVKM_LAYOUT_ONCE(NVKM_ENGINE_MSVLD   , struct nvkm_engine  ,
>> msvld)
>>   NVKM_LAYOUT_INST(NVKM_ENGINE_NVDEC   , struct nvkm_nvdec   ,
>> nvdec, 8)
>>   NVKM_LAYOUT_INST(NVKM_ENGINE_NVENC   , struct nvkm_nvenc   ,
>> nvenc, 3)
>> -NVKM_LAYOUT_ONCE(NVKM_ENGINE_NVJPG   , struct nvkm_engine  ,
>> nvjpg)
>> +NVKM_LAYOUT_INST(NVKM_ENGINE_NVJPG   , struct nvkm_engine  ,
>> nvjpg, 8)
>>   NVKM_LAYOUT_ONCE(NVKM_ENGINE_OFA     , struct nvkm_engine  ,
>> ofa)
>>   NVKM_LAYOUT_ONCE(NVKM_ENGINE_PM      , struct nvkm_pm      ,
>> pm)
>>   NVKM_LAYOUT_ONCE(NVKM_ENGINE_SEC     , struct nvkm_engine  ,
>> sec)
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c
>> b/drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c
>> index 84790cf52b90..4fa6e2f19bfe 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c
>> @@ -76,7 +76,7 @@ ga100_top_parse(struct nvkm_top *top)
>>                  case 0x00000012: I_(NVKM_SUBDEV_IOCTRL, inst); break;
>>                  case 0x00000013: I_(NVKM_ENGINE_CE    , inst); break;
>>                  case 0x00000014: O_(NVKM_SUBDEV_GSP   ,    0); break;
>> -               case 0x00000015: O_(NVKM_ENGINE_NVJPG ,    0); break;
>> +               case 0x00000015: I_(NVKM_ENGINE_NVJPG , inst); break;
>>                  case 0x00000016: O_(NVKM_ENGINE_OFA   ,    0); break;
>>                  case 0x00000017: O_(NVKM_SUBDEV_FLA   ,    0); break;
>>                          break;
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
>> b/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
>> index 2bbba8244cbf..0f1675e57256 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
>> @@ -89,7 +89,7 @@ gk104_top_parse(struct nvkm_top *top)
>>                  case 0x00000012: I_(NVKM_SUBDEV_IOCTRL, inst); break;
>>                  case 0x00000013: I_(NVKM_ENGINE_CE    , inst); break;
>>                  case 0x00000014: O_(NVKM_SUBDEV_GSP   ,    0); break;
>> -               case 0x00000015: O_(NVKM_ENGINE_NVJPG ,    0); break;
>> +               case 0x00000015: I_(NVKM_ENGINE_NVJPG , inst); break;
>>                  default:
>>                          break;
>>                  }
>