diff for duplicates of <20111216171216.f307b3fe.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index dd0ebc8..de5ce0a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -79,8 +79,10 @@ function with proper identifiers, code comments, etc. > +static void i740_calc_vclk(u32 freq_hz, struct i740fb_par *par) > +{ > + u32 freq = freq_hz / (u32)(1e6 / I740_RFREQ); -> + const u32 err_max > + freq / (u32)(I740_RFREQ / 0.005 / (1 << I740_FFIX) + 0.5); -> + const u32 err_target > + freq / (u32)(I740_RFREQ / 0.001 / (1 << I740_FFIX) + 0.5); +> + const u32 err_max = +> + freq / (u32)(I740_RFREQ / 0.005 / (1 << I740_FFIX) + 0.5); +> + const u32 err_target = +> + freq / (u32)(I740_RFREQ / 0.001 / (1 << I740_FFIX) + 0.5); > + u32 err_best = (u32)(512.0 * (1 << I740_FFIX)); > + u32 f_err, f_vco; > + int m_best = 0, n_best = 0, p_best = 0, d_best = 0; @@ -131,7 +133,8 @@ Use the existing ilog2()? > + par->video_clk2_n = (n_best-2) & 0xFF; > + par->video_clk2_mn_msbs = ((((n_best-2) >> 4) & VCO_N_MSBS) > + | (((m_best-2) >> 8) & VCO_M_MSBS)); -> + par->video_clk2_div_sel > + ((p_best << 4) | (d_best ? 4 : 0) | REF_DIV_1); +> + par->video_clk2_div_sel = +> + ((p_best << 4) | (d_best ? 4 : 0) | REF_DIV_1); > +} > + > diff --git a/a/content_digest b/N1/content_digest index 1d49cc8..5f5e023 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201112080024.24383.linux@rainbow-software.org\0" "From\0Andrew Morton <akpm@linux-foundation.org>\0" "Subject\0Re: [PATCH v4] Resurrect Intel740 driver: i740fb\0" - "Date\0Sat, 17 Dec 2011 01:12:16 +0000\0" + "Date\0Fri, 16 Dec 2011 17:12:16 -0800\0" "To\0Ondrej Zary <linux@rainbow-software.org>\0" "Cc\0linux-fbdev@vger.kernel.org" Florian Tobias Schandinat <FlorianSchandinat@gmx.de> @@ -90,8 +90,10 @@ "> +static void i740_calc_vclk(u32 freq_hz, struct i740fb_par *par)\n" "> +{\n" "> +\tu32 freq = freq_hz / (u32)(1e6 / I740_RFREQ);\n" - "> +\tconst u32 err_max > +\t\tfreq / (u32)(I740_RFREQ / 0.005 / (1 << I740_FFIX) + 0.5);\n" - "> +\tconst u32 err_target > +\t\tfreq / (u32)(I740_RFREQ / 0.001 / (1 << I740_FFIX) + 0.5);\n" + "> +\tconst u32 err_max =\n" + "> +\t\tfreq / (u32)(I740_RFREQ / 0.005 / (1 << I740_FFIX) + 0.5);\n" + "> +\tconst u32 err_target =\n" + "> +\t\tfreq / (u32)(I740_RFREQ / 0.001 / (1 << I740_FFIX) + 0.5);\n" "> +\tu32 err_best = (u32)(512.0 * (1 << I740_FFIX));\n" "> +\tu32 f_err, f_vco;\n" "> +\tint m_best = 0, n_best = 0, p_best = 0, d_best = 0;\n" @@ -142,7 +144,8 @@ "> +\tpar->video_clk2_n = (n_best-2) & 0xFF;\n" "> +\tpar->video_clk2_mn_msbs = ((((n_best-2) >> 4) & VCO_N_MSBS)\n" "> +\t\t\t\t | (((m_best-2) >> 8) & VCO_M_MSBS));\n" - "> +\tpar->video_clk2_div_sel > +\t\t((p_best << 4) | (d_best ? 4 : 0) | REF_DIV_1);\n" + "> +\tpar->video_clk2_div_sel =\n" + "> +\t\t((p_best << 4) | (d_best ? 4 : 0) | REF_DIV_1);\n" "> +}\n" "> +\n" ">\n" @@ -194,4 +197,4 @@ "Should we also be adding a documentation file for thei driver? Tell\n" people what the various module options do? -d77fca3127e0f1c66c13f9fb5f649016bdc6005b0d9df8e3cff336d87220e781 +eb1000d1dfea0212463ec8e6c278c55579c1eae978cbe794b4d664f43b4685ca
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.