Skip to content

Commit

Permalink
[media] omap3isp: preview: Rename max output sizes defines
Browse files Browse the repository at this point in the history
The maximum preview engine output size depends on the ISP revision, not
the OMAP revision. Rename the macros accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Laurent Pinchart authored and Mauro Carvalho Chehab committed Dec 20, 2011
1 parent 0d6ac1f commit ec0cae7
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/media/video/omap3isp/isppreview.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ static struct omap3isp_prev_csc flr_prev_csc = {
#define PREV_MIN_IN_HEIGHT 8
#define PREV_MAX_IN_HEIGHT 16384

#define PREV_MIN_OUT_WIDTH 0
#define PREV_MIN_OUT_HEIGHT 0
#define PREV_MAX_OUT_WIDTH 1280
#define PREV_MAX_OUT_WIDTH_ES2 3300
#define PREV_MAX_OUT_WIDTH_3630 4096
#define PREV_MIN_OUT_WIDTH 0
#define PREV_MIN_OUT_HEIGHT 0
#define PREV_MAX_OUT_WIDTH_REV_1 1280
#define PREV_MAX_OUT_WIDTH_REV_2 3300
#define PREV_MAX_OUT_WIDTH_REV_15 4096

/*
* Coeficient Tables for the submodules in Preview.
Expand Down Expand Up @@ -1306,14 +1306,14 @@ static unsigned int preview_max_out_width(struct isp_prev_device *prev)

switch (isp->revision) {
case ISP_REVISION_1_0:
return PREV_MAX_OUT_WIDTH;
return PREV_MAX_OUT_WIDTH_REV_1;

case ISP_REVISION_2_0:
default:
return PREV_MAX_OUT_WIDTH_ES2;
return PREV_MAX_OUT_WIDTH_REV_2;

case ISP_REVISION_15_0:
return PREV_MAX_OUT_WIDTH_3630;
return PREV_MAX_OUT_WIDTH_REV_15;
}
}

Expand Down

0 comments on commit ec0cae7

Please sign in to comment.