|
@@ -120,11 +120,10 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
|
|
|
I915_WRITE(SPRSTRIDE(pipe), fb->pitches[0]);
|
|
|
I915_WRITE(SPRPOS(pipe), (crtc_y << 16) | crtc_x);
|
|
|
|
|
|
- linear_offset = y * fb->pitches[0] + x * (fb->bits_per_pixel / 8);
|
|
|
+ linear_offset = y * fb->pitches[0] + x * pixel_size;
|
|
|
sprsurf_offset =
|
|
|
intel_gen4_compute_offset_xtiled(&x, &y,
|
|
|
- fb->bits_per_pixel / 8,
|
|
|
- fb->pitches[0]);
|
|
|
+ pixel_size, fb->pitches[0]);
|
|
|
linear_offset -= sprsurf_offset;
|
|
|
|
|
|
/* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET
|
|
@@ -286,11 +285,10 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
|
|
|
I915_WRITE(DVSSTRIDE(pipe), fb->pitches[0]);
|
|
|
I915_WRITE(DVSPOS(pipe), (crtc_y << 16) | crtc_x);
|
|
|
|
|
|
- linear_offset = y * fb->pitches[0] + x * (fb->bits_per_pixel / 8);
|
|
|
+ linear_offset = y * fb->pitches[0] + x * pixel_size;
|
|
|
dvssurf_offset =
|
|
|
intel_gen4_compute_offset_xtiled(&x, &y,
|
|
|
- fb->bits_per_pixel / 8,
|
|
|
- fb->pitches[0]);
|
|
|
+ pixel_size, fb->pitches[0]);
|
|
|
linear_offset -= dvssurf_offset;
|
|
|
|
|
|
if (obj->tiling_mode != I915_TILING_NONE)
|