Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 310309
b: refs/heads/master
c: 8b53d99
h: refs/heads/master
i:
  310307: 28e12ca
v: v3
  • Loading branch information
Chandrabhanu Mahapatra authored and Tomi Valkeinen committed May 3, 2012
1 parent 6b34f95 commit 072e9ca
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7faa92339bbb1e6b9a80983b206642517327eb75
refs/heads/master: 8b53d9911982794b3f6d5513741495c3f70962cd
67 changes: 40 additions & 27 deletions trunk/drivers/video/omap2/dss/dispc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1714,11 +1714,11 @@ static int check_horiz_timing_omap3(enum omap_channel channel, u16 pos_x,
return 0;
}

static unsigned long calc_fclk_five_taps(enum omap_channel channel, u16 width,
u16 height, u16 out_width, u16 out_height,
static unsigned long calc_core_clk_five_taps(enum omap_channel channel,
u16 width, u16 height, u16 out_width, u16 out_height,
enum omap_color_mode color_mode)
{
u32 fclk = 0;
u32 core_clk = 0;
u64 tmp, pclk = dispc_mgr_pclk_rate(channel);

if (height <= out_height && width <= out_width)
Expand All @@ -1730,31 +1730,31 @@ static unsigned long calc_fclk_five_taps(enum omap_channel channel, u16 width,

tmp = pclk * height * out_width;
do_div(tmp, 2 * out_height * ppl);
fclk = tmp;
core_clk = tmp;

if (height > 2 * out_height) {
if (ppl == out_width)
return 0;

tmp = pclk * (height - 2 * out_height) * out_width;
do_div(tmp, 2 * out_height * (ppl - out_width));
fclk = max(fclk, (u32) tmp);
core_clk = max_t(u32, core_clk, tmp);
}
}

if (width > out_width) {
tmp = pclk * width;
do_div(tmp, out_width);
fclk = max(fclk, (u32) tmp);
core_clk = max_t(u32, core_clk, tmp);

if (color_mode == OMAP_DSS_COLOR_RGB24U)
fclk <<= 1;
core_clk <<= 1;
}

return fclk;
return core_clk;
}

static unsigned long calc_fclk(enum omap_channel channel, u16 width,
static unsigned long calc_core_clk(enum omap_channel channel, u16 width,
u16 height, u16 out_width, u16 out_height)
{
unsigned int hf, vf;
Expand Down Expand Up @@ -1805,7 +1805,7 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
const int maxsinglelinewidth =
dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH);
const int max_decim_limit = 16;
unsigned long fclk = 0;
unsigned long core_clk = 0;
int decim_x, decim_y, error, min_factor;
u16 in_width, in_height, in_width_max = 0;

Expand Down Expand Up @@ -1845,10 +1845,10 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
do {
in_height = DIV_ROUND_UP(height, decim_y);
in_width = DIV_ROUND_UP(width, decim_x);
fclk = calc_fclk(channel, in_width, in_height,
core_clk = calc_core_clk(channel, in_width, in_height,
out_width, out_height);
error = (in_width > maxsinglelinewidth || !fclk ||
fclk > dispc_fclk_rate());
error = (in_width > maxsinglelinewidth || !core_clk ||
core_clk > dispc_core_clk_rate());
if (error) {
if (decim_x == decim_y) {
decim_x = min_factor;
Expand All @@ -1871,8 +1871,8 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
do {
in_height = DIV_ROUND_UP(height, decim_y);
in_width = DIV_ROUND_UP(width, decim_x);
fclk = calc_fclk_five_taps(channel, in_width, in_height,
out_width, out_height, color_mode);
core_clk = calc_core_clk_five_taps(channel, in_width,
in_height, out_width, out_height, color_mode);

error = check_horiz_timing_omap3(channel, pos_x,
in_width, in_height, out_width, out_height);
Expand All @@ -1882,11 +1882,11 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
in_height < out_height * 2)
*five_taps = false;
if (!*five_taps)
fclk = calc_fclk(channel, in_width, in_height,
out_width, out_height);
core_clk = calc_core_clk(channel, in_width,
in_height, out_width, out_height);
error = (error || in_width > maxsinglelinewidth * 2 ||
(in_width > maxsinglelinewidth && *five_taps) ||
!fclk || fclk > dispc_fclk_rate());
!core_clk || core_clk > dispc_core_clk_rate());
if (error) {
if (decim_x == decim_y) {
decim_x = min_factor;
Expand Down Expand Up @@ -1919,7 +1919,7 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
} else {
int decim_x_min = decim_x;
in_height = DIV_ROUND_UP(height, decim_y);
in_width_max = dispc_fclk_rate() /
in_width_max = dispc_core_clk_rate() /
DIV_ROUND_UP(dispc_mgr_pclk_rate(channel),
out_width);
decim_x = DIV_ROUND_UP(width, in_width_max);
Expand All @@ -1938,18 +1938,18 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
return -EINVAL;
}

fclk = calc_fclk(channel, in_width, in_height, out_width,
out_height);
core_clk = calc_core_clk(channel, in_width, in_height,
out_width, out_height);
}

DSSDBG("required fclk rate = %lu Hz\n", fclk);
DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate());
DSSDBG("required core clk rate = %lu Hz\n", core_clk);
DSSDBG("current core clk rate = %lu Hz\n", dispc_core_clk_rate());

if (!fclk || fclk > dispc_fclk_rate()) {
if (!core_clk || core_clk > dispc_core_clk_rate()) {
DSSERR("failed to set up scaling, "
"required fclk rate = %lu Hz, "
"current fclk rate = %lu Hz\n",
fclk, dispc_fclk_rate());
"required core clk rate = %lu Hz, "
"current core clk rate = %lu Hz\n",
core_clk, dispc_core_clk_rate());
return -EINVAL;
}

Expand Down Expand Up @@ -2657,6 +2657,19 @@ unsigned long dispc_mgr_pclk_rate(enum omap_channel channel)
}
}

unsigned long dispc_core_clk_rate(void)
{
int lcd;
unsigned long fclk = dispc_fclk_rate();

if (dss_has_feature(FEAT_CORE_CLK_DIV))
lcd = REG_GET(DISPC_DIVISOR, 23, 16);
else
lcd = REG_GET(DISPC_DIVISORo(OMAP_DSS_CHANNEL_LCD), 23, 16);

return fclk / lcd;
}

void dispc_dump_clocks(struct seq_file *s)
{
int lcd, pcd;
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/video/omap2/dss/dss.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ void dispc_mgr_set_pol_freq(enum omap_channel channel,
enum omap_panel_config config, u8 acbi, u8 acb);
unsigned long dispc_mgr_lclk_rate(enum omap_channel channel);
unsigned long dispc_mgr_pclk_rate(enum omap_channel channel);
unsigned long dispc_core_clk_rate(void);
int dispc_mgr_set_clock_div(enum omap_channel channel,
struct dispc_clock_info *cinfo);
int dispc_mgr_get_clock_div(enum omap_channel channel,
Expand Down

0 comments on commit 072e9ca

Please sign in to comment.