[PATCH v2] media: venus: vdec: fix error state assignment for zero bytesused

[PATCH v2] media: venus: vdec: fix error state assignment for zero bytesused

[Renjiang Han]

When hfi_session_flush is issued, all queued buffers are returned to
the V4L2 driver. Some of these buffers are not processed and have
bytesused = 0. Currently, the driver marks such buffers as error even
during drain operations, which can incorrectly flag EOS buffers.

This patch moves the zero-bytesused check inside the non-EOS branch
so that only capture buffers with zero payload (and not EOS) are
marked with VB2_BUF_STATE_ERROR.

Fixes: 51df3c81ba10b ("media: venus: vdec: Mark flushed buffers with error state")

Signed-off-by: Renjiang Han <renjiang.han@oss.qualcomm.com>
---
This patch refines the error state assignment logic in the Venus vdec
driver for Qualcomm platforms. Specifically, it ensures that the buffer
state is only set to VB2_BUF_STATE_ERROR for non-EOS capture buffers
with zero bytesused, preventing false error reporting during drain
operations.
---
Changes in v2:
- 1. Update commit message.
- 2. Add a Fixes tag.
- Link to v1: https://lore.kernel.org/r/20251126-fix-error-state-v1-1-34f943a8b165@oss.qualcomm.com
---
 drivers/media/platform/qcom/venus/vdec.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 4a6641fdffcf79705893be58c7ec5cf485e2fab9..d0bd2d86a31f9a18cb68b08ba66affdf8fc5092d 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -1440,10 +1440,10 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type,
 				inst->drain_active = false;
 				inst->codec_state = VENUS_DEC_STATE_STOPPED;
 			}
+		} else {
+			if (!bytesused)
+				state = VB2_BUF_STATE_ERROR;
 		}
-
-		if (!bytesused)
-			state = VB2_BUF_STATE_ERROR;
 	} else {
 		vbuf->sequence = inst->sequence_out++;
 	}

---
base-commit: 663d0d1af3faefe673cabf4b6b077149a87ad71f
change-id: 20251126-fix-error-state-24183a8538cd

Best regards,
-- 
Renjiang Han <renjiang.han@oss.qualcomm.com>

Re: [PATCH v2] media: venus: vdec: fix error state assignment for zero bytesused

[Dmitry Baryshkov]

On Mon, Dec 08, 2025 at 09:03:42AM +0530, Renjiang Han wrote:
> When hfi_session_flush is issued, all queued buffers are returned to
> the V4L2 driver. Some of these buffers are not processed and have
> bytesused = 0. Currently, the driver marks such buffers as error even
> during drain operations, which can incorrectly flag EOS buffers.
> 
> This patch moves the zero-bytesused check inside the non-EOS branch

Documentation/process/submitting-patches.rst, "This patch".

> so that only capture buffers with zero payload (and not EOS) are
> marked with VB2_BUF_STATE_ERROR.
> 
> Fixes: 51df3c81ba10b ("media: venus: vdec: Mark flushed buffers with error state")
> 
> Signed-off-by: Renjiang Han <renjiang.han@oss.qualcomm.com>

No empty lines between tags.

> ---
> This patch refines the error state assignment logic in the Venus vdec
> driver for Qualcomm platforms. Specifically, it ensures that the buffer
> state is only set to VB2_BUF_STATE_ERROR for non-EOS capture buffers
> with zero bytesused, preventing false error reporting during drain
> operations.
> ---
> Changes in v2:
> - 1. Update commit message.
> - 2. Add a Fixes tag.
> - Link to v1: https://lore.kernel.org/r/20251126-fix-error-state-v1-1-34f943a8b165@oss.qualcomm.com
> ---
>  drivers/media/platform/qcom/venus/vdec.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
> index 4a6641fdffcf79705893be58c7ec5cf485e2fab9..d0bd2d86a31f9a18cb68b08ba66affdf8fc5092d 100644
> --- a/drivers/media/platform/qcom/venus/vdec.c
> +++ b/drivers/media/platform/qcom/venus/vdec.c
> @@ -1440,10 +1440,10 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type,
>  				inst->drain_active = false;
>  				inst->codec_state = VENUS_DEC_STATE_STOPPED;
>  			}
> +		} else {
> +			if (!bytesused)
> +				state = VB2_BUF_STATE_ERROR;
>  		}
> -
> -		if (!bytesused)
> -			state = VB2_BUF_STATE_ERROR;
>  	} else {
>  		vbuf->sequence = inst->sequence_out++;
>  	}
> 
> ---
> base-commit: 663d0d1af3faefe673cabf4b6b077149a87ad71f
> change-id: 20251126-fix-error-state-24183a8538cd
> 
> Best regards,
> -- 
> Renjiang Han <renjiang.han@oss.qualcomm.com>
> 

-- 
With best wishes
Dmitry

Re: [PATCH v2] media: venus: vdec: fix error state assignment for zero bytesused

[Renjiang Han]

On 12/10/2025 7:11 AM, Dmitry Baryshkov wrote:
> On Mon, Dec 08, 2025 at 09:03:42AM +0530, Renjiang Han wrote:
>> When hfi_session_flush is issued, all queued buffers are returned to
>> the V4L2 driver. Some of these buffers are not processed and have
>> bytesused = 0. Currently, the driver marks such buffers as error even
>> during drain operations, which can incorrectly flag EOS buffers.
>>
>> This patch moves the zero-bytesused check inside the non-EOS branch
> Documentation/process/submitting-patches.rst, "This patch".
OK, thanks for your reminder. I will update it.
>
>> so that only capture buffers with zero payload (and not EOS) are
>> marked with VB2_BUF_STATE_ERROR.
>>
>> Fixes: 51df3c81ba10b ("media: venus: vdec: Mark flushed buffers with error state")
>>
>> Signed-off-by: Renjiang Han <renjiang.han@oss.qualcomm.com>
> No empty lines between tags.
OK, thanks for your comment. I will update it.
>
>> ---
>> This patch refines the error state assignment logic in the Venus vdec
>> driver for Qualcomm platforms. Specifically, it ensures that the buffer
>> state is only set to VB2_BUF_STATE_ERROR for non-EOS capture buffers
>> with zero bytesused, preventing false error reporting during drain
>> operations.
>> ---
>> Changes in v2:
>> - 1. Update commit message.
>> - 2. Add a Fixes tag.
>> - Link to v1: https://lore.kernel.org/r/20251126-fix-error-state-v1-1-34f943a8b165@oss.qualcomm.com
>> ---
>>   drivers/media/platform/qcom/venus/vdec.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
>> index 4a6641fdffcf79705893be58c7ec5cf485e2fab9..d0bd2d86a31f9a18cb68b08ba66affdf8fc5092d 100644
>> --- a/drivers/media/platform/qcom/venus/vdec.c
>> +++ b/drivers/media/platform/qcom/venus/vdec.c
>> @@ -1440,10 +1440,10 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type,
>>   				inst->drain_active = false;
>>   				inst->codec_state = VENUS_DEC_STATE_STOPPED;
>>   			}
>> +		} else {
>> +			if (!bytesused)
>> +				state = VB2_BUF_STATE_ERROR;
>>   		}
>> -
>> -		if (!bytesused)
>> -			state = VB2_BUF_STATE_ERROR;
>>   	} else {
>>   		vbuf->sequence = inst->sequence_out++;
>>   	}
>>
>> ---
>> base-commit: 663d0d1af3faefe673cabf4b6b077149a87ad71f
>> change-id: 20251126-fix-error-state-24183a8538cd
>>
>> Best regards,
>> -- 
>> Renjiang Han <renjiang.han@oss.qualcomm.com>
>>
-- 
Best regards,
Renjiang Han