The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
203 lines
4.6 KiB
C
203 lines
4.6 KiB
C
/*
|
|
* linux/drivers/video/omap2/dss/overlay.c
|
|
*
|
|
* Copyright (C) 2009 Nokia Corporation
|
|
* Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
|
|
*
|
|
* Some code and ideas taken from drivers/video/omap/ driver
|
|
* by Imre Deak.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published by
|
|
* the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#define DSS_SUBSYS_NAME "OVERLAY"
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/err.h>
|
|
#include <linux/sysfs.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <video/omapfb_dss.h>
|
|
|
|
#include "dss.h"
|
|
#include "dss_features.h"
|
|
|
|
static int num_overlays;
|
|
static struct omap_overlay *overlays;
|
|
|
|
int omap_dss_get_num_overlays(void)
|
|
{
|
|
return num_overlays;
|
|
}
|
|
EXPORT_SYMBOL(omap_dss_get_num_overlays);
|
|
|
|
struct omap_overlay *omap_dss_get_overlay(int num)
|
|
{
|
|
if (num >= num_overlays)
|
|
return NULL;
|
|
|
|
return &overlays[num];
|
|
}
|
|
EXPORT_SYMBOL(omap_dss_get_overlay);
|
|
|
|
void dss_init_overlays(struct platform_device *pdev)
|
|
{
|
|
int i, r;
|
|
|
|
num_overlays = dss_feat_get_num_ovls();
|
|
|
|
overlays = kcalloc(num_overlays, sizeof(struct omap_overlay),
|
|
GFP_KERNEL);
|
|
|
|
BUG_ON(overlays == NULL);
|
|
|
|
for (i = 0; i < num_overlays; ++i) {
|
|
struct omap_overlay *ovl = &overlays[i];
|
|
|
|
switch (i) {
|
|
case 0:
|
|
ovl->name = "gfx";
|
|
ovl->id = OMAP_DSS_GFX;
|
|
break;
|
|
case 1:
|
|
ovl->name = "vid1";
|
|
ovl->id = OMAP_DSS_VIDEO1;
|
|
break;
|
|
case 2:
|
|
ovl->name = "vid2";
|
|
ovl->id = OMAP_DSS_VIDEO2;
|
|
break;
|
|
case 3:
|
|
ovl->name = "vid3";
|
|
ovl->id = OMAP_DSS_VIDEO3;
|
|
break;
|
|
}
|
|
|
|
ovl->caps = dss_feat_get_overlay_caps(ovl->id);
|
|
ovl->supported_modes =
|
|
dss_feat_get_supported_color_modes(ovl->id);
|
|
|
|
r = dss_overlay_kobj_init(ovl, pdev);
|
|
if (r)
|
|
DSSERR("failed to create sysfs file\n");
|
|
}
|
|
}
|
|
|
|
void dss_uninit_overlays(struct platform_device *pdev)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < num_overlays; ++i) {
|
|
struct omap_overlay *ovl = &overlays[i];
|
|
dss_overlay_kobj_uninit(ovl);
|
|
}
|
|
|
|
kfree(overlays);
|
|
overlays = NULL;
|
|
num_overlays = 0;
|
|
}
|
|
|
|
int dss_ovl_simple_check(struct omap_overlay *ovl,
|
|
const struct omap_overlay_info *info)
|
|
{
|
|
if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
|
|
if (info->out_width != 0 && info->width != info->out_width) {
|
|
DSSERR("check_overlay: overlay %d doesn't support "
|
|
"scaling\n", ovl->id);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (info->out_height != 0 && info->height != info->out_height) {
|
|
DSSERR("check_overlay: overlay %d doesn't support "
|
|
"scaling\n", ovl->id);
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
if ((ovl->supported_modes & info->color_mode) == 0) {
|
|
DSSERR("check_overlay: overlay %d doesn't support mode %d\n",
|
|
ovl->id, info->color_mode);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (info->zorder >= omap_dss_get_num_overlays()) {
|
|
DSSERR("check_overlay: zorder %d too high\n", info->zorder);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (dss_feat_rotation_type_supported(info->rotation_type) == 0) {
|
|
DSSERR("check_overlay: rotation type %d not supported\n",
|
|
info->rotation_type);
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int dss_ovl_check(struct omap_overlay *ovl, struct omap_overlay_info *info,
|
|
const struct omap_video_timings *mgr_timings)
|
|
{
|
|
u16 outw, outh;
|
|
u16 dw, dh;
|
|
|
|
dw = mgr_timings->x_res;
|
|
dh = mgr_timings->y_res;
|
|
|
|
if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
|
|
outw = info->width;
|
|
outh = info->height;
|
|
} else {
|
|
if (info->out_width == 0)
|
|
outw = info->width;
|
|
else
|
|
outw = info->out_width;
|
|
|
|
if (info->out_height == 0)
|
|
outh = info->height;
|
|
else
|
|
outh = info->out_height;
|
|
}
|
|
|
|
if (dw < info->pos_x + outw) {
|
|
DSSERR("overlay %d horizontally not inside the display area "
|
|
"(%d + %d >= %d)\n",
|
|
ovl->id, info->pos_x, outw, dw);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (dh < info->pos_y + outh) {
|
|
DSSERR("overlay %d vertically not inside the display area "
|
|
"(%d + %d >= %d)\n",
|
|
ovl->id, info->pos_y, outh, dh);
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Checks if replication logic should be used. Only use when overlay is in
|
|
* RGB12U or RGB16 mode, and video port width interface is 18bpp or 24bpp
|
|
*/
|
|
bool dss_ovl_use_replication(struct dss_lcd_mgr_config config,
|
|
enum omap_color_mode mode)
|
|
{
|
|
if (mode != OMAP_DSS_COLOR_RGB12U && mode != OMAP_DSS_COLOR_RGB16)
|
|
return false;
|
|
|
|
return config.video_port_width > 16;
|
|
}
|