diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 07b13dcb7fde..b9fabf826f7d 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c | |||
@@ -260,14 +260,14 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, | |||
260 | if (obj->tiling_mode != I915_TILING_NONE) | 260 | if (obj->tiling_mode != I915_TILING_NONE) |
261 | sprctl |= SPRITE_TILED; | 261 | sprctl |= SPRITE_TILED; |
262 | 262 | ||
263 | if (IS_HASWELL(dev)) | 263 | if (IS_HASWELL(dev) || IS_BROADWELL(dev)) |
264 | sprctl &= ~SPRITE_TRICKLE_FEED_DISABLE; | 264 | sprctl &= ~SPRITE_TRICKLE_FEED_DISABLE; |
265 | else | 265 | else |
266 | sprctl |= SPRITE_TRICKLE_FEED_DISABLE; | 266 | sprctl |= SPRITE_TRICKLE_FEED_DISABLE; |
267 | 267 | ||
268 | sprctl |= SPRITE_ENABLE; | 268 | sprctl |= SPRITE_ENABLE; |
269 | 269 | ||
270 | if (IS_HASWELL(dev)) | 270 | if (IS_HASWELL(dev) || IS_BROADWELL(dev)) |
271 | sprctl |= SPRITE_PIPE_CSC_ENABLE; | 271 | sprctl |= SPRITE_PIPE_CSC_ENABLE; |
272 | 272 | ||
273 | intel_update_sprite_watermarks(plane, crtc, src_w, pixel_size, true, | 273 | intel_update_sprite_watermarks(plane, crtc, src_w, pixel_size, true, |
@@ -306,7 +306,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, | |||
306 | 306 | ||
307 | /* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET | 307 | /* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET |
308 | * register */ | 308 | * register */ |
309 | if (IS_HASWELL(dev)) | 309 | if (IS_HASWELL(dev) || IS_BROADWELL(dev)) |
310 | I915_WRITE(SPROFFSET(pipe), (y << 16) | x); | 310 | I915_WRITE(SPROFFSET(pipe), (y << 16) | x); |
311 | else if (obj->tiling_mode != I915_TILING_NONE) | 311 | else if (obj->tiling_mode != I915_TILING_NONE) |
312 | I915_WRITE(SPRTILEOFF(pipe), (y << 16) | x); | 312 | I915_WRITE(SPRTILEOFF(pipe), (y << 16) | x); |
@@ -1092,6 +1092,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) | |||
1092 | break; | 1092 | break; |
1093 | 1093 | ||
1094 | case 7: | 1094 | case 7: |
1095 | case 8: | ||
1095 | if (IS_IVYBRIDGE(dev)) { | 1096 | if (IS_IVYBRIDGE(dev)) { |
1096 | intel_plane->can_scale = true; | 1097 | intel_plane->can_scale = true; |
1097 | intel_plane->max_downscale = 2; | 1098 | intel_plane->max_downscale = 2; |