diff options
| author | Ville Syrjälä | 2016-02-08 17:28:00 +0100 |
|---|---|---|
| committer | Ville Syrjälä | 2016-08-11 17:34:29 +0200 |
| commit | b9b2403845f11cae20af5f6b5fd5cf7c6c9346ab (patch) | |
| tree | 0a1cc9be57692a5815ee1353e04f0b5d3c0c6c2a /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Limit fb x offset due to fences (diff) | |
| download | kernel-qcow2-linux-b9b2403845f11cae20af5f6b5fd5cf7c6c9346ab.tar.gz kernel-qcow2-linux-b9b2403845f11cae20af5f6b5fd5cf7c6c9346ab.tar.xz kernel-qcow2-linux-b9b2403845f11cae20af5f6b5fd5cf7c6c9346ab.zip | |
drm/i915: Allow calling intel_adjust_tile_offset() multiple times
Minimize the resulting X coordinate after intel_adjust_tile_offset() is
done with it's offset adjustment. This allows calling
intel_adjust_tile_offset() multiple times in case we need to adjust
the offset several times.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470821001-25272-9-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e9f065ff618f..976159ab818c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2330,6 +2330,7 @@ static u32 intel_adjust_tile_offset(int *x, int *y, u32 old_offset, u32 new_offset) { + unsigned int pitch_pixels = pitch_tiles * tile_width; unsigned int tiles; WARN_ON(old_offset & (tile_size - 1)); @@ -2341,6 +2342,10 @@ static u32 intel_adjust_tile_offset(int *x, int *y, *y += tiles / pitch_tiles * tile_height; *x += tiles % pitch_tiles * tile_width; + /* minimize x in case it got needlessly big */ + *y += *x / pitch_pixels * tile_height; + *x %= pitch_pixels; + return new_offset; } |