Rev 2327 | Rev 2332 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2327 | Rev 2330 | ||
---|---|---|---|
Line 32... | Line 32... | ||
32 | 32 | ||
33 | #include "i915_reg.h" |
33 | #include "i915_reg.h" |
34 | #include "intel_bios.h" |
34 | #include "intel_bios.h" |
35 | #include "intel_ringbuffer.h" |
35 | #include "intel_ringbuffer.h" |
36 | //#include |
36 | //#include |
37 | //#include |
37 | #include |
38 | //#include |
38 | //#include |
Line 39... | Line 39... | ||
39 | //#include |
39 | //#include |
Line 117... | Line 117... | ||
117 | #define OPREGION_SIZE (8*1024) |
117 | #define OPREGION_SIZE (8*1024) |
Line 118... | Line 118... | ||
118 | 118 | ||
119 | struct intel_overlay; |
119 | struct intel_overlay; |
Line -... | Line 120... | ||
- | 120 | struct intel_overlay_error_state; |
|
- | 121 | ||
- | 122 | struct drm_i915_master_private { |
|
120 | struct intel_overlay_error_state; |
123 | drm_local_map_t *sarea; |
121 | 124 | struct _drm_i915_sarea *sarea_priv; |
|
Line 122... | Line 125... | ||
122 | 125 | }; |
|
123 | #define I915_FENCE_REG_NONE -1 |
126 | #define I915_FENCE_REG_NONE -1 |
124 | 127 | ||
Line 321... | Line 324... | ||
321 | int vblank_pipe; |
324 | int vblank_pipe; |
322 | int num_pipe; |
325 | int num_pipe; |
Line 323... | Line 326... | ||
323 | 326 | ||
324 | /* For hangcheck timer */ |
327 | /* For hangcheck timer */ |
325 | #define DRM_I915_HANGCHECK_PERIOD 1500 /* in ms */ |
328 | #define DRM_I915_HANGCHECK_PERIOD 1500 /* in ms */ |
326 | // struct timer_list hangcheck_timer; |
329 | struct timer_list hangcheck_timer; |
327 | int hangcheck_count; |
330 | int hangcheck_count; |
328 | uint32_t last_acthd; |
331 | uint32_t last_acthd; |
329 | uint32_t last_instdone; |
332 | uint32_t last_instdone; |
Line 545... | Line 548... | ||
545 | 548 | ||
546 | struct { |
549 | struct { |
547 | /** Bridge to intel-gtt-ko */ |
550 | /** Bridge to intel-gtt-ko */ |
548 | const struct intel_gtt *gtt; |
551 | const struct intel_gtt *gtt; |
549 | /** Memory allocator for GTT stolen memory */ |
552 | /** Memory allocator for GTT stolen memory */ |
550 | // struct drm_mm stolen; |
553 | struct drm_mm stolen; |
551 | /** Memory allocator for GTT */ |
554 | /** Memory allocator for GTT */ |
552 | // struct drm_mm gtt_space; |
555 | // struct drm_mm gtt_space; |
553 | /** List of all objects in gtt_space. Used to restore gtt |
556 | /** List of all objects in gtt_space. Used to restore gtt |
554 | * mappings on resume */ |
557 | * mappings on resume */ |
Line 679... | Line 682... | ||
679 | bool render_reclock_avail; |
682 | bool render_reclock_avail; |
680 | bool lvds_downclock_avail; |
683 | bool lvds_downclock_avail; |
681 | /* indicates the reduced downclock for LVDS*/ |
684 | /* indicates the reduced downclock for LVDS*/ |
682 | int lvds_downclock; |
685 | int lvds_downclock; |
683 | // struct work_struct idle_work; |
686 | // struct work_struct idle_work; |
684 | // struct timer_list idle_timer; |
687 | struct timer_list idle_timer; |
685 | bool busy; |
688 | bool busy; |
686 | u16 orig_clock; |
689 | u16 orig_clock; |
687 | int child_dev_num; |
690 | int child_dev_num; |
688 | struct child_device_config *child_dev; |
691 | struct child_device_config *child_dev; |
689 | struct drm_connector *int_lvds_connector; |
692 | struct drm_connector *int_lvds_connector; |
Line 702... | Line 705... | ||
702 | u8 fstart; |
705 | u8 fstart; |
Line 703... | Line 706... | ||
703 | 706 | ||
704 | u64 last_count1; |
707 | u64 last_count1; |
705 | unsigned long last_time1; |
708 | unsigned long last_time1; |
706 | u64 last_count2; |
709 | u64 last_count2; |
707 | // struct timespec last_time2; |
710 | struct timespec last_time2; |
708 | unsigned long gfx_power; |
711 | unsigned long gfx_power; |
709 | int c_m; |
712 | int c_m; |
710 | int r_t; |
713 | int r_t; |
711 | u8 corr; |
714 | u8 corr; |