Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27ba3910 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: s/tile_width/tile_width_bytes/ 



Make if clear whether we're talking tile widths in bytes or in pixels.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455569699-27905-3-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9106cf17

drivers/gpu/drm/i915/intel_display.c

+16 −16
Original line number Original line Diff line number Diff line
@@ -2225,7 +2225,7 @@ static unsigned int intel_tile_size(const struct drm_i915_private *dev_priv) 
	return IS_GEN2(dev_priv) ? 2048 : 4096;

	return IS_GEN2(dev_priv) ? 2048 : 4096;

}

}





static unsigned int intel_tile_width(const struct drm_i915_private *dev_priv,

static unsigned int intel_tile_width_bytes(const struct drm_i915_private *dev_priv,

					   uint64_t fb_modifier, unsigned int cpp)

					   uint64_t fb_modifier, unsigned int cpp)

{

{

	switch (fb_modifier) {

	switch (fb_modifier) {
@@ -2269,7 +2269,7 @@ unsigned int intel_tile_height(const struct drm_i915_private *dev_priv, 
		return 1;

		return 1;

	else

	else

		return intel_tile_size(dev_priv) /

		return intel_tile_size(dev_priv) /

			intel_tile_width(dev_priv, fb_modifier, cpp);

			intel_tile_width_bytes(dev_priv, fb_modifier, cpp);

}

}





unsigned int

unsigned int
@@ -2288,7 +2288,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, 
{

{

	struct drm_i915_private *dev_priv = to_i915(fb->dev);

	struct drm_i915_private *dev_priv = to_i915(fb->dev);

	struct intel_rotation_info *info = &view->params.rotated;

	struct intel_rotation_info *info = &view->params.rotated;

	unsigned int tile_size, tile_width, tile_height, cpp;

	unsigned int tile_size, tile_width_bytes, tile_height, cpp;





	*view = i915_ggtt_view_normal;

	*view = i915_ggtt_view_normal;
@@ -2309,19 +2309,19 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, struct drm_framebuffer *fb, 
	tile_size = intel_tile_size(dev_priv);

	tile_size = intel_tile_size(dev_priv);





	cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	cpp = drm_format_plane_cpp(fb->pixel_format, 0);

	tile_width = intel_tile_width(dev_priv, fb->modifier[0], cpp);

	tile_width_bytes = intel_tile_width_bytes(dev_priv, fb->modifier[0], cpp);

	tile_height = tile_size / tile_width;

	tile_height = tile_size / tile_width_bytes;





	info->width_pages = DIV_ROUND_UP(fb->pitches[0], tile_width);

	info->width_pages = DIV_ROUND_UP(fb->pitches[0], tile_width_bytes);

	info->height_pages = DIV_ROUND_UP(fb->height, tile_height);

	info->height_pages = DIV_ROUND_UP(fb->height, tile_height);

	info->size = info->width_pages * info->height_pages * tile_size;

	info->size = info->width_pages * info->height_pages * tile_size;





	if (info->pixel_format == DRM_FORMAT_NV12) {

	if (info->pixel_format == DRM_FORMAT_NV12) {

		cpp = drm_format_plane_cpp(fb->pixel_format, 1);

		cpp = drm_format_plane_cpp(fb->pixel_format, 1);

		tile_width = intel_tile_width(dev_priv, fb->modifier[1], cpp);

		tile_width_bytes = intel_tile_width_bytes(dev_priv, fb->modifier[1], cpp);

		tile_height = tile_size / tile_width;

		tile_height = tile_size / tile_width_bytes;





		info->width_pages_uv = DIV_ROUND_UP(fb->pitches[1], tile_width);

		info->width_pages_uv = DIV_ROUND_UP(fb->pitches[1], tile_width_bytes);

		info->height_pages_uv = DIV_ROUND_UP(fb->height / 2, tile_height);

		info->height_pages_uv = DIV_ROUND_UP(fb->height / 2, tile_height);

		info->size_uv = info->width_pages_uv * info->height_pages_uv * tile_size;

		info->size_uv = info->width_pages_uv * info->height_pages_uv * tile_size;

	}

	}
@@ -2458,18 +2458,18 @@ u32 intel_compute_tile_offset(struct drm_i915_private *dev_priv, 
			      unsigned int pitch)

			      unsigned int pitch)

{

{

	if (fb_modifier != DRM_FORMAT_MOD_NONE) {

	if (fb_modifier != DRM_FORMAT_MOD_NONE) {

		unsigned int tile_size, tile_width, tile_height;

		unsigned int tile_size, tile_width_bytes, tile_height;

		unsigned int tile_rows, tiles;

		unsigned int tile_rows, tiles;





		tile_size = intel_tile_size(dev_priv);

		tile_size = intel_tile_size(dev_priv);

		tile_width = intel_tile_width(dev_priv, fb_modifier, cpp);

		tile_width_bytes = intel_tile_width_bytes(dev_priv, fb_modifier, cpp);

		tile_height = tile_size / tile_width;

		tile_height = tile_size / tile_width_bytes;





		tile_rows = *y / tile_height;

		tile_rows = *y / tile_height;

		*y %= tile_height;

		*y %= tile_height;





		tiles = *x / (tile_width/cpp);

		tiles = *x / (tile_width_bytes/cpp);

		*x %= tile_width/cpp;

		*x %= tile_width_bytes/cpp;





		return tile_rows * pitch * tile_height + tiles * tile_size;

		return tile_rows * pitch * tile_height + tiles * tile_size;

	} else {

	} else {
@@ -2931,7 +2931,7 @@ u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv, 
	} else {

	} else {

		int cpp = drm_format_plane_cpp(pixel_format, 0);

		int cpp = drm_format_plane_cpp(pixel_format, 0);





		return intel_tile_width(dev_priv, fb_modifier, cpp);

		return intel_tile_width_bytes(dev_priv, fb_modifier, cpp);

	}

	}

}

}