shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 05:17:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Once firmware buffer has been converted to use s5p_mfc_priv_buf structure, it is possible to allocate it with existing s5p_mfc_alloc_priv_buf() function. This change will help to reduce code variants in the next patches."

Browse Source 
This reverts commit 7866d65955.
This commit is contained in:
Ard van Breemen
2017-03-22 16:18:18 +01:00
parent 252fe43727
commit f4a1a0de1a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
View File

@@ -27,7 +27,6 @@
int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev)
{
struct s5p_mfc_priv_buf *fw_buf = &dev->fw_buf;
int err;
fw_buf->size = dev->variant->buf_size->fw;
@@ -36,10 +35,11 @@ int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev)
return -ENOMEM;
}
err = s5p_mfc_alloc_priv_buf(dev, BANK1_CTX, &dev->fw_buf);
if (err) {
fw_buf->virt = dma_alloc_coherent(dev->mem_dev[BANK1_CTX], fw_buf->size,
&fw_buf->dma, GFP_KERNEL);
if (!fw_buf->virt) {
mfc_err("Allocating bitprocessor buffer failed\n");
return err;
return -ENOMEM;
}
return 0;
@@ -92,7 +92,11 @@ int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev)
{
/* Before calling this function one has to make sure
* that MFC is no longer processing */
s5p_mfc_release_priv_buf(dev, &dev->fw_buf);
if (!dev->fw_buf.virt)
return -EINVAL;
dma_free_coherent(dev->mem_dev[BANK1_CTX], dev->fw_buf.size,
dev->fw_buf.virt, dev->fw_buf.dma);
dev->fw_buf.virt = NULL;
return 0;
}