* [PATCH 1/2] media: iris: represent dma_mask in more readable form
2025-01-09 11:26 [PATCH 0/2] media: iris: fix memory leak and improve driver Dikshita Agarwal
@ 2025-01-09 11:26 ` Dikshita Agarwal
2025-01-09 11:26 ` [PATCH 2/2] media: iris: fix memory leak while freeing queue memory Dikshita Agarwal
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Dikshita Agarwal @ 2025-01-09 11:26 UTC (permalink / raw)
To: Vikash Garodia, Abhinav Kumar, Mauro Carvalho Chehab,
Stefan Schmidt
Cc: Hans Verkuil, Joel Stanley, linux-media, linux-arm-msm,
linux-kernel, Dikshita Agarwal,
20241212-qcom-video-iris-v9-0-e8c2c6bd4041
Update the value of dma mask from GENMASK(31, 29) - 1 to 0xe0000000-1 to
make it easier to understand and keep it consistent.
Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
---
drivers/media/platform/qcom/iris/iris_platform_sm8250.c | 3 ++-
drivers/media/platform/qcom/iris/iris_platform_sm8550.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
index 9ef2fcc1a0fd..b14b1c5d632c 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
@@ -125,7 +125,8 @@ struct iris_platform_data sm8250_data = {
.opp_pd_tbl_size = ARRAY_SIZE(sm8250_opp_pd_table),
.clk_tbl = sm8250_clk_table,
.clk_tbl_size = ARRAY_SIZE(sm8250_clk_table),
- .dma_mask = GENMASK(31, 29) - 1,
+ /* Upper bound of DMA address range */
+ .dma_mask = 0xe0000000 - 1,
.fwname = "qcom/vpu-1.0/venus.mbn",
.pas_id = IRIS_PAS_ID,
.inst_caps = &platform_inst_cap_sm8250,
diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8550.c b/drivers/media/platform/qcom/iris/iris_platform_sm8550.c
index ad945489126e..35d278996c43 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_sm8550.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_sm8550.c
@@ -232,7 +232,8 @@ struct iris_platform_data sm8550_data = {
.opp_pd_tbl_size = ARRAY_SIZE(sm8550_opp_pd_table),
.clk_tbl = sm8550_clk_table,
.clk_tbl_size = ARRAY_SIZE(sm8550_clk_table),
- .dma_mask = GENMASK(31, 29) - 1,
+ /* Upper bound of DMA address range */
+ .dma_mask = 0xe0000000 - 1,
.fwname = "qcom/vpu/vpu30_p4.mbn",
.pas_id = IRIS_PAS_ID,
.inst_caps = &platform_inst_cap_sm8550,
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] media: iris: fix memory leak while freeing queue memory
2025-01-09 11:26 [PATCH 0/2] media: iris: fix memory leak and improve driver Dikshita Agarwal
2025-01-09 11:26 ` [PATCH 1/2] media: iris: represent dma_mask in more readable form Dikshita Agarwal
@ 2025-01-09 11:26 ` Dikshita Agarwal
2025-01-09 12:47 ` [PATCH 0/2] media: iris: fix memory leak and improve driver Hans Verkuil
2025-01-09 15:17 ` Johan Hovold
3 siblings, 0 replies; 7+ messages in thread
From: Dikshita Agarwal @ 2025-01-09 11:26 UTC (permalink / raw)
To: Vikash Garodia, Abhinav Kumar, Mauro Carvalho Chehab,
Stefan Schmidt
Cc: Hans Verkuil, Joel Stanley, linux-media, linux-arm-msm,
linux-kernel, Dikshita Agarwal,
20241212-qcom-video-iris-v9-0-e8c2c6bd4041
Memory allocated for shared queues is not freed completely in tear down
sequence. Fix it by passing the correct value while freeing the queue
memory.
Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
---
drivers/media/platform/qcom/iris/iris_hfi_queue.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_queue.c b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
index 9195715c5d5a..d1113708644b 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_queue.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
@@ -292,6 +292,7 @@ int iris_hfi_queues_init(struct iris_core *core)
void iris_hfi_queues_deinit(struct iris_core *core)
{
+ u32 queue_size;
if (!core->iface_q_table_vaddr)
return;
@@ -305,9 +306,10 @@ void iris_hfi_queues_deinit(struct iris_core *core)
core->sfr_vaddr = NULL;
core->sfr_daddr = 0;
- dma_free_attrs(core->dev, sizeof(struct iris_hfi_queue_table_header),
- core->iface_q_table_vaddr, core->iface_q_table_daddr,
- DMA_ATTR_WRITE_COMBINE);
+ queue_size = ALIGN(sizeof(struct iris_hfi_queue_table_header) +
+ (IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ), SZ_4K);
+ dma_free_attrs(core->dev, queue_size, core->iface_q_table_vaddr,
+ core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE);
core->iface_q_table_vaddr = NULL;
core->iface_q_table_daddr = 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/2] media: iris: fix memory leak and improve driver
2025-01-09 11:26 [PATCH 0/2] media: iris: fix memory leak and improve driver Dikshita Agarwal
2025-01-09 11:26 ` [PATCH 1/2] media: iris: represent dma_mask in more readable form Dikshita Agarwal
2025-01-09 11:26 ` [PATCH 2/2] media: iris: fix memory leak while freeing queue memory Dikshita Agarwal
@ 2025-01-09 12:47 ` Hans Verkuil
2025-01-09 13:21 ` Hans Verkuil
2025-01-09 15:17 ` Johan Hovold
3 siblings, 1 reply; 7+ messages in thread
From: Hans Verkuil @ 2025-01-09 12:47 UTC (permalink / raw)
To: Dikshita Agarwal, Vikash Garodia, Abhinav Kumar,
Mauro Carvalho Chehab, Stefan Schmidt, Sebastian Fricke
Cc: Joel Stanley, linux-media, linux-arm-msm, linux-kernel,
20241212-qcom-video-iris-v9-0-e8c2c6bd4041
Hi all,
The iris v3 series (https://patchwork.linuxtv.org/project/linux-media/list/?series=13467)
plus these two patches on top passed the media-ci tests.
If there are no further comments, then I plan to merge this for 6.14
tomorrow afternoon.
Regards,
Hans
On 09/01/2025 12:26, Dikshita Agarwal wrote:
> This series fixes a memory leak and improves the representation of
> dma mask to set upper bound of DMA address space.
>
> Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
> ---
> Dikshita Agarwal (2):
> media: iris: represent dma_mask in more readable form
> media: iris: fix memory leak while freeing queue memory
>
> drivers/media/platform/qcom/iris/iris_hfi_queue.c | 8 +++++---
> drivers/media/platform/qcom/iris/iris_platform_sm8250.c | 3 ++-
> drivers/media/platform/qcom/iris/iris_platform_sm8550.c | 3 ++-
> 3 files changed, 9 insertions(+), 5 deletions(-)
> ---
> base-commit: 698b6e3163bafd61e1b7d13572e2c42974ac85ec
> change-id: 20250108-iris-driver-fixes-d79c0ecc100d
> prerequisite-message-id: <20241212-qcom-video-iris-v9-0-e8c2c6bd4041@quicinc.com>
> prerequisite-patch-id: bfa9c88ec537e21017d5c9da3ad30d885d2eb132
> prerequisite-patch-id: bf37c5c6dc78b857caf6b544f6eb4000dee5dbaa
> prerequisite-patch-id: 4d3c8665de2faf0ad912943e3a9c9b4ca76bfd7f
> prerequisite-patch-id: 327454576fb8440c8521917a6582e4839b6088c3
> prerequisite-patch-id: fc523bc1a4f188e1924ebc18885c4dcd9b375e89
> prerequisite-patch-id: 1f837af2ed6c4925884b45e75828ff5b8ff057f0
> prerequisite-patch-id: 18c77c70db79b933a13df15f98f681a931156aea
> prerequisite-patch-id: 40168197cad291efe92bd5bf78e039475ed10ae8
> prerequisite-patch-id: b164fd80f4dcfb46b314377e8a595ce654418578
> prerequisite-patch-id: 271bf0ca62c46ff9b14db3c23196112c2f59256d
> prerequisite-patch-id: 67b096b9d1362eacfad13470c20e8eca833bf53d
> prerequisite-patch-id: 5c433b5a1407fda64de411ccdc723dc664319037
> prerequisite-patch-id: 8011d3230e717a0af3c6084b786612ff57bc770a
> prerequisite-patch-id: 6d6f8da843afa6d7159730838ab2ac6e800e9246
> prerequisite-patch-id: aa428f34e6695451780ff6b1bf8bc2dfb95c7071
> prerequisite-patch-id: c95c03b5085eaecafafcabf4d700247b3b00bd87
> prerequisite-patch-id: e41b4e7438a3fe56ba75501a417dba49365ed393
> prerequisite-patch-id: ff1531525f124cf59596b8ca80a58f31b85763d0
> prerequisite-patch-id: f20122e51eeb3691706b7d0f63628a84efc11b34
> prerequisite-patch-id: e397711e5044a5e830f7f46d3683b6c234c23dda
> prerequisite-patch-id: 99ad3fb3466a939438edf93e1591008a51004540
> prerequisite-patch-id: f96d6202f4ba4194b9a185243e0659d2bb8ec6e0
> prerequisite-patch-id: 71b8db4f106aa9322575573174c63d8d9eab20a1
> prerequisite-patch-id: 532f7998ec08c4cc01c69dcfd050ad854d8bdbad
> prerequisite-patch-id: cc80eabbf33df03053869cd47912efbd2c67d19a
> prerequisite-patch-id: 837959096e4fb7aa2b9d5afbd847aa0a4399ea87
> prerequisite-patch-id: f78814e6508d3439e1d77d82af471b839e03d1ec
> prerequisite-patch-id: 5a664eca073472e80da8f257cb030740e009737e
>
> Best regards,
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] media: iris: fix memory leak and improve driver
2025-01-09 12:47 ` [PATCH 0/2] media: iris: fix memory leak and improve driver Hans Verkuil
@ 2025-01-09 13:21 ` Hans Verkuil
0 siblings, 0 replies; 7+ messages in thread
From: Hans Verkuil @ 2025-01-09 13:21 UTC (permalink / raw)
To: Dikshita Agarwal, Vikash Garodia, Abhinav Kumar,
Mauro Carvalho Chehab, Stefan Schmidt, Sebastian Fricke
Cc: Joel Stanley, linux-media, linux-arm-msm, linux-kernel,
20241212-qcom-video-iris-v9-0-e8c2c6bd4041
On 09/01/2025 13:47, Hans Verkuil wrote:
> Hi all,
>
> The iris v3 series (https://patchwork.linuxtv.org/project/linux-media/list/?series=13467)
Sorry, I meant the v9 series (https://patchwork.linuxtv.org/bundle/hverkuil/b1/?series=14183)
of course.
v3 was never marked Superseded in patchwork, so I accidentally selected that one. The v3
series is now properly marked as Superseded.
Regards,
Hans
> plus these two patches on top passed the media-ci tests.
>
> If there are no further comments, then I plan to merge this for 6.14
> tomorrow afternoon.
>
> Regards,
>
> Hans
>
> On 09/01/2025 12:26, Dikshita Agarwal wrote:
>> This series fixes a memory leak and improves the representation of
>> dma mask to set upper bound of DMA address space.
>>
>> Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
>> ---
>> Dikshita Agarwal (2):
>> media: iris: represent dma_mask in more readable form
>> media: iris: fix memory leak while freeing queue memory
>>
>> drivers/media/platform/qcom/iris/iris_hfi_queue.c | 8 +++++---
>> drivers/media/platform/qcom/iris/iris_platform_sm8250.c | 3 ++-
>> drivers/media/platform/qcom/iris/iris_platform_sm8550.c | 3 ++-
>> 3 files changed, 9 insertions(+), 5 deletions(-)
>> ---
>> base-commit: 698b6e3163bafd61e1b7d13572e2c42974ac85ec
>> change-id: 20250108-iris-driver-fixes-d79c0ecc100d
>> prerequisite-message-id: <20241212-qcom-video-iris-v9-0-e8c2c6bd4041@quicinc.com>
>> prerequisite-patch-id: bfa9c88ec537e21017d5c9da3ad30d885d2eb132
>> prerequisite-patch-id: bf37c5c6dc78b857caf6b544f6eb4000dee5dbaa
>> prerequisite-patch-id: 4d3c8665de2faf0ad912943e3a9c9b4ca76bfd7f
>> prerequisite-patch-id: 327454576fb8440c8521917a6582e4839b6088c3
>> prerequisite-patch-id: fc523bc1a4f188e1924ebc18885c4dcd9b375e89
>> prerequisite-patch-id: 1f837af2ed6c4925884b45e75828ff5b8ff057f0
>> prerequisite-patch-id: 18c77c70db79b933a13df15f98f681a931156aea
>> prerequisite-patch-id: 40168197cad291efe92bd5bf78e039475ed10ae8
>> prerequisite-patch-id: b164fd80f4dcfb46b314377e8a595ce654418578
>> prerequisite-patch-id: 271bf0ca62c46ff9b14db3c23196112c2f59256d
>> prerequisite-patch-id: 67b096b9d1362eacfad13470c20e8eca833bf53d
>> prerequisite-patch-id: 5c433b5a1407fda64de411ccdc723dc664319037
>> prerequisite-patch-id: 8011d3230e717a0af3c6084b786612ff57bc770a
>> prerequisite-patch-id: 6d6f8da843afa6d7159730838ab2ac6e800e9246
>> prerequisite-patch-id: aa428f34e6695451780ff6b1bf8bc2dfb95c7071
>> prerequisite-patch-id: c95c03b5085eaecafafcabf4d700247b3b00bd87
>> prerequisite-patch-id: e41b4e7438a3fe56ba75501a417dba49365ed393
>> prerequisite-patch-id: ff1531525f124cf59596b8ca80a58f31b85763d0
>> prerequisite-patch-id: f20122e51eeb3691706b7d0f63628a84efc11b34
>> prerequisite-patch-id: e397711e5044a5e830f7f46d3683b6c234c23dda
>> prerequisite-patch-id: 99ad3fb3466a939438edf93e1591008a51004540
>> prerequisite-patch-id: f96d6202f4ba4194b9a185243e0659d2bb8ec6e0
>> prerequisite-patch-id: 71b8db4f106aa9322575573174c63d8d9eab20a1
>> prerequisite-patch-id: 532f7998ec08c4cc01c69dcfd050ad854d8bdbad
>> prerequisite-patch-id: cc80eabbf33df03053869cd47912efbd2c67d19a
>> prerequisite-patch-id: 837959096e4fb7aa2b9d5afbd847aa0a4399ea87
>> prerequisite-patch-id: f78814e6508d3439e1d77d82af471b839e03d1ec
>> prerequisite-patch-id: 5a664eca073472e80da8f257cb030740e009737e
>>
>> Best regards,
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] media: iris: fix memory leak and improve driver
2025-01-09 11:26 [PATCH 0/2] media: iris: fix memory leak and improve driver Dikshita Agarwal
` (2 preceding siblings ...)
2025-01-09 12:47 ` [PATCH 0/2] media: iris: fix memory leak and improve driver Hans Verkuil
@ 2025-01-09 15:17 ` Johan Hovold
2025-01-10 17:32 ` Dikshita Agarwal
3 siblings, 1 reply; 7+ messages in thread
From: Johan Hovold @ 2025-01-09 15:17 UTC (permalink / raw)
To: Dikshita Agarwal
Cc: Vikash Garodia, Abhinav Kumar, Mauro Carvalho Chehab,
Stefan Schmidt, Hans Verkuil, Joel Stanley, linux-media,
linux-arm-msm, linux-kernel,
20241212-qcom-video-iris-v9-0-e8c2c6bd4041, Bjorn Andersson
On Thu, Jan 09, 2025 at 04:56:39PM +0530, Dikshita Agarwal wrote:
> This series fixes a memory leak and improves the representation of
> dma mask to set upper bound of DMA address space.
Both of these issues were pointed out to you during review of v9 of the
series adding this driver, and as the driver hasn't been merged yet this
can be fixed in a v10.
Also looks like something went wrong when you posted this series as it
is CCed to:
20241212-qcom-video-iris-v9-0-e8c2c6bd4041@quicinc.com
> Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
> ---
> Dikshita Agarwal (2):
> media: iris: represent dma_mask in more readable form
> media: iris: fix memory leak while freeing queue memory
Johan
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 0/2] media: iris: fix memory leak and improve driver
2025-01-09 15:17 ` Johan Hovold
@ 2025-01-10 17:32 ` Dikshita Agarwal
0 siblings, 0 replies; 7+ messages in thread
From: Dikshita Agarwal @ 2025-01-10 17:32 UTC (permalink / raw)
To: Johan Hovold
Cc: Vikash Garodia, Abhinav Kumar, Mauro Carvalho Chehab,
Stefan Schmidt, Hans Verkuil, Joel Stanley, linux-media,
linux-arm-msm, linux-kernel,
20241212-qcom-video-iris-v9-0-e8c2c6bd4041, Bjorn Andersson
On 1/9/2025 8:47 PM, Johan Hovold wrote:
> On Thu, Jan 09, 2025 at 04:56:39PM +0530, Dikshita Agarwal wrote:
>> This series fixes a memory leak and improves the representation of
>> dma mask to set upper bound of DMA address space.
>
> Both of these issues were pointed out to you during review of v9 of the
> series adding this driver, and as the driver hasn't been merged yet this
> can be fixed in a v10.
>
Sure, will send v10 soon with these 2 patches plus the Kconfig change for
selection of driver.
Thanks,
Dikshita
> Also looks like something went wrong when you posted this series as it
> is CCed to:
>
> 20241212-qcom-video-iris-v9-0-e8c2c6bd4041@quicinc.com
>
>> Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
>> ---
>> Dikshita Agarwal (2):
>> media: iris: represent dma_mask in more readable form
>> media: iris: fix memory leak while freeing queue memory
>
> Johan
^ permalink raw reply [flat|nested] 7+ messages in thread