drm/i915: Move Pineview CxSR and watermark code into update_wm hook.
authorZhao Yakui <yakui.zhao@intel.com>
Mon, 22 Mar 2010 14:45:36 +0000 (22:45 +0800)
committerEric Anholt <eric@anholt.net>
Mon, 12 Apr 2010 16:27:46 +0000 (09:27 -0700)
commitd4294342fd4b94a3297867da00c1c5e929c28d4f
treee73174d08c90854f1f87d4b1a173122f8c631089
parenta2c459ee9aa52a659611ec1f1b43bfde49017b23
drm/i915: Move Pineview CxSR and watermark code into update_wm hook.

Previously, after setting up the Pineview CxSR state, i9xx_update_wm would
get called and overwrite our state.

BTW: We will disable the self-refresh and never enable it any more if we
can't find the appropriate the latency on pineview plaftorm. In such case
the update_wm callback will be NULL.

The bitmask macro is also defined to access the corresponding fifo
watermark register.

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c