mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
drm/i915: Use a common function for computing the fb height alignment
If we need to change the fb height constraints, it sounds like a good idea to have to do it in one place only. v2: v2: Rebase on top of Ander's "Make intel_crtc->config a pointer" Reviewed-By: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (v1) Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
49af449b45
commit
ec2c981e62
3 changed files with 15 additions and 9 deletions
|
@ -2188,11 +2188,12 @@ static bool need_vtd_wa(struct drm_device *dev)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int intel_align_height(struct drm_device *dev, int height, bool tiled)
|
int
|
||||||
|
intel_fb_align_height(struct drm_device *dev, int height, unsigned int tiling)
|
||||||
{
|
{
|
||||||
int tile_height;
|
int tile_height;
|
||||||
|
|
||||||
tile_height = tiled ? (IS_GEN2(dev) ? 16 : 8) : 1;
|
tile_height = tiling ? (IS_GEN2(dev) ? 16 : 8) : 1;
|
||||||
return ALIGN(height, tile_height);
|
return ALIGN(height, tile_height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6590,8 +6591,9 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc,
|
||||||
val = I915_READ(DSPSTRIDE(pipe));
|
val = I915_READ(DSPSTRIDE(pipe));
|
||||||
crtc->base.primary->fb->pitches[0] = val & 0xffffffc0;
|
crtc->base.primary->fb->pitches[0] = val & 0xffffffc0;
|
||||||
|
|
||||||
aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
|
aligned_height = intel_fb_align_height(dev,
|
||||||
plane_config->tiling);
|
crtc->base.primary->fb->height,
|
||||||
|
plane_config->tiling);
|
||||||
|
|
||||||
plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
|
plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
|
||||||
aligned_height);
|
aligned_height);
|
||||||
|
@ -7644,8 +7646,9 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc,
|
||||||
val = I915_READ(DSPSTRIDE(pipe));
|
val = I915_READ(DSPSTRIDE(pipe));
|
||||||
crtc->base.primary->fb->pitches[0] = val & 0xffffffc0;
|
crtc->base.primary->fb->pitches[0] = val & 0xffffffc0;
|
||||||
|
|
||||||
aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
|
aligned_height = intel_fb_align_height(dev,
|
||||||
plane_config->tiling);
|
crtc->base.primary->fb->height,
|
||||||
|
plane_config->tiling);
|
||||||
|
|
||||||
plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
|
plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
|
||||||
aligned_height);
|
aligned_height);
|
||||||
|
@ -12609,8 +12612,8 @@ static int intel_framebuffer_init(struct drm_device *dev,
|
||||||
if (mode_cmd->offsets[0] != 0)
|
if (mode_cmd->offsets[0] != 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
aligned_height = intel_align_height(dev, mode_cmd->height,
|
aligned_height = intel_fb_align_height(dev, mode_cmd->height,
|
||||||
obj->tiling_mode);
|
obj->tiling_mode);
|
||||||
/* FIXME drm helper for size checks (especially planar formats)? */
|
/* FIXME drm helper for size checks (especially planar formats)? */
|
||||||
if (obj->base.size < aligned_height * mode_cmd->pitches[0])
|
if (obj->base.size < aligned_height * mode_cmd->pitches[0])
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -872,6 +872,8 @@ void intel_frontbuffer_flip(struct drm_device *dev,
|
||||||
intel_frontbuffer_flush(dev, frontbuffer_bits);
|
intel_frontbuffer_flush(dev, frontbuffer_bits);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int intel_fb_align_height(struct drm_device *dev, int height,
|
||||||
|
unsigned int tiling);
|
||||||
void intel_fb_obj_flush(struct drm_i915_gem_object *obj, bool retire);
|
void intel_fb_obj_flush(struct drm_i915_gem_object *obj, bool retire);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -593,7 +593,8 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
|
||||||
}
|
}
|
||||||
|
|
||||||
cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay;
|
cur_size = intel_crtc->config->base.adjusted_mode.crtc_vdisplay;
|
||||||
cur_size = ALIGN(cur_size, plane_config->tiling ? (IS_GEN2(dev) ? 16 : 8) : 1);
|
cur_size = intel_fb_align_height(dev, cur_size,
|
||||||
|
plane_config->tiling);
|
||||||
cur_size *= fb->base.pitches[0];
|
cur_size *= fb->base.pitches[0];
|
||||||
DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n",
|
DRM_DEBUG_KMS("pipe %c area: %dx%d, bpp: %d, size: %d\n",
|
||||||
pipe_name(intel_crtc->pipe),
|
pipe_name(intel_crtc->pipe),
|
||||||
|
|
Loading…
Reference in a new issue