Skip to content

[WIP] [Deepin-Kernel-SIG] [Upstream] Update kernel base to 6.6.63-nouveau #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opsiff wants to merge 3 commits into
base: linux-6.6.y
Choose a base branch
from
Open

[WIP] [Deepin-Kernel-SIG] [Upstream] Update kernel base to 6.6.63-nouveau #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95d0c53
Revert "Revert "Revert "Reapply "drm/nouveau/firmware: Fix SG_DEBUG e…
opsiff Nov 23, 2024
dc79728
nouveau/firmware: use dma non-coherent allocator
airlied Aug 15, 2024
8c237ae
nouveau: fw: sync dma after setup is called.
airlied Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions drivers/gpu/drm/nouveau/nvkm/core/firmware.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,8 @@ nvkm_firmware_dtor(struct nvkm_firmware *fw)
break;
case NVKM_FIRMWARE_IMG_DMA:
nvkm_memory_unref(&memory);
dma_unmap_single(fw->device->dev, fw->phys, sg_dma_len(&fw->mem.sgl),
DMA_TO_DEVICE);
kfree(fw->img);
dma_free_noncoherent(fw->device->dev, sg_dma_len(&fw->mem.sgl),
fw->img, fw->phys, DMA_TO_DEVICE);
break;
default:
WARN_ON(1);
Expand All @@ -213,17 +212,16 @@ nvkm_firmware_ctor(const struct nvkm_firmware_func *func, const char *name,
fw->img = kmemdup(src, fw->len, GFP_KERNEL);
break;
case NVKM_FIRMWARE_IMG_DMA: {
dma_addr_t addr;
len = ALIGN(fw->len, PAGE_SIZE);

fw->img = kmalloc(len, GFP_KERNEL);
if (!fw->img)
return -ENOMEM;

memcpy(fw->img, src, fw->len);
fw->phys = dma_map_single(fw->device->dev, fw->img, len, DMA_TO_DEVICE);
if (dma_mapping_error(fw->device->dev, fw->phys)) {
kfree(fw->img);
return -EFAULT;
fw->img = dma_alloc_noncoherent(fw->device->dev,
len, &addr,
DMA_TO_DEVICE,
GFP_KERNEL);
if (fw->img) {
memcpy(fw->img, src, fw->len);
fw->phys = addr;
}

sg_init_one(&fw->mem.sgl, fw->img, len);
Expand Down
7 changes: 7 additions & 0 deletions drivers/gpu/drm/nouveau/nvkm/falcon/fw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ nvkm_falcon_fw_boot(struct nvkm_falcon_fw *fw, struct nvkm_subdev *user,
nvkm_falcon_fw_dtor_sigs(fw);
}


FLCNFW_DBG(fw, "resetting");
fw->func->reset(fw);

Expand All @@ -99,6 +100,12 @@ nvkm_falcon_fw_boot(struct nvkm_falcon_fw *fw, struct nvkm_subdev *user,
goto done;
}

/* after last write to the img, sync dma mappings */
dma_sync_single_for_device(fw->fw.device->dev,
fw->fw.phys,
sg_dma_len(&fw->fw.mem.sgl),
DMA_TO_DEVICE);

ret = fw->func->load(fw);
if (ret)
goto done;
Expand Down
Loading