Wed Jul 24 03:21:23 2013 UTC ()
Use time_t, not unsigned long, for i915 last_gpu_reset.


(riastradh)
diff -r1.1.1.1.2.10 -r1.1.1.1.2.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h

cvs diff -r1.1.1.1.2.10 -r1.1.1.1.2.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 2013/07/24 03:15:44 1.1.1.1.2.10
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 2013/07/24 03:21:23 1.1.1.1.2.11
@@ -900,27 +900,31 @@ typedef struct drm_i915_private { @@ -900,27 +900,31 @@ typedef struct drm_i915_private {
900 900
901 /* gen6+ rps state */ 901 /* gen6+ rps state */
902 struct intel_gen6_power_mgmt rps; 902 struct intel_gen6_power_mgmt rps;
903 903
904 /* ilk-only ips/rps state. Everything in here is protected by the global 904 /* ilk-only ips/rps state. Everything in here is protected by the global
905 * mchdev_lock in intel_pm.c */ 905 * mchdev_lock in intel_pm.c */
906 struct intel_ilk_power_mgmt ips; 906 struct intel_ilk_power_mgmt ips;
907 907
908 enum no_fbc_reason no_fbc_reason; 908 enum no_fbc_reason no_fbc_reason;
909 909
910 struct drm_mm_node *compressed_fb; 910 struct drm_mm_node *compressed_fb;
911 struct drm_mm_node *compressed_llb; 911 struct drm_mm_node *compressed_llb;
912 912
 913#ifdef __NetBSD__
 914 time_t last_gpu_reset;
 915#else
913 unsigned long last_gpu_reset; 916 unsigned long last_gpu_reset;
 917#endif
914 918
915 /* list of fbdev register on this device */ 919 /* list of fbdev register on this device */
916 struct intel_fbdev *fbdev; 920 struct intel_fbdev *fbdev;
917 921
918 /* 922 /*
919 * The console may be contended at resume, but we don't 923 * The console may be contended at resume, but we don't
920 * want it to block on it. 924 * want it to block on it.
921 */ 925 */
922 struct work_struct console_resume_work; 926 struct work_struct console_resume_work;
923 927
924 struct backlight_device *backlight; 928 struct backlight_device *backlight;
925 929
926 struct drm_property *broadcast_rgb_property; 930 struct drm_property *broadcast_rgb_property;