diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-23 00:40:42 +0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-23 00:40:42 +0400 |
| commit | df7976797fa9af161690dbf4dee81ed92cdc150f (patch) | |
| tree | be6f04706d91cc80da4dbd3a5f5f2a174f1bdae3 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | f0b69efc29b024747a88ce020dada425e3193d5a (diff) | |
| parent | 9c54c0dd948d715ccfd79e97d852f80eeb53254a (diff) | |
| download | linux-df7976797fa9af161690dbf4dee81ed92cdc150f.tar.xz | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 78cdd158287a..6867e193d85e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -264,6 +264,7 @@ enum intel_pch { }; #define QUIRK_PIPEA_FORCE (1<<0) +#define QUIRK_LVDS_SSC_DISABLE (1<<1) struct intel_fbdev; struct intel_fbc_work; @@ -1199,7 +1200,9 @@ void i915_gem_free_all_phys_object(struct drm_device *dev); void i915_gem_release(struct drm_device *dev, struct drm_file *file); uint32_t -i915_gem_get_unfenced_gtt_alignment(struct drm_i915_gem_object *obj); +i915_gem_get_unfenced_gtt_alignment(struct drm_device *dev, + uint32_t size, + int tiling_mode); int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, enum i915_cache_level cache_level); |