Re: linux-next: build failure after merge of the drm tree

[Stephen Rothwell]

Hi Dave,

On Thu, 7 Jan 2016 13:44:03 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Thu, 31 Dec 2015 21:31:24 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > After merging the drm tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/tonga_thermal.c: In function 'tonga_fan_ctrl_get_fan_speed_percent':
> > drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/tonga_thermal.c:84:2: error: implicit declaration of function 'do_div' [-Werror=implicit-function-declaration]
> >   do_div(tmp64, duty100);
> >   ^
> > drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/fiji_thermal.c: In function 'fiji_fan_ctrl_get_fan_speed_percent':
> > drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/fiji_thermal.c:78:2: error: implicit declaration of function 'do_div' [-Werror=implicit-function-declaration]
> >   do_div(tmp64, duty100);
> >   ^
> > 
> > Caused by commit
> > 
> >   1e4854e96c35 ("drm/amdgpu/powerplay: implement thermal control for tonga.")
> > 
> > [I notice that that commit does not have a Signed-off-by from its
> > committer (Alex)]
> > 
> > I applied the following fix patch for today:
> > 
> > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > Date: Thu, 31 Dec 2015 21:20:20 +1100
> > Subject: [PATCH] drm/amdgpu/powerplay: include asm/div64.h for do_div()
> > 
> > Fixes: 1e4854e96c35 ("drm/amdgpu/powerplay: implement thermal control for tonga.")
> > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > ---
> >  drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c  | 2 +-
> >  drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
> > index def57d0675ed..e76a7de9aa32 100644
> > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
> > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
> > @@ -20,7 +20,7 @@
> >   * OTHER DEALINGS IN THE SOFTWARE.
> >   *
> >   */
> > -
> > +#include <asm/div64.h>
> >  #include "fiji_thermal.h"
> >  #include "fiji_hwmgr.h"
> >  #include "fiji_smumgr.h"
> > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
> > index 2e159b003e71..a188174747c9 100644
> > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
> > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
> > @@ -20,7 +20,7 @@
> >   * OTHER DEALINGS IN THE SOFTWARE.
> >   *
> >   */
> > -
> > +#include <asm/div64.h>
> >  #include "tonga_thermal.h"
> >  #include "tonga_hwmgr.h"
> >  #include "tonga_smumgr.h"
> > -- 
> > 2.6.4  
> 
> Ping?  I am still applying that patch ...

Did this get fixed in some non-obvious way?
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx