[v1] media: nuvoton: npcm-video: Prevent returning unsupported resolutions

[RESEND] media: nuvoton: npcm-video: Prevent returning unsupported resolutions

Posted by Michael Chang 3 weeks, 6 days ago

To restrict the returned resolution due to Nuvoton SoC hardware
limitations.

Signed-off-by: Michael Chang <zhang971090220@gmail.com>
---
 drivers/media/platform/nuvoton/npcm-video.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/nuvoton/npcm-video.c b/drivers/media/platform/nuvoton/npcm-video.c
index 234fdec04f74..8d6d51a674a3 100644
--- a/drivers/media/platform/nuvoton/npcm-video.c
+++ b/drivers/media/platform/nuvoton/npcm-video.c
@@ -578,7 +578,7 @@ static unsigned int npcm_video_hres(struct npcm_video *video)
 	regmap_read(gfxi, HVCNTL, &hvcntl);
 	apb_hor_res = (((hvcnth & HVCNTH_MASK) << 8) + (hvcntl & HVCNTL_MASK) + 1);
 
-	return apb_hor_res;
+	return (apb_hor_res > MAX_WIDTH) ? MAX_WIDTH : apb_hor_res;
 }
 
 static unsigned int npcm_video_vres(struct npcm_video *video)
@@ -591,7 +591,7 @@ static unsigned int npcm_video_vres(struct npcm_video *video)
 
 	apb_ver_res = (((vvcnth & VVCNTH_MASK) << 8) + (vvcntl & VVCNTL_MASK));
 
-	return apb_ver_res;
+	return (apb_ver_res > MAX_HEIGHT) ? MAX_HEIGHT : apb_ver_res;
 }
 
 static int npcm_video_capres(struct npcm_video *video, unsigned int hor_res,
-- 
2.34.1

Re: [RESEND] media: nuvoton: npcm-video: Prevent returning unsupported resolutions

Posted by Hans Verkuil 1 week, 3 days ago

On 08/04/2025 07:54, Michael Chang wrote:
> To restrict the returned resolution due to Nuvoton SoC hardware
> limitations.
> 
> Signed-off-by: Michael Chang <zhang971090220@gmail.com>

Just for future reference: please don't resend. If it is in
https://patchwork.linuxtv.org/ then it will be picked up eventually.

Regards,

	Hans

> ---
>  drivers/media/platform/nuvoton/npcm-video.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/nuvoton/npcm-video.c b/drivers/media/platform/nuvoton/npcm-video.c
> index 234fdec04f74..8d6d51a674a3 100644
> --- a/drivers/media/platform/nuvoton/npcm-video.c
> +++ b/drivers/media/platform/nuvoton/npcm-video.c
> @@ -578,7 +578,7 @@ static unsigned int npcm_video_hres(struct npcm_video *video)
>  	regmap_read(gfxi, HVCNTL, &hvcntl);
>  	apb_hor_res = (((hvcnth & HVCNTH_MASK) << 8) + (hvcntl & HVCNTL_MASK) + 1);
>  
> -	return apb_hor_res;
> +	return (apb_hor_res > MAX_WIDTH) ? MAX_WIDTH : apb_hor_res;
>  }
>  
>  static unsigned int npcm_video_vres(struct npcm_video *video)
> @@ -591,7 +591,7 @@ static unsigned int npcm_video_vres(struct npcm_video *video)
>  
>  	apb_ver_res = (((vvcnth & VVCNTH_MASK) << 8) + (vvcntl & VVCNTL_MASK));
>  
> -	return apb_ver_res;
> +	return (apb_ver_res > MAX_HEIGHT) ? MAX_HEIGHT : apb_ver_res;
>  }
>  
>  static int npcm_video_capres(struct npcm_video *video, unsigned int hor_res,