Hi, This patch applies cleanly for me on top of the first patch in this series [1] on top of your drm-next-4.8 tree.
The series was held up to figure out what to do about the unused functions as patch 1 introduced warnings. I can still respin if you'd like as now that i know the functions should be removed, doing that first makes a bit more sense I guess. Nils [1]: https://lists.freedesktop.org/archives/dri-devel/2016-April/105648.html On Sat, Jul 16, 2016 at 5:51 AM, Nils Wallménius <nils.wallmenius at gmail.com> wrote: > Ok, cool. I will probably be able to do that on monday. > > Nils > > Den 15 juli 2016 11:06 em skrev "Alex Deucher" <alexdeucher at gmail.com>: > >> On Fri, Jul 15, 2016 at 4:09 PM, Nils Wallménius >> <nils.wallmenius at gmail.com> wrote: >> > Ping? >> >> We don't seem to be using them. Can you respin? It doesn't seem to >> apply any longer. >> >> Alex >> >> >> > >> > >> > Den 6 juni 2016 21:32 skrev "Nils Wallménius" < >> nils.wallmenius at gmail.com>: >> >> >> >> Hi Alex, >> >> >> >> Any response from the powerplay team? >> >> >> >> If they are unresponsive, would you prefer to #IF 0 the code instead of >> >> deleting? >> >> >> >> Regards >> >> Nils >> >> >> >> On Mon, Apr 25, 2016 at 10:08 PM, Alex Deucher <alexdeucher at gmail.com> >> >> wrote: >> >>> >> >>> On Sun, Apr 24, 2016 at 7:22 AM, Nils Wallménius >> >>> <nils.wallmenius at gmail.com> wrote: >> >>> > Signed-off-by: Nils Wallménius <nils.wallmenius at gmail.com> >> >>> >> >>> Let me check with the powerplay team and make sure they are planning >> >>> to use these in the near future. >> >>> >> >>> Alex >> >>> >> >>> >> >>> > --- >> >>> > drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h | 59 >> >>> > +------------------------ >> >>> > 1 file changed, 1 insertion(+), 58 deletions(-) >> >>> > >> >>> > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h >> >>> > b/drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h >> >>> > index a9b40eb..8f50a03 100644 >> >>> > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h >> >>> > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h >> >>> > @@ -64,7 +64,6 @@ static fInt fGetSquare(fInt); >> >>> > /* Returns the square >> >>> > static fInt fSqrt(fInt); /* >> Returns >> >>> > the Square Root of a fInt number */ >> >>> > >> >>> > static int uAbs(int); /* >> Returns >> >>> > the Absolute value of the Int */ >> >>> > -static fInt fAbs(fInt); /* >> Returns >> >>> > the Absolute value of the fInt */ >> >>> > static int uPow(int base, int exponent); /* >> Returns >> >>> > base^exponent an INT */ >> >>> > >> >>> > static void SolveQuadracticEqn(fInt, fInt, fInt, fInt[]); /* >> Returns >> >>> > the 2 roots via the array */ >> >>> > @@ -85,21 +84,12 @@ static fInt fDecodeLeakageID (uint32_t >> >>> > leakageID_fuse, fInt ln_max_div_min, fInt >> >>> > * >> >>> > >> ------------------------------------------------------------------------------------- >> >>> > * Some of the following functions take two INTs as their input - >> This >> >>> > is unsafe for a variety of reasons. >> >>> > */ >> >>> > -static fInt Add (int, int); /* Add >> two >> >>> > INTs and return Sum as FINT */ >> >>> > -static fInt Multiply (int, int); /* >> Multiply >> >>> > two INTs and return Product as FINT */ >> >>> > -static fInt Divide (int, int); /* You >> get >> >>> > the idea... */ >> >>> > +static fInt Divide (int, int); /* Divide >> >>> > two INTs and return result as FINT */ >> >>> > static fInt fNegate(fInt); >> >>> > >> >>> > static int uGetScaledDecimal (fInt); /* >> Internal >> >>> > function */ >> >>> > static int GetReal (fInt A); /* >> Internal >> >>> > function */ >> >>> > >> >>> > -/* Future Additions and Incomplete Functions >> >>> > - * >> >>> > >> ------------------------------------------------------------------------------------- >> >>> > - */ >> >>> > -static int GetRoundedValue(fInt); /* >> >>> > Incomplete function - Useful only when Precision is lacking */ >> >>> > - /* Let us >> >>> > say we have 2.126 but can only handle 2 decimal points. We could */ >> >>> > - /* either >> >>> > chop of 6 and keep 2.12 or use this function to get 2.13, which is >> more >> >>> > accurate */ >> >>> > - >> >>> > /* >> >>> > >> ------------------------------------------------------------------------------------- >> >>> > * TROUBLESHOOTING INFORMATION >> >>> > * >> >>> > >> ------------------------------------------------------------------------------------- >> >>> > @@ -498,51 +488,12 @@ static void SolveQuadracticEqn(fInt A, fInt B, >> >>> > fInt C, fInt Roots[]) >> >>> > * >> >>> > >> ----------------------------------------------------------------------------- >> >>> > */ >> >>> > >> >>> > -/* Addition using two normal ints - Temporary - Use only for >> testing >> >>> > purposes?. */ >> >>> > -static fInt Add (int X, int Y) >> >>> > -{ >> >>> > - fInt A, B, Sum; >> >>> > - >> >>> > - A.full = (X << SHIFT_AMOUNT); >> >>> > - B.full = (Y << SHIFT_AMOUNT); >> >>> > - >> >>> > - Sum.full = A.full + B.full; >> >>> > - >> >>> > - return Sum; >> >>> > -} >> >>> > - >> >>> > /* Conversion Functions */ >> >>> > static int GetReal (fInt A) >> >>> > { >> >>> > return (A.full >> SHIFT_AMOUNT); >> >>> > } >> >>> > >> >>> > -/* Temporarily Disabled */ >> >>> > -static int GetRoundedValue(fInt A) /*For now, round the 3rd decimal >> >>> > place */ >> >>> > -{ >> >>> > - /* ROUNDING TEMPORARLY DISABLED >> >>> > - int temp = A.full; >> >>> > - int decimal_cutoff, decimal_mask = 0x000001FF; >> >>> > - decimal_cutoff = temp & decimal_mask; >> >>> > - if (decimal_cutoff > 0x147) { >> >>> > - temp += 673; >> >>> > - }*/ >> >>> > - >> >>> > - return ConvertBackToInteger(A)/10000; /*Temporary - in case >> >>> > this was used somewhere else */ >> >>> > -} >> >>> > - >> >>> > -static fInt Multiply (int X, int Y) >> >>> > -{ >> >>> > - fInt A, B, Product; >> >>> > - >> >>> > - A.full = X << SHIFT_AMOUNT; >> >>> > - B.full = Y << SHIFT_AMOUNT; >> >>> > - >> >>> > - Product = fMultiply(A, B); >> >>> > - >> >>> > - return Product; >> >>> > -} >> >>> > - >> >>> > static fInt Divide (int X, int Y) >> >>> > { >> >>> > fInt A, B, Quotient; >> >>> > @@ -578,14 +529,6 @@ static int uPow(int base, int power) >> >>> > return (base)*uPow(base, power - 1); >> >>> > } >> >>> > >> >>> > -static fInt fAbs(fInt A) >> >>> > -{ >> >>> > - if (A.partial.real < 0) >> >>> > - return (fMultiply(A, ConvertToFraction(-1))); >> >>> > - else >> >>> > - return A; >> >>> > -} >> >>> > - >> >>> > static int uAbs(int X) >> >>> > { >> >>> > if (X < 0) >> >>> > -- >> >>> > 2.8.0.rc3 >> >>> > >> >>> > _______________________________________________ >> >>> > dri-devel mailing list >> >>> > dri-devel at lists.freedesktop.org >> >>> > https://lists.freedesktop.org/mailman/listinfo/dri-devel >> >> >> >> >> > >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20160719/b9c36d45/attachment.html>
