Rev 2344 | Rev 2360 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2344 | Rev 2351 | ||
|---|---|---|---|
| Line 34... | Line 34... | ||
| 34 | #include |
34 | #include |
| 35 | #include "drmP.h" |
35 | #include "drmP.h" |
| 36 | #include "intel_drv.h" |
36 | #include "intel_drv.h" |
| 37 | #include "i915_drm.h" |
37 | #include "i915_drm.h" |
| 38 | #include "i915_drv.h" |
38 | #include "i915_drv.h" |
| 39 | //#include "i915_trace.h" |
39 | #include "i915_trace.h" |
| 40 | #include "drm_dp_helper.h" |
40 | #include "drm_dp_helper.h" |
| 41 | - | ||
| 42 | #include "drm_crtc_helper.h" |
41 | #include "drm_crtc_helper.h" |
| Line 43... | Line 42... | ||
| 43 | 42 | ||
| Line 44... | Line 43... | ||
| 44 | phys_addr_t get_bus_addr(void); |
43 | phys_addr_t get_bus_addr(void); |
| Line 4508... | Line 4507... | ||
| 4508 | struct drm_i915_private *dev_priv = dev->dev_private; |
4507 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 4509 | int latency = SNB_READ_WM0_LATENCY() * 100; /* In unit 0.1us */ |
4508 | int latency = SNB_READ_WM0_LATENCY() * 100; /* In unit 0.1us */ |
| 4510 | int fbc_wm, plane_wm, cursor_wm; |
4509 | int fbc_wm, plane_wm, cursor_wm; |
| 4511 | unsigned int enabled; |
4510 | unsigned int enabled; |
| Line 4512... | Line -... | ||
| 4512 | - | ||
| 4513 | ENTER(); |
- | |
| 4514 | 4511 | ||
| 4515 | enabled = 0; |
4512 | enabled = 0; |
| 4516 | if (g4x_compute_wm0(dev, 0, |
4513 | if (g4x_compute_wm0(dev, 0, |
| 4517 | &sandybridge_display_wm_info, latency, |
4514 | &sandybridge_display_wm_info, latency, |
| 4518 | &sandybridge_cursor_wm_info, latency, |
4515 | &sandybridge_cursor_wm_info, latency, |
| Line 4792... | Line 4789... | ||
| 4792 | * to set the non-SR watermarks to 8. |
4789 | * to set the non-SR watermarks to 8. |
| 4793 | */ |
4790 | */ |
| 4794 | static void intel_update_watermarks(struct drm_device *dev) |
4791 | static void intel_update_watermarks(struct drm_device *dev) |
| 4795 | { |
4792 | { |
| 4796 | struct drm_i915_private *dev_priv = dev->dev_private; |
4793 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 4797 | ENTER(); |
4794 | |
| 4798 | if (dev_priv->display.update_wm) |
4795 | if (dev_priv->display.update_wm) |
| 4799 | dev_priv->display.update_wm(dev); |
4796 | dev_priv->display.update_wm(dev); |
| 4800 | LEAVE(); |
- | |
| 4801 | } |
4797 | } |
| Line 4802... | Line 4798... | ||
| 4802 | 4798 | ||
| 4803 | void intel_update_sprite_watermarks(struct drm_device *dev, int pipe, |
4799 | void intel_update_sprite_watermarks(struct drm_device *dev, int pipe, |
| 4804 | uint32_t sprite_width, int pixel_size) |
4800 | uint32_t sprite_width, int pixel_size) |