Patch "media: venus: fix wrong size on dma_free" has been added to the 4.14-stable tree
Subsystems (5)
This is a note to let you know that I've just added the patch titled
media: venus: fix wrong size on dma_free
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-venus-fix-wrong-size-on-dma_free.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
cd1a77e3c9cc6dbb57f02aa50e1740fc144d2dadMon Sep 17 00:00:00 2001
From: Stanimir Varbanov <[email protected]>
Date: Mon, 9 Oct 2017 14:24:57 +0200
Subject: media: venus: fix wrong size on dma_free
From: Stanimir Varbanov <[email protected]>
commit cd1a77e3c9cc6dbb57f02aa50e1740fc144d2dad upstream.
This change will fix an issue with dma_free size found with DMA API debug enabled.
--- drivers/media/platform/qcom/venus/hfi_venus.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/media/platform/qcom/venus/hfi_venus.c +4 -8
@@ -344,7 +344,7 @@ static int venus_alloc(struct venus_hfi_ desc->attrs =DMA_ATTR_WRITE_COMBINE ; desc->size =ALIGN (size,SZ_4K ); - desc->kva =dma_alloc_attrs (dev, size, &desc->da,GFP_KERNEL , + desc->kva =dma_alloc_attrs (dev, desc->size, &desc->da,GFP_KERNEL , desc->attrs);if (!desc->kva)return -ENOMEM ;
@@ -710,10 +710,8 @@ static int venus_interface_queues_init(sif (ret)return ret; - hdev->ifaceq_table.kva = desc.kva; - hdev->ifaceq_table.da = desc.da; - hdev->ifaceq_table.size =IFACEQ_TABLE_SIZE ; - offset = hdev->ifaceq_table.size; + hdev->ifaceq_table = desc; + offset =IFACEQ_TABLE_SIZE ;for (i =0 ; i <IFACEQ_NUM ; i++) { queue = &hdev->queues[i];
@@ -755,9 +753,7 @@ static int venus_interface_queues_init(sif (ret) { hdev->sfr.da =0 ; }else { - hdev->sfr.da = desc.da; - hdev->sfr.kva = desc.kva; - hdev->sfr.size =ALIGNED_SFR_SIZE ; + hdev->sfr = desc; sfr = hdev->sfr.kva; sfr->buf_size =ALIGNED_SFR_SIZE ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/media-venus-venc-fix-bytesused-v4l2_plane-field.patch queue-4.14/media-venus-reimplement-decoder-stop-command.patch queue-4.14/media-venus-fix-wrong-size-on-dma_free.patch