diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-19 21:10:49 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-19 21:10:49 -0400 |
| commit | d02b0ffb005469ef4ee73610fb08dff45e4487f8 (patch) | |
| tree | 3acf65e7109cbbde522ec0d9fa5cfc6064a8428c /drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h | |
| parent | 4a525bad68b424d167042342db19d0c0e80e8b29 (diff) | |
| parent | 7df1bb87b8cb0b618e4b5964f89d81d8ce52c58e (diff) | |
Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-next
- HDMI stereoscopic support
- Rework of display code to properly support SOR pad macro routing on
>=GM20x GPUs
- Various other fixes/improvements.
* 'linux-4.13' of git://github.com/skeggsb/linux: (73 commits)
drm/nouveau/disp/nv50-: avoid creating ORs that aren't present on HW
drm/nouveau: use proper prototype in nouveau_pmops_runtime() definition
drm/nouveau: Skip vga_fini on non-PCI device
drm/nouveau/tegra: Don't leave GPU in reset
drm/nouveau/tegra: Skip manual unpowergating when not necessary
drm/nouveau/hwmon: Change permissions to numeric
drm/nouveau/hwmon: expose the auto_point and pwm_min/max attrs
drm/nouveau/hwmon: Remove old code, add .write/.read operations
drm/nouveau/hwmon: Add nouveau_hwmon_ops structure with .is_visible/.read_string
drm/nouveau/hwmon: Add config for all sensors and their settings
drm/nouveau/disp/gm200-: allow non-identity mapping of SOR <-> macro links
drm/nouveau/disp/nv50-: implement a common supervisor 3.0
drm/nouveau/disp/nv50-: implement a common supervisor 2.2
drm/nouveau/disp/nv50-: implement a common supervisor 2.1
drm/nouveau/disp/nv50-: implement a common supervisor 2.0
drm/nouveau/disp/nv50-: implement a common supervisor 1.0
drm/nouveau/disp/nv50-gt21x: remove workaround for dp->tmds hotplug issues
drm/nouveau/disp/dp: use new devinit script interpreter entry-point
drm/nouveau/disp/dp: determine link bandwidth requirements from head state
drm/nouveau/disp: introduce acquire/release display path methods
...
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h index 820a4805916f..ff0709652f80 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h | |||
| @@ -26,7 +26,6 @@ struct nvkm_timer { | |||
| 26 | 26 | ||
| 27 | u64 nvkm_timer_read(struct nvkm_timer *); | 27 | u64 nvkm_timer_read(struct nvkm_timer *); |
| 28 | void nvkm_timer_alarm(struct nvkm_timer *, u32 nsec, struct nvkm_alarm *); | 28 | void nvkm_timer_alarm(struct nvkm_timer *, u32 nsec, struct nvkm_alarm *); |
| 29 | void nvkm_timer_alarm_cancel(struct nvkm_timer *, struct nvkm_alarm *); | ||
| 30 | 29 | ||
| 31 | /* Delay based on GPU time (ie. PTIMER). | 30 | /* Delay based on GPU time (ie. PTIMER). |
| 32 | * | 31 | * |