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>

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 26d70ea2f67004743bc0f2814359de4c3b22fad4..3b590baad96f4b662be38d2b6af84ebcd58372cf 100644 (file)
--- 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,

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 82f5e5c7009dfa1e4f8354a9d23c19294768ed03..56e52376797b9a5b4e906c6df192f68249a1a4d2 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -136,7 +136,8 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
                I915_WRITE(SPRLINOFF(pipe), offset);
        }
        I915_WRITE(SPRSIZE(pipe), (crtc_h << 16) | crtc_w);
-       I915_WRITE(SPRSCALE(pipe), sprscale);
+       if (intel_plane->can_scale)
+               I915_WRITE(SPRSCALE(pipe), sprscale);
        I915_WRITE(SPRCTL(pipe), sprctl);
        I915_MODIFY_DISPBASE(SPRSURF(pipe), obj->gtt_offset);
        POSTING_READ(SPRSURF(pipe));
@@ -152,7 +153,8 @@ ivb_disable_plane(struct drm_plane *plane)
 
        I915_WRITE(SPRCTL(pipe), I915_READ(SPRCTL(pipe)) & ~SPRITE_ENABLE);
        /* Can't leave the scaler enabled... */
-       I915_WRITE(SPRSCALE(pipe), 0);
+       if (intel_plane->can_scale)
+               I915_WRITE(SPRSCALE(pipe), 0);
        /* Activate double buffered register update */
        I915_MODIFY_DISPBASE(SPRSURF(pipe), 0);
        POSTING_READ(SPRSURF(pipe));
@@ -472,6 +474,12 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
        if (!crtc_w || !crtc_h) /* Again, nothing to display */
                goto out;
 
+       /*
+        * We may not have a scaler, eg. HSW does not have it any more
+        */
+       if (!intel_plane->can_scale && (crtc_w != src_w || crtc_h != src_h))
+               return -EINVAL;
+
        /*
         * We can take a larger source and scale it down, but
         * only so much...  16x is the max on SNB.
@@ -665,6 +673,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe)
        switch (INTEL_INFO(dev)->gen) {
        case 5:
        case 6:
+               intel_plane->can_scale = true;
                intel_plane->max_downscale = 16;
                intel_plane->update_plane = ilk_update_plane;
                intel_plane->disable_plane = ilk_disable_plane;
@@ -681,6 +690,10 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe)
                break;
 
        case 7:
+               if (IS_HASWELL(dev))
+                       intel_plane->can_scale = false;
+               else
+                       intel_plane->can_scale = true;
                intel_plane->max_downscale = 2;
                intel_plane->update_plane = ivb_update_plane;
                intel_plane->disable_plane = ivb_disable_plane;