Skip to content

media: pisp_be: Use clamp() and define max sizes #6920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 1 commit into from
Jun 23, 2025
Merged

media: pisp_be: Use clamp() and define max sizes #6920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/lockdep.h>
#include <linux/minmax.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
Expand Down Expand Up @@ -1144,10 +1145,12 @@ static void pispbe_try_format(struct v4l2_format *f, struct pispbe_node *node)
f->fmt.pix_mp.pixelformat = fmt->fourcc;
f->fmt.pix_mp.num_planes = fmt->num_planes;
f->fmt.pix_mp.field = V4L2_FIELD_NONE;
f->fmt.pix_mp.width = max(min(f->fmt.pix_mp.width, 65536u),
PISP_BACK_END_MIN_TILE_WIDTH);
f->fmt.pix_mp.height = max(min(f->fmt.pix_mp.height, 65536u),
PISP_BACK_END_MIN_TILE_HEIGHT);
f->fmt.pix_mp.width = clamp(f->fmt.pix_mp.width,
PISP_BACK_END_MIN_TILE_WIDTH,
PISP_BACK_END_MAX_TILE_WIDTH);
f->fmt.pix_mp.height = clamp(f->fmt.pix_mp.height,
PISP_BACK_END_MIN_TILE_HEIGHT,
PISP_BACK_END_MAX_TILE_HEIGHT);

/*
* Fill in the actual colour space when the requested one was
Expand Down
9 changes: 5 additions & 4 deletions include/uapi/linux/media/raspberrypi/pisp_be_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
/* preferred byte alignment for outputs */
#define PISP_BACK_END_OUTPUT_MAX_ALIGN 64u

/* minimum allowed tile width anywhere in the pipeline */
#define PISP_BACK_END_MIN_TILE_WIDTH 16u
/* minimum allowed tile width anywhere in the pipeline */
#define PISP_BACK_END_MIN_TILE_HEIGHT 16u
/* minimum allowed tile sizes anywhere in the pipeline */
#define PISP_BACK_END_MIN_TILE_WIDTH 16u
#define PISP_BACK_END_MIN_TILE_HEIGHT 16u
#define PISP_BACK_END_MAX_TILE_WIDTH 65536u
#define PISP_BACK_END_MAX_TILE_HEIGHT 65536u

#define PISP_BACK_END_NUM_OUTPUTS 2
#define PISP_BACK_END_HOG_OUTPUT 1
Expand Down