|
@@ -204,7 +204,6 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
|
|
const struct rcar_du_format_info *format;
|
|
const struct rcar_du_format_info *format;
|
|
unsigned int max_pitch;
|
|
unsigned int max_pitch;
|
|
unsigned int align;
|
|
unsigned int align;
|
|
- unsigned int bpp;
|
|
|
|
unsigned int i;
|
|
unsigned int i;
|
|
|
|
|
|
format = rcar_du_format_info(mode_cmd->pixel_format);
|
|
format = rcar_du_format_info(mode_cmd->pixel_format);
|
|
@@ -214,20 +213,32 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
|
|
return ERR_PTR(-EINVAL);
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
}
|
|
|
|
|
|
- /*
|
|
|
|
- * The pitch and alignment constraints are expressed in pixels on the
|
|
|
|
- * hardware side and in bytes in the DRM API.
|
|
|
|
- */
|
|
|
|
- bpp = format->planes == 1 ? format->bpp / 8 : 1;
|
|
|
|
- max_pitch = 4096 * bpp;
|
|
|
|
|
|
+ if (rcdu->info->gen < 3) {
|
|
|
|
+ /*
|
|
|
|
+ * On Gen2 the DU limits the pitch to 4095 pixels and requires
|
|
|
|
+ * buffers to be aligned to a 16 pixels boundary (or 128 bytes
|
|
|
|
+ * on some platforms).
|
|
|
|
+ */
|
|
|
|
+ unsigned int bpp = format->planes == 1 ? format->bpp / 8 : 1;
|
|
|
|
|
|
- if (rcar_du_needs(rcdu, RCAR_DU_QUIRK_ALIGN_128B))
|
|
|
|
- align = 128;
|
|
|
|
- else
|
|
|
|
- align = 16 * bpp;
|
|
|
|
|
|
+ max_pitch = 4095 * bpp;
|
|
|
|
+
|
|
|
|
+ if (rcar_du_needs(rcdu, RCAR_DU_QUIRK_ALIGN_128B))
|
|
|
|
+ align = 128;
|
|
|
|
+ else
|
|
|
|
+ align = 16 * bpp;
|
|
|
|
+ } else {
|
|
|
|
+ /*
|
|
|
|
+ * On Gen3 the memory interface is handled by the VSP that
|
|
|
|
+ * limits the pitch to 65535 bytes and has no alignment
|
|
|
|
+ * constraint.
|
|
|
|
+ */
|
|
|
|
+ max_pitch = 65535;
|
|
|
|
+ align = 1;
|
|
|
|
+ }
|
|
|
|
|
|
if (mode_cmd->pitches[0] & (align - 1) ||
|
|
if (mode_cmd->pitches[0] & (align - 1) ||
|
|
- mode_cmd->pitches[0] >= max_pitch) {
|
|
|
|
|
|
+ mode_cmd->pitches[0] > max_pitch) {
|
|
dev_dbg(dev->dev, "invalid pitch value %u\n",
|
|
dev_dbg(dev->dev, "invalid pitch value %u\n",
|
|
mode_cmd->pitches[0]);
|
|
mode_cmd->pitches[0]);
|
|
return ERR_PTR(-EINVAL);
|
|
return ERR_PTR(-EINVAL);
|