diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-07 10:15:44 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-07 10:15:44 +0200 |
| commit | cfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb (patch) | |
| tree | 06240ac00c9fee6a9ca97b778c63bfaa7ab6904d /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 34882298b93e998d5fccde852b860e8fbe6c8f6b (diff) | |
| parent | 57127efaf1adc5e0bb2d3fa5a01bd97f71af7836 (diff) | |
| download | linux-next-cfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb.tar.gz | |
Merge patches merged by Jani while I was on vacation.
Jani apparently didn't rebase onto latest drm-intel-next so a merge is
in order.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index b00eae8e2fd6..ea514856a2c9 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -600,11 +600,12 @@ struct intel_context { struct i915_fbc { unsigned long size; + unsigned threshold; unsigned int fb_id; enum plane plane; int y; - struct drm_mm_node *compressed_fb; + struct drm_mm_node compressed_fb; struct drm_mm_node *compressed_llb; struct intel_fbc_work { @@ -2487,7 +2488,7 @@ static inline void i915_gem_chipset_flush(struct drm_device *dev) /* i915_gem_stolen.c */ int i915_gem_init_stolen(struct drm_device *dev); -int i915_gem_stolen_setup_compression(struct drm_device *dev, int size); +int i915_gem_stolen_setup_compression(struct drm_device *dev, int size, int fb_cpp); void i915_gem_stolen_cleanup_compression(struct drm_device *dev); void i915_gem_cleanup_stolen(struct drm_device *dev); struct drm_i915_gem_object * |