Re: [Intel-gfx] [PATCH 1/4] drm/i915: Support planar formats in tile height calculations

[Joonas Lahtinen]

On ma, 2015-09-21 at 10:45 +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin 
> 
> This will be needed for NV12 support.
> 
> v2: Rebase.
> 
> Signed-off-by: Tvrtko Ursulin 

Reviewed-by: Joonas Lahtinen 

> ---
>  drivers/gpu/drm/i915/intel_display.c | 10 +-
>  drivers/gpu/drm/i915/intel_drv.h |  2 +-
>  drivers/gpu/drm/i915/intel_sprite.c  |  2 +-
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index fc0086748b71..e19b8e699c00 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2190,7 +2190,7 @@ static bool need_vtd_wa(struct drm_device *dev)
>  
>  unsigned int
>  intel_tile_height(struct drm_device *dev, uint32_t pixel_format,
> -   uint64_t fb_format_modifier)
> +   uint64_t fb_format_modifier, unsigned int plane)
>  {
>   unsigned int tile_height;
>   uint32_t pixel_bytes;
> @@ -2206,7 +2206,7 @@ intel_tile_height(struct drm_device *dev,
> uint32_t pixel_format,
>   tile_height = 32;
>   break;
>   case I915_FORMAT_MOD_Yf_TILED:
> - pixel_bytes = drm_format_plane_cpp(pixel_format, 0);
> + pixel_bytes = drm_format_plane_cpp(pixel_format,
> plane);
>   switch (pixel_bytes) {
>   default:
>   case 1:
> @@ -2240,7 +2240,7 @@ intel_fb_align_height(struct drm_device *dev,
> unsigned int height,
> uint32_t pixel_format, uint64_t
> fb_format_modifier)
>  {
>   return ALIGN(height, intel_tile_height(dev, pixel_format,
> -fb_format_modifier));
> +fb_format_modifier,
> 0));
>  }
>  
>  static int
> @@ -2266,7 +2266,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view
> *view, struct drm_framebuffer *fb,
>   info->fb_modifier = fb->modifier[0];
>  
>   tile_height = intel_tile_height(fb->dev, fb->pixel_format,
> - fb->modifier[0]);
> + fb->modifier[0], 0);
>   tile_pitch = PAGE_SIZE / tile_height;
>   info->width_pages = DIV_ROUND_UP(fb->pitches[0],
> tile_pitch);
>   info->height_pages = DIV_ROUND_UP(fb->height, tile_height);
> @@ -3069,7 +3069,7 @@ static void skylake_update_primary_plane(struct
> drm_crtc *crtc,
>   if (intel_rotation_90_or_270(rotation)) {
>   /* stride = Surface height in tiles */
>   tile_height = intel_tile_height(dev, fb
> ->pixel_format,
> - fb->modifier[0]);
> + fb->modifier[0], 0);
>   stride = DIV_ROUND_UP(fb->height, tile_height);
>   x_offset = stride * tile_height - y - src_h;
>   y_offset = x;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index 1df6ebf50146..94dab9bd8ebd 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1085,7 +1085,7 @@ int intel_plane_atomic_calc_changes(struct
> drm_crtc_state *crtc_state,
>  
>  unsigned int
>  intel_tile_height(struct drm_device *dev, uint32_t pixel_format,
> -   uint64_t fb_format_modifier);
> +   uint64_t fb_format_modifier, unsigned int plane);
>  
>  static inline bool
>  intel_rotation_90_or_270(unsigned int rotation)
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c
> b/drivers/gpu/drm/i915/intel_sprite.c
> index 79f7cc247ab7..4372fa0b1ec5 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -240,7 +240,7 @@ skl_update_plane(struct drm_plane *drm_plane,
> struct drm_crtc *crtc,
>   if (intel_rotation_90_or_270(rotation)) {
>   /* stride: Surface height in tiles */
>   tile_height = intel_tile_height(dev, fb
> ->pixel_format,
> - fb->modifier[0]);
> + fb->modifier[0], 0);
>   stride = DIV_ROUND_UP(fb->height, tile_height);
>   plane_size = (src_w << 16) | src_h;
>   x_offset = stride * tile_height - y - (src_h + 1);
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 1/4] drm/i915: Support planar formats in tile height calculations

[Tvrtko Ursulin]

From: Tvrtko Ursulin 

This will be needed for NV12 support.

v2: Rebase.

Signed-off-by: Tvrtko Ursulin 
---
 drivers/gpu/drm/i915/intel_display.c | 10 +-
 drivers/gpu/drm/i915/intel_drv.h |  2 +-
 drivers/gpu/drm/i915/intel_sprite.c  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index fc0086748b71..e19b8e699c00 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2190,7 +2190,7 @@ static bool need_vtd_wa(struct drm_device *dev)
 
 unsigned int
 intel_tile_height(struct drm_device *dev, uint32_t pixel_format,
- uint64_t fb_format_modifier)
+ uint64_t fb_format_modifier, unsigned int plane)
 {
unsigned int tile_height;
uint32_t pixel_bytes;
@@ -2206,7 +2206,7 @@ intel_tile_height(struct drm_device *dev, uint32_t 
pixel_format,
tile_height = 32;
break;
case I915_FORMAT_MOD_Yf_TILED:
-   pixel_bytes = drm_format_plane_cpp(pixel_format, 0);
+   pixel_bytes = drm_format_plane_cpp(pixel_format, plane);
switch (pixel_bytes) {
default:
case 1:
@@ -2240,7 +2240,7 @@ intel_fb_align_height(struct drm_device *dev, unsigned 
int height,
  uint32_t pixel_format, uint64_t fb_format_modifier)
 {
return ALIGN(height, intel_tile_height(dev, pixel_format,
-  fb_format_modifier));
+  fb_format_modifier, 0));
 }
 
 static int
@@ -2266,7 +2266,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, 
struct drm_framebuffer *fb,
info->fb_modifier = fb->modifier[0];
 
tile_height = intel_tile_height(fb->dev, fb->pixel_format,
-   fb->modifier[0]);
+   fb->modifier[0], 0);
tile_pitch = PAGE_SIZE / tile_height;
info->width_pages = DIV_ROUND_UP(fb->pitches[0], tile_pitch);
info->height_pages = DIV_ROUND_UP(fb->height, tile_height);
@@ -3069,7 +3069,7 @@ static void skylake_update_primary_plane(struct drm_crtc 
*crtc,
if (intel_rotation_90_or_270(rotation)) {
/* stride = Surface height in tiles */
tile_height = intel_tile_height(dev, fb->pixel_format,
-   fb->modifier[0]);
+   fb->modifier[0], 0);
stride = DIV_ROUND_UP(fb->height, tile_height);
x_offset = stride * tile_height - y - src_h;
y_offset = x;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 1df6ebf50146..94dab9bd8ebd 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1085,7 +1085,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state 
*crtc_state,
 
 unsigned int
 intel_tile_height(struct drm_device *dev, uint32_t pixel_format,
- uint64_t fb_format_modifier);
+ uint64_t fb_format_modifier, unsigned int plane);
 
 static inline bool
 intel_rotation_90_or_270(unsigned int rotation)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index 79f7cc247ab7..4372fa0b1ec5 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -240,7 +240,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct 
drm_crtc *crtc,
if (intel_rotation_90_or_270(rotation)) {
/* stride: Surface height in tiles */
tile_height = intel_tile_height(dev, fb->pixel_format,
-   fb->modifier[0]);
+   fb->modifier[0], 0);
stride = DIV_ROUND_UP(fb->height, tile_height);
plane_size = (src_w << 16) | src_h;
x_offset = stride * tile_height - y - (src_h + 1);
-- 
2.5.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 1/4] drm/i915: Support planar formats in tile height calculations

[Tvrtko Ursulin]

From: Tvrtko Ursulin tvrtko.ursu...@intel.com

This will be needed for NV12 support.

v2: Rebase.

Signed-off-by: Tvrtko Ursulin tvrtko.ursu...@intel.com
---
 drivers/gpu/drm/i915/intel_display.c | 10 +-
 drivers/gpu/drm/i915/intel_drv.h |  2 +-
 drivers/gpu/drm/i915/intel_sprite.c  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 43b0f17ad1fa..03e550874aec 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2224,7 +2224,7 @@ static bool need_vtd_wa(struct drm_device *dev)
 
 unsigned int
 intel_tile_height(struct drm_device *dev, uint32_t pixel_format,
- uint64_t fb_format_modifier)
+ uint64_t fb_format_modifier, unsigned int plane)
 {
unsigned int tile_height;
uint32_t pixel_bytes;
@@ -2240,7 +2240,7 @@ intel_tile_height(struct drm_device *dev, uint32_t 
pixel_format,
tile_height = 32;
break;
case I915_FORMAT_MOD_Yf_TILED:
-   pixel_bytes = drm_format_plane_cpp(pixel_format, 0);
+   pixel_bytes = drm_format_plane_cpp(pixel_format, plane);
switch (pixel_bytes) {
default:
case 1:
@@ -2274,7 +2274,7 @@ intel_fb_align_height(struct drm_device *dev, unsigned 
int height,
  uint32_t pixel_format, uint64_t fb_format_modifier)
 {
return ALIGN(height, intel_tile_height(dev, pixel_format,
-  fb_format_modifier));
+  fb_format_modifier, 0));
 }
 
 static int
@@ -2300,7 +2300,7 @@ intel_fill_fb_ggtt_view(struct i915_ggtt_view *view, 
struct drm_framebuffer *fb,
info-fb_modifier = fb-modifier[0];
 
tile_height = intel_tile_height(fb-dev, fb-pixel_format,
-   fb-modifier[0]);
+   fb-modifier[0], 0);
tile_pitch = PAGE_SIZE / tile_height;
info-width_pages = DIV_ROUND_UP(fb-pitches[0], tile_pitch);
info-height_pages = DIV_ROUND_UP(fb-height, tile_height);
@@ -3094,7 +3094,7 @@ static void skylake_update_primary_plane(struct drm_crtc 
*crtc,
if (intel_rotation_90_or_270(rotation)) {
/* stride = Surface height in tiles */
tile_height = intel_tile_height(dev, fb-pixel_format,
-   fb-modifier[0]);
+   fb-modifier[0], 0);
stride = DIV_ROUND_UP(fb-height, tile_height);
x_offset = stride * tile_height - y - src_h;
y_offset = x;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 320c9e6bd848..429d05406a5c 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1061,7 +1061,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state 
*crtc_state,
 
 unsigned int
 intel_tile_height(struct drm_device *dev, uint32_t pixel_format,
- uint64_t fb_format_modifier);
+ uint64_t fb_format_modifier, unsigned int plane);
 
 static inline bool
 intel_rotation_90_or_270(unsigned int rotation)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index 9d8af2f8a875..f0bfe1647967 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -228,7 +228,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct 
drm_crtc *crtc,
if (intel_rotation_90_or_270(rotation)) {
/* stride: Surface height in tiles */
tile_height = intel_tile_height(dev, fb-pixel_format,
-   fb-modifier[0]);
+   fb-modifier[0], 0);
stride = DIV_ROUND_UP(fb-height, tile_height);
plane_size = (src_w  16) | src_h;
x_offset = stride * tile_height - y - (src_h + 1);
-- 
2.4.6

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx