diff options
| author | Damien Lespiau | 2012-10-22 19:19:27 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-10-23 19:35:18 +0200 |
| commit | 2d354c347257287ec00b2e6e26a4d209e348cf7d (patch) | |
| tree | 680da1d1713941e903a8a2fcff01746989f7d3f4 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | drm/i915/dp: actually nack test request (diff) | |
| download | kernel-qcow2-linux-2d354c347257287ec00b2e6e26a4d209e348cf7d.tar.gz kernel-qcow2-linux-2d354c347257287ec00b2e6e26a4d209e348cf7d.tar.xz kernel-qcow2-linux-2d354c347257287ec00b2e6e26a4d209e348cf7d.zip | |
drm/i915: Don't try to use SPR_SCALE when we don't have a sprite scaler
Haswell does not have a scaler in the sprite pipeline anymore, so let's
ensure:
1/ We bail out of update_plate() when someone is trying to ask to
display a scaled framebuffer,
2/ We never write to the nonexistent SPR_SCALE register
v2: Smash in the fixup from Damien in the disable_plane function.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> (for v1)
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> (for v1)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 26d70ea2f670..3b590baad96f 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -229,6 +229,7 @@ struct intel_plane { struct drm_plane base; enum pipe pipe; struct drm_i915_gem_object *obj; + bool can_scale; int max_downscale; u32 lut_r[1024], lut_g[1024], lut_b[1024]; void (*update_plane)(struct drm_plane *plane, |