Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57be046e authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nouveau/core: get rid of math.h, replace log2i with order_base_2 



Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent ef25bd84

drivers/gpu/drm/nouveau/core/core/ramht.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 




#include <core/object.h>

#include <core/object.h>

#include <core/ramht.h>

#include <core/ramht.h>

#include <core/math.h>





#include <subdev/bar.h>

#include <subdev/bar.h>
@@ -104,6 +103,6 @@ nouveau_ramht_new(struct nouveau_object *parent, struct nouveau_object *pargpu, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	ramht->bits = log2i(nv_gpuobj(ramht)->size >> 3);

	ramht->bits = order_base_2(nv_gpuobj(ramht)->size >> 3);

	return 0;

	return 0;

}
 
}

drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <core/engctx.h>

#include <core/engctx.h>

#include <core/ramht.h>

#include <core/ramht.h>

#include <core/class.h>

#include <core/class.h>

#include <core/math.h>





#include <subdev/timer.h>

#include <subdev/timer.h>

#include <subdev/bar.h>

#include <subdev/bar.h>
@@ -278,7 +277,7 @@ nv50_fifo_chan_ctor_ind(struct nouveau_object *parent, 
		return ret;

		return ret;





	ioffset = args->ioffset;

	ioffset = args->ioffset;

	ilength = log2i(args->ilength / 8);

	ilength = order_base_2(args->ilength / 8);





	nv_wo32(base->ramfc, 0x3c, 0x403f6078);

	nv_wo32(base->ramfc, 0x3c, 0x403f6078);

	nv_wo32(base->ramfc, 0x44, 0x01003fff);

	nv_wo32(base->ramfc, 0x44, 0x01003fff);

drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <core/ramht.h>

#include <core/ramht.h>

#include <core/event.h>

#include <core/event.h>

#include <core/class.h>

#include <core/class.h>

#include <core/math.h>





#include <subdev/timer.h>

#include <subdev/timer.h>

#include <subdev/bar.h>

#include <subdev/bar.h>
@@ -258,7 +257,7 @@ nv84_fifo_chan_ctor_ind(struct nouveau_object *parent, 
	nv_parent(chan)->object_detach = nv50_fifo_object_detach;

	nv_parent(chan)->object_detach = nv50_fifo_object_detach;





	ioffset = args->ioffset;

	ioffset = args->ioffset;

	ilength = log2i(args->ilength / 8);

	ilength = order_base_2(args->ilength / 8);





	nv_wo32(base->ramfc, 0x3c, 0x403f6078);

	nv_wo32(base->ramfc, 0x3c, 0x403f6078);

	nv_wo32(base->ramfc, 0x44, 0x01003fff);

	nv_wo32(base->ramfc, 0x44, 0x01003fff);

drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <core/engctx.h>

#include <core/engctx.h>

#include <core/event.h>

#include <core/event.h>

#include <core/class.h>

#include <core/class.h>

#include <core/math.h>

#include <core/enum.h>

#include <core/enum.h>





#include <subdev/timer.h>

#include <subdev/timer.h>
@@ -200,7 +199,7 @@ nvc0_fifo_chan_ctor(struct nouveau_object *parent, 




	usermem = chan->base.chid * 0x1000;

	usermem = chan->base.chid * 0x1000;

	ioffset = args->ioffset;

	ioffset = args->ioffset;

	ilength = log2i(args->ilength / 8);

	ilength = order_base_2(args->ilength / 8);





	for (i = 0; i < 0x1000; i += 4)

	for (i = 0; i < 0x1000; i += 4)

		nv_wo32(priv->user.mem, usermem + i, 0x00000000);

		nv_wo32(priv->user.mem, usermem + i, 0x00000000);

drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <core/engctx.h>

#include <core/engctx.h>

#include <core/event.h>

#include <core/event.h>

#include <core/class.h>

#include <core/class.h>

#include <core/math.h>

#include <core/enum.h>

#include <core/enum.h>





#include <subdev/timer.h>

#include <subdev/timer.h>
@@ -240,7 +239,7 @@ nve0_fifo_chan_ctor(struct nouveau_object *parent, 




	usermem = chan->base.chid * 0x200;

	usermem = chan->base.chid * 0x200;

	ioffset = args->ioffset;

	ioffset = args->ioffset;

	ilength = log2i(args->ilength / 8);

	ilength = order_base_2(args->ilength / 8);





	for (i = 0; i < 0x200; i += 4)

	for (i = 0; i < 0x200; i += 4)

		nv_wo32(priv->user.mem, usermem + i, 0x00000000);

		nv_wo32(priv->user.mem, usermem + i, 0x00000000);