93f43ed81a
The code which constructs the modules for each engine present on the GPU
passes -1 for 'instance' on non-instanced engines, which affects how the
name for a sub-device is generated. This is then stored as 'instance 0'
in nvkm_subdev.inst, so code can potentially be shared with earlier GPUs
that only had a single instance of an engine.
However, GF100's CE constructor uses this value to calculate the address
of its falcon before it's translated, resulting in CE0 getting the wrong
address.
This slightly modifies the approach, always passing a valid instance for
engines that *can* have multiple copies, and having the code for earlier
GPUs explicitly ask for non-instanced name generation.
Bug: https://gitlab.freedesktop.org/drm/nouveau/-/issues/91
Fixes: 50551b15c7 ("drm/nouveau/ce: switch to instanced constructor")
Cc: <stable@vger.kernel.org> # v5.12+
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Tested-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211103011057.15344-1-skeggsb@gmail.com
84 lines
2.7 KiB
C
84 lines
2.7 KiB
C
/*
|
|
* Copyright 2012 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors: Ben Skeggs
|
|
*/
|
|
#include "priv.h"
|
|
#include "fuc/gt215.fuc3.h"
|
|
|
|
#include <core/client.h>
|
|
#include <core/enum.h>
|
|
#include <core/gpuobj.h>
|
|
#include <engine/fifo.h>
|
|
|
|
#include <nvif/class.h>
|
|
|
|
static const struct nvkm_enum
|
|
gt215_ce_isr_error_name[] = {
|
|
{ 0x0001, "ILLEGAL_MTHD" },
|
|
{ 0x0002, "INVALID_ENUM" },
|
|
{ 0x0003, "INVALID_BITFIELD" },
|
|
{}
|
|
};
|
|
|
|
void
|
|
gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_fifo_chan *chan)
|
|
{
|
|
struct nvkm_subdev *subdev = &ce->engine.subdev;
|
|
struct nvkm_device *device = subdev->device;
|
|
const u32 base = subdev->inst * 0x1000;
|
|
u32 ssta = nvkm_rd32(device, 0x104040 + base) & 0x0000ffff;
|
|
u32 addr = nvkm_rd32(device, 0x104040 + base) >> 16;
|
|
u32 mthd = (addr & 0x07ff) << 2;
|
|
u32 subc = (addr & 0x3800) >> 11;
|
|
u32 data = nvkm_rd32(device, 0x104044 + base);
|
|
const struct nvkm_enum *en =
|
|
nvkm_enum_find(gt215_ce_isr_error_name, ssta);
|
|
|
|
nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] ch %d [%010llx %s] "
|
|
"subc %d mthd %04x data %08x\n", ssta,
|
|
en ? en->name : "", chan ? chan->chid : -1,
|
|
chan ? chan->inst->addr : 0,
|
|
chan ? chan->object.client->name : "unknown",
|
|
subc, mthd, data);
|
|
}
|
|
|
|
static const struct nvkm_falcon_func
|
|
gt215_ce = {
|
|
.code.data = gt215_ce_code,
|
|
.code.size = sizeof(gt215_ce_code),
|
|
.data.data = gt215_ce_data,
|
|
.data.size = sizeof(gt215_ce_data),
|
|
.intr = gt215_ce_intr,
|
|
.sclass = {
|
|
{ -1, -1, GT212_DMA },
|
|
{}
|
|
}
|
|
};
|
|
|
|
int
|
|
gt215_ce_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
|
|
struct nvkm_engine **pengine)
|
|
{
|
|
return nvkm_falcon_new_(>215_ce, device, type, -1,
|
|
(device->chipset != 0xaf), 0x104000, pengine);
|
|
}
|