diff options
| author | Ville Syrjälä | 2016-01-12 20:08:35 +0100 |
|---|---|---|
| committer | Ville Syrjälä | 2016-01-13 17:46:41 +0100 |
| commit | d843310d146452105e2bc54b8d82e52ad727697f (patch) | |
| tree | 3fe3ff4f25eba5be2be7bc3cc760c2064f8edf7f /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: change intel_fill_fb_ggtt_view() to use the real tile size (diff) | |
| download | kernel-qcow2-linux-d843310d146452105e2bc54b8d82e52ad727697f.tar.gz kernel-qcow2-linux-d843310d146452105e2bc54b8d82e52ad727697f.tar.xz kernel-qcow2-linux-d843310d146452105e2bc54b8d82e52ad727697f.zip | |
drm/i915: Use intel_tile_{size,width,height}() in intel_gen4_compute_page_offset()
Make intel_gen4_compute_page_offset() ready for other tiling formats
besied X-tile by getting the tile dimensions through
intel_tile_{size,width,height}().
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1452625717-9713-6-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 79900341f944..8a76e29256ef 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2464,15 +2464,20 @@ unsigned long intel_gen4_compute_page_offset(struct drm_i915_private *dev_priv, unsigned int pitch) { if (fb_modifier != DRM_FORMAT_MOD_NONE) { + unsigned int tile_size, tile_width, tile_height; unsigned int tile_rows, tiles; - tile_rows = *y / 8; - *y %= 8; + tile_size = intel_tile_size(dev_priv); + tile_width = intel_tile_width(dev_priv, fb_modifier, cpp); + tile_height = tile_size / tile_width; + + tile_rows = *y / tile_height; + *y %= tile_height; - tiles = *x / (512/cpp); - *x %= 512/cpp; + tiles = *x / (tile_width/cpp); + *x %= tile_width/cpp; - return tile_rows * pitch * 8 + tiles * 4096; + return tile_rows * pitch * tile_height + tiles * tile_size; } else { unsigned int alignment = intel_linear_alignment(dev_priv) - 1; unsigned int offset; |