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

Commit 57f74220 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/gk20a/timer: initial implementation 



A bit different from NVIDIA's RFC patch, but I want this now for GM107.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 13a49a10

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ nouveau-y += core/subdev/therm/nva3.o 
nouveau-y += core/subdev/therm/nvd0.o

nouveau-y += core/subdev/timer/base.o

nouveau-y += core/subdev/timer/nv04.o

nouveau-y += core/subdev/timer/gk20a.o

nouveau-y += core/subdev/vm/base.o

nouveau-y += core/subdev/vm/nv04.o

nouveau-y += core/subdev/vm/nv41.o

drivers/gpu/drm/nouveau/core/include/subdev/timer.h

+1 −0
Original line number Diff line number Diff line
@@ -59,5 +59,6 @@ int nouveau_timer_create_(struct nouveau_object *, struct nouveau_engine *, 
			  struct nouveau_oclass *, int size, void **);



extern struct nouveau_oclass nv04_timer_oclass;

extern struct nouveau_oclass gk20a_timer_oclass;



#endif

drivers/gpu/drm/nouveau/core/subdev/timer/gk20a.c

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */



#include "nv04.h"



static int

gk20a_timer_init(struct nouveau_object *object)

{

	struct nv04_timer_priv *priv = (void *)object;

	u32 hi = upper_32_bits(priv->suspend_time);

	u32 lo = lower_32_bits(priv->suspend_time);

	int ret;



	ret = nouveau_timer_init(&priv->base);

	if (ret)

		return ret;



	nv_debug(priv, "time low        : 0x%08x\n", lo);

	nv_debug(priv, "time high       : 0x%08x\n", hi);



	/* restore the time before suspend */

	nv_wr32(priv, NV04_PTIMER_TIME_1, hi);

	nv_wr32(priv, NV04_PTIMER_TIME_0, lo);

	return 0;

}



struct nouveau_oclass

gk20a_timer_oclass = {

	.handle = NV_SUBDEV(TIMER, 0xff),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv04_timer_ctor,

		.dtor = nv04_timer_dtor,

		.init = gk20a_timer_init,

		.fini = nv04_timer_fini,

	}

};

drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c

+34 −49
Original line number Diff line number Diff line
@@ -22,22 +22,7 @@ 
 * Authors: Ben Skeggs

 */



#include <subdev/timer.h>



#define NV04_PTIMER_INTR_0      0x009100

#define NV04_PTIMER_INTR_EN_0   0x009140

#define NV04_PTIMER_NUMERATOR   0x009200

#define NV04_PTIMER_DENOMINATOR 0x009210

#define NV04_PTIMER_TIME_0      0x009400

#define NV04_PTIMER_TIME_1      0x009410

#define NV04_PTIMER_ALARM_0     0x009420



struct nv04_timer_priv {

	struct nouveau_timer base;

	struct list_head alarms;

	spinlock_t lock;

	u64 suspend_time;

};

#include "nv04.h"



static u64

nv04_timer_read(struct nouveau_timer *ptimer)
@@ -142,35 +127,14 @@ nv04_timer_intr(struct nouveau_subdev *subdev) 
	}

}



static int

nv04_timer_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

		struct nouveau_oclass *oclass, void *data, u32 size,

		struct nouveau_object **pobject)

{

	struct nv04_timer_priv *priv;

	int ret;



	ret = nouveau_timer_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;



	priv->base.base.intr = nv04_timer_intr;

	priv->base.read = nv04_timer_read;

	priv->base.alarm = nv04_timer_alarm;

	priv->base.alarm_cancel = nv04_timer_alarm_cancel;

	priv->suspend_time = 0;



	INIT_LIST_HEAD(&priv->alarms);

	spin_lock_init(&priv->lock);

	return 0;

}



static void

nv04_timer_dtor(struct nouveau_object *object)

int

nv04_timer_fini(struct nouveau_object *object, bool suspend)

{

	struct nv04_timer_priv *priv = (void *)object;

	return nouveau_timer_destroy(&priv->base);

	if (suspend)

		priv->suspend_time = nv04_timer_read(&priv->base);

	nv_wr32(priv, NV04_PTIMER_INTR_EN_0, 0x00000000);

	return nouveau_timer_fini(&priv->base, suspend);

}



static int
@@ -257,14 +221,35 @@ nv04_timer_init(struct nouveau_object *object) 
	return 0;

}



static int

nv04_timer_fini(struct nouveau_object *object, bool suspend)

void

nv04_timer_dtor(struct nouveau_object *object)

{

	struct nv04_timer_priv *priv = (void *)object;

	if (suspend)

		priv->suspend_time = nv04_timer_read(&priv->base);

	nv_wr32(priv, NV04_PTIMER_INTR_EN_0, 0x00000000);

	return nouveau_timer_fini(&priv->base, suspend);

	return nouveau_timer_destroy(&priv->base);

}



int

nv04_timer_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

		struct nouveau_oclass *oclass, void *data, u32 size,

		struct nouveau_object **pobject)

{

	struct nv04_timer_priv *priv;

	int ret;



	ret = nouveau_timer_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;



	priv->base.base.intr = nv04_timer_intr;

	priv->base.read = nv04_timer_read;

	priv->base.alarm = nv04_timer_alarm;

	priv->base.alarm_cancel = nv04_timer_alarm_cancel;

	priv->suspend_time = 0;



	INIT_LIST_HEAD(&priv->alarms);

	spin_lock_init(&priv->lock);

	return 0;

}



struct nouveau_oclass

drivers/gpu/drm/nouveau/core/subdev/timer/nv04.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_TIMER_NV04_H__

#define __NVKM_TIMER_NV04_H__



#include "priv.h"



#define NV04_PTIMER_INTR_0      0x009100

#define NV04_PTIMER_INTR_EN_0   0x009140

#define NV04_PTIMER_NUMERATOR   0x009200

#define NV04_PTIMER_DENOMINATOR 0x009210

#define NV04_PTIMER_TIME_0      0x009400

#define NV04_PTIMER_TIME_1      0x009410

#define NV04_PTIMER_ALARM_0     0x009420



struct nv04_timer_priv {

	struct nouveau_timer base;

	struct list_head alarms;

	spinlock_t lock;

	u64 suspend_time;

};



int  nv04_timer_ctor(struct nouveau_object *, struct nouveau_object *,

		     struct nouveau_oclass *, void *, u32,

		     struct nouveau_object **);

void nv04_timer_dtor(struct nouveau_object *);

int  nv04_timer_fini(struct nouveau_object *, bool);



#endif