diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-08 12:22:36 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-08 10:22:51 -0700 |
| commit | 43a9539fa9e780f16c0d1e4bc91a2701f1ce178f (patch) | |
| tree | 6a4cabca10ebbbdf6d4465a4f661d7b79954e92e /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 6fe5a7e3cac5b60774186a95bbb7555fa604080c (diff) | |
| download | blackbird-op-linux-43a9539fa9e780f16c0d1e4bc91a2701f1ce178f.tar.gz blackbird-op-linux-43a9539fa9e780f16c0d1e4bc91a2701f1ce178f.zip | |
drm/i915: Only export the generic intel_disable_fbc() interface
As the enable/disable routines will be gain additional complexity in
future patches, it is necessary that all callers do not bypass the
generic interface by calling into the chipset routines directly. to do
this we make the chipset routines static, so there is no choice.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index e1787022d6c8..1315a882275c 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1073,6 +1073,9 @@ static void i915_setup_compression(struct drm_device *dev, int size) unsigned long cfb_base; unsigned long ll_base = 0; + /* Just in case the BIOS is doing something questionable. */ + intel_disable_fbc(dev); + compressed_fb = drm_mm_search_free(&dev_priv->mm.stolen, size, 4096, 0); if (compressed_fb) compressed_fb = drm_mm_get_block(compressed_fb, size, 4096); @@ -1099,7 +1102,6 @@ static void i915_setup_compression(struct drm_device *dev, int size) dev_priv->cfb_size = size; - intel_disable_fbc(dev); dev_priv->compressed_fb = compressed_fb; if (HAS_PCH_SPLIT(dev)) I915_WRITE(ILK_DPFC_CB_BASE, compressed_fb->start); |
