Skip to content

L
linux
Commit ac484963 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files
Options

drm/i915: Standardize on 'cpp' for bytes per pixel 

We more or less randomly call the "bytes per pixel" value
'cpp', 'bytes_per_pixel', 'pixel_size', or even 'bpp'. Let's just pick
one and stick to it. I've chosen 'cpp'.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453316739-13296-6-git-send-email-ville.syrjala@linux.intel.comReviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 54ea9da8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 97 deletions
drivers/gpu/drm/i915/intel_display.c
View file @ ac484963
...@@ -2709,7 +2709,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, ...@@ -2709,7 +2709,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,
u32 linear_offset; u32 linear_offset;
u32 dspcntr; u32 dspcntr;
i915_reg_t reg = DSPCNTR(plane); i915_reg_t reg = DSPCNTR(plane);
int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0); int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
int x = plane_state->src.x1 >> 16; int x = plane_state->src.x1 >> 16;
int y = plane_state->src.y1 >> 16; int y = plane_state->src.y1 >> 16;
...@@ -2769,13 +2769,12 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, ...@@ -2769,13 +2769,12 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,
if (IS_G4X(dev)) if (IS_G4X(dev))
dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE; dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
linear_offset = y * fb->pitches[0] + x * pixel_size; linear_offset = y * fb->pitches[0] + x * cpp;
if (INTEL_INFO(dev)->gen >= 4) { if (INTEL_INFO(dev)->gen >= 4) {
intel_crtc->dspaddr_offset = intel_crtc->dspaddr_offset =
intel_compute_tile_offset(dev_priv, &x, &y, intel_compute_tile_offset(dev_priv, &x, &y,
fb->modifier[0], fb->modifier[0], cpp,
pixel_size,
fb->pitches[0]); fb->pitches[0]);
linear_offset -= intel_crtc->dspaddr_offset; linear_offset -= intel_crtc->dspaddr_offset;
} else { } else {
...@@ -2792,7 +2791,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, ...@@ -2792,7 +2791,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,
data and adding to linear_offset*/ data and adding to linear_offset*/
linear_offset += linear_offset +=
(crtc_state->pipe_src_h - 1) * fb->pitches[0] + (crtc_state->pipe_src_h - 1) * fb->pitches[0] +
(crtc_state->pipe_src_w - 1) * pixel_size; (crtc_state->pipe_src_w - 1) * cpp;
} }
intel_crtc->adjusted_x = x; intel_crtc->adjusted_x = x;
...@@ -2840,7 +2839,7 @@ static void ironlake_update_primary_plane(struct drm_plane *primary, ...@@ -2840,7 +2839,7 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,
u32 linear_offset; u32 linear_offset;
u32 dspcntr; u32 dspcntr;
i915_reg_t reg = DSPCNTR(plane); i915_reg_t reg = DSPCNTR(plane);
int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0); int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
int x = plane_state->src.x1 >> 16; int x = plane_state->src.x1 >> 16;
int y = plane_state->src.y1 >> 16; int y = plane_state->src.y1 >> 16;
...@@ -2879,11 +2878,10 @@ static void ironlake_update_primary_plane(struct drm_plane *primary, ...@@ -2879,11 +2878,10 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,
if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) if (!IS_HASWELL(dev) && !IS_BROADWELL(dev))
dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE; dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
linear_offset = y * fb->pitches[0] + x * pixel_size; linear_offset = y * fb->pitches[0] + x * cpp;
intel_crtc->dspaddr_offset = intel_crtc->dspaddr_offset =
intel_compute_tile_offset(dev_priv, &x, &y, intel_compute_tile_offset(dev_priv, &x, &y,
fb->modifier[0], fb->modifier[0], cpp,
pixel_size,
fb->pitches[0]); fb->pitches[0]);
linear_offset -= intel_crtc->dspaddr_offset; linear_offset -= intel_crtc->dspaddr_offset;
if (plane_state->base.rotation == BIT(DRM_ROTATE_180)) { if (plane_state->base.rotation == BIT(DRM_ROTATE_180)) {
...@@ -2897,7 +2895,7 @@ static void ironlake_update_primary_plane(struct drm_plane *primary, ...@@ -2897,7 +2895,7 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,
data and adding to linear_offset*/ data and adding to linear_offset*/
linear_offset += linear_offset +=
(crtc_state->pipe_src_h - 1) * fb->pitches[0] + (crtc_state->pipe_src_h - 1) * fb->pitches[0] +
(crtc_state->pipe_src_w - 1) * pixel_size; (crtc_state->pipe_src_w - 1) * cpp;
} }
} }
...@@ -14682,10 +14680,12 @@ u32 intel_fb_pitch_limit(struct drm_device *dev, uint64_t fb_modifier, ...@@ -14682,10 +14680,12 @@ u32 intel_fb_pitch_limit(struct drm_device *dev, uint64_t fb_modifier,
u32 gen = INTEL_INFO(dev)->gen; u32 gen = INTEL_INFO(dev)->gen;
if (gen >= 9) { if (gen >= 9) {
int cpp = drm_format_plane_cpp(pixel_format, 0);
/* "The stride in bytes must not exceed the of the size of 8K /* "The stride in bytes must not exceed the of the size of 8K
* pixels and 32K bytes." * pixels and 32K bytes."
*/ */
return min(8192*drm_format_plane_cpp(pixel_format, 0), 32768); return min(8192 * cpp, 32768);
} else if (gen >= 5 && !IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev)) { } else if (gen >= 5 && !IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev)) {
return 32*1024; return 32*1024;
} else if (gen >= 4) { } else if (gen >= 4) {
......
drivers/gpu/drm/i915/intel_pm.c
View file @ ac484963
This diff is collapsed.
drivers/gpu/drm/i915/intel_sprite.c
View file @ ac484963
...@@ -351,7 +351,7 @@ vlv_update_plane(struct drm_plane *dplane, ...@@ -351,7 +351,7 @@ vlv_update_plane(struct drm_plane *dplane,
int plane = intel_plane->plane; int plane = intel_plane->plane;
u32 sprctl; u32 sprctl;
u32 sprsurf_offset, linear_offset; u32 sprsurf_offset, linear_offset;
int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0); int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey; const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
int crtc_x = plane_state->dst.x1; int crtc_x = plane_state->dst.x1;
int crtc_y = plane_state->dst.y1; int crtc_y = plane_state->dst.y1;
...@@ -422,10 +422,9 @@ vlv_update_plane(struct drm_plane *dplane, ...@@ -422,10 +422,9 @@ vlv_update_plane(struct drm_plane *dplane,
crtc_w--; crtc_w--;
crtc_h--; crtc_h--;
linear_offset = y * fb->pitches[0] + x * pixel_size; linear_offset = y * fb->pitches[0] + x * cpp;
sprsurf_offset = intel_compute_tile_offset(dev_priv, &x, &y, sprsurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,
fb->modifier[0], fb->modifier[0], cpp,
pixel_size,
fb->pitches[0]); fb->pitches[0]);
linear_offset -= sprsurf_offset; linear_offset -= sprsurf_offset;
...@@ -434,7 +433,7 @@ vlv_update_plane(struct drm_plane *dplane, ...@@ -434,7 +433,7 @@ vlv_update_plane(struct drm_plane *dplane,
x += src_w; x += src_w;
y += src_h; y += src_h;
linear_offset += src_h * fb->pitches[0] + src_w * pixel_size; linear_offset += src_h * fb->pitches[0] + src_w * cpp;
} }
if (key->flags) { if (key->flags) {
...@@ -494,7 +493,7 @@ ivb_update_plane(struct drm_plane *plane, ...@@ -494,7 +493,7 @@ ivb_update_plane(struct drm_plane *plane,
enum pipe pipe = intel_plane->pipe; enum pipe pipe = intel_plane->pipe;
u32 sprctl, sprscale = 0; u32 sprctl, sprscale = 0;
u32 sprsurf_offset, linear_offset; u32 sprsurf_offset, linear_offset;
int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0); int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey; const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
int crtc_x = plane_state->dst.x1; int crtc_x = plane_state->dst.x1;
int crtc_y = plane_state->dst.y1; int crtc_y = plane_state->dst.y1;
...@@ -556,10 +555,9 @@ ivb_update_plane(struct drm_plane *plane, ...@@ -556,10 +555,9 @@ ivb_update_plane(struct drm_plane *plane,
if (crtc_w != src_w || crtc_h != src_h) if (crtc_w != src_w || crtc_h != src_h)
sprscale = SPRITE_SCALE_ENABLE | (src_w << 16) | src_h; sprscale = SPRITE_SCALE_ENABLE | (src_w << 16) | src_h;
linear_offset = y * fb->pitches[0] + x * pixel_size; linear_offset = y * fb->pitches[0] + x * cpp;
sprsurf_offset = intel_compute_tile_offset(dev_priv, &x, &y, sprsurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,
fb->modifier[0], fb->modifier[0], cpp,
pixel_size,
fb->pitches[0]); fb->pitches[0]);
linear_offset -= sprsurf_offset; linear_offset -= sprsurf_offset;
...@@ -570,8 +568,7 @@ ivb_update_plane(struct drm_plane *plane, ...@@ -570,8 +568,7 @@ ivb_update_plane(struct drm_plane *plane,
if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) { if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) {
x += src_w; x += src_w;
y += src_h; y += src_h;
linear_offset += src_h * fb->pitches[0] + linear_offset += src_h * fb->pitches[0] + src_w * cpp;
src_w * pixel_size;
} }
} }
...@@ -637,7 +634,7 @@ ilk_update_plane(struct drm_plane *plane, ...@@ -637,7 +634,7 @@ ilk_update_plane(struct drm_plane *plane,
int pipe = intel_plane->pipe; int pipe = intel_plane->pipe;
u32 dvscntr, dvsscale; u32 dvscntr, dvsscale;
u32 dvssurf_offset, linear_offset; u32 dvssurf_offset, linear_offset;
int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0); int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey; const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
int crtc_x = plane_state->dst.x1; int crtc_x = plane_state->dst.x1;
int crtc_y = plane_state->dst.y1; int crtc_y = plane_state->dst.y1;
...@@ -695,10 +692,9 @@ ilk_update_plane(struct drm_plane *plane, ...@@ -695,10 +692,9 @@ ilk_update_plane(struct drm_plane *plane,
if (crtc_w != src_w || crtc_h != src_h) if (crtc_w != src_w || crtc_h != src_h)
dvsscale = DVS_SCALE_ENABLE | (src_w << 16) | src_h; dvsscale = DVS_SCALE_ENABLE | (src_w << 16) | src_h;
linear_offset = y * fb->pitches[0] + x * pixel_size; linear_offset = y * fb->pitches[0] + x * cpp;
dvssurf_offset = intel_compute_tile_offset(dev_priv, &x, &y, dvssurf_offset = intel_compute_tile_offset(dev_priv, &x, &y,
fb->modifier[0], fb->modifier[0], cpp,
pixel_size,
fb->pitches[0]); fb->pitches[0]);
linear_offset -= dvssurf_offset; linear_offset -= dvssurf_offset;
...@@ -707,7 +703,7 @@ ilk_update_plane(struct drm_plane *plane, ...@@ -707,7 +703,7 @@ ilk_update_plane(struct drm_plane *plane,
x += src_w; x += src_w;
y += src_h; y += src_h;
linear_offset += src_h * fb->pitches[0] + src_w * pixel_size; linear_offset += src_h * fb->pitches[0] + src_w * cpp;
} }
if (key->flags) { if (key->flags) {
...@@ -772,7 +768,6 @@ intel_check_sprite_plane(struct drm_plane *plane, ...@@ -772,7 +768,6 @@ intel_check_sprite_plane(struct drm_plane *plane,
int hscale, vscale; int hscale, vscale;
int max_scale, min_scale; int max_scale, min_scale;
bool can_scale; bool can_scale;
int pixel_size;
if (!fb) { if (!fb) {
state->visible = false; state->visible = false;
...@@ -894,6 +889,7 @@ intel_check_sprite_plane(struct drm_plane *plane, ...@@ -894,6 +889,7 @@ intel_check_sprite_plane(struct drm_plane *plane,
/* Check size restrictions when scaling */ /* Check size restrictions when scaling */
if (state->visible && (src_w != crtc_w || src_h != crtc_h)) { if (state->visible && (src_w != crtc_w || src_h != crtc_h)) {
unsigned int width_bytes; unsigned int width_bytes;
int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
WARN_ON(!can_scale); WARN_ON(!can_scale);
...@@ -905,9 +901,7 @@ intel_check_sprite_plane(struct drm_plane *plane, ...@@ -905,9 +901,7 @@ intel_check_sprite_plane(struct drm_plane *plane,
if (src_w < 3 || src_h < 3) if (src_w < 3 || src_h < 3)
state->visible = false; state->visible = false;
pixel_size = drm_format_plane_cpp(fb->pixel_format, 0); width_bytes = ((src_x * cpp) & 63) + src_w * cpp;
width_bytes = ((src_x * pixel_size) & 63) +
src_w * pixel_size;
if (INTEL_INFO(dev)->gen < 9 && (src_w > 2048 || src_h > 2048 || if (INTEL_INFO(dev)->gen < 9 && (src_w > 2048 || src_h > 2048 ||
width_bytes > 4096 || fb->pitches[0] > 4096)) { width_bytes > 4096 || fb->pitches[0] > 4096)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7