diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-23 07:53:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-23 07:53:36 +0200 |
| commit | 63dafeb392139b893a73b6331f347613f0929702 (patch) | |
| tree | 44f928364b4e48c44b1ffe61d1578535de2a657a /drivers/accel | |
| parent | b29929b819f35503024c6a7e6ad442f6e36c68a0 (diff) | |
| parent | 86731a2a651e58953fc949573895f2fa6d456841 (diff) | |
| download | lwn-63dafeb392139b893a73b6331f347613f0929702.tar.gz lwn-63dafeb392139b893a73b6331f347613f0929702.zip | |
Merge 6.16-rc3 into driver-core-next
We need the driver-core fixes that are in 6.16-rc3 into here as well
to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/accel')
| -rw-r--r-- | drivers/accel/amdxdna/aie2_psp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/accel/amdxdna/aie2_psp.c b/drivers/accel/amdxdna/aie2_psp.c index dc3a072ce3b6..f28a060a8810 100644 --- a/drivers/accel/amdxdna/aie2_psp.c +++ b/drivers/accel/amdxdna/aie2_psp.c @@ -126,8 +126,8 @@ struct psp_device *aie2m_psp_create(struct drm_device *ddev, struct psp_config * psp->ddev = ddev; memcpy(psp->psp_regs, conf->psp_regs, sizeof(psp->psp_regs)); - psp->fw_buf_sz = ALIGN(conf->fw_size, PSP_FW_ALIGN) + PSP_FW_ALIGN; - psp->fw_buffer = drmm_kmalloc(ddev, psp->fw_buf_sz, GFP_KERNEL); + psp->fw_buf_sz = ALIGN(conf->fw_size, PSP_FW_ALIGN); + psp->fw_buffer = drmm_kmalloc(ddev, psp->fw_buf_sz + PSP_FW_ALIGN, GFP_KERNEL); if (!psp->fw_buffer) { drm_err(ddev, "no memory for fw buffer"); return NULL; |