drm/i915: Don't try to use SPR_SCALE when we don't have a sprite scaler
authorDamien Lespiau <damien.lespiau@intel.com>
Mon, 22 Oct 2012 17:19:27 +0000 (18:19 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 23 Oct 2012 17:35:18 +0000 (19:35 +0200)
commit2d354c347257287ec00b2e6e26a4d209e348cf7d
tree680da1d1713941e903a8a2fcff01746989f7d3f4
parent9324cf7fefd77883a9d8d7e0356b9dd45c13132b
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>
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sprite.c