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

Commit 7eaf1198 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/tmr: remove nvkm_timer_alarm_cancel() 



nvkm_timer_alarm() already handles this as part of protecting against
callers passing in no timeout value.

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

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

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ struct nvkm_timer { 


u64 nvkm_timer_read(struct nvkm_timer *);

void nvkm_timer_alarm(struct nvkm_timer *, u32 nsec, struct nvkm_alarm *);

void nvkm_timer_alarm_cancel(struct nvkm_timer *, struct nvkm_alarm *);



/* Delay based on GPU time (ie. PTIMER).

 *

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static void 
gk20a_pmu_fini(struct nvkm_pmu *pmu)

{

	struct gk20a_pmu *gpmu = gk20a_pmu(pmu);

	nvkm_timer_alarm_cancel(pmu->subdev.device->timer, &gpmu->alarm);

	nvkm_timer_alarm(pmu->subdev.device->timer, 0, &gpmu->alarm);



	nvkm_falcon_put(pmu->falcon, &pmu->subdev);

}

drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode) 


	switch (mode) {

	case NVKM_THERM_CTRL_MANUAL:

		nvkm_timer_alarm_cancel(tmr, &therm->alarm);

		nvkm_timer_alarm(tmr, 0, &therm->alarm);

		duty = nvkm_therm_fan_get(therm);

		if (duty < 0)

			duty = 100;
@@ -142,7 +142,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode) 
		break;

	case NVKM_THERM_CTRL_NONE:

	default:

		nvkm_timer_alarm_cancel(tmr, &therm->alarm);

		nvkm_timer_alarm(tmr, 0, &therm->alarm);

		poll = false;

	}

drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ nvkm_therm_fan_fini(struct nvkm_therm *therm, bool suspend) 
{

	struct nvkm_timer *tmr = therm->subdev.device->timer;

	if (suspend)

		nvkm_timer_alarm_cancel(tmr, &therm->fan->alarm);

		nvkm_timer_alarm(tmr, 0, &therm->fan->alarm);

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ nvkm_therm_sensor_fini(struct nvkm_therm *therm, bool suspend) 
{

	struct nvkm_timer *tmr = therm->subdev.device->timer;

	if (suspend)

		nvkm_timer_alarm_cancel(tmr, &therm->sensor.therm_poll_alarm);

		nvkm_timer_alarm(tmr, 0, &therm->sensor.therm_poll_alarm);

	return 0;

}