The number of bits per pixel is identical for all planes, don't store
multiple copies.
Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
drivers/gpu/drm/omapdrm/omap_fb.c | 53 ++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c
b/drivers/gpu/drm/omapdrm/omap_fb.c
index a35e1e052907..2cc9f15fe439 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -31,33 +31,31 @@
struct format {
enum omap_color_mode dss_format;
uint32_t pixel_format;
- struct {
- int stride_bpp; /* this times width is stride */
- int sub_y; /* sub-sample in y dimension */
- } planes[2];
+ int stride_bpp; /* this times width is stride */
+ int sub_y[2]; /* sub-sample in y dimension (per
plane) */
bool yuv;
};
static const struct format formats[] = {
/* 16bpp [A]RGB: */
- { OMAP_DSS_COLOR_RGB16, DRM_FORMAT_RGB565, {{2, 1}}, false },
/* RGB16-565 */
- { OMAP_DSS_COLOR_RGB12U, DRM_FORMAT_RGBX4444, {{2, 1}}, false },
/* RGB12x-4444 */
- { OMAP_DSS_COLOR_RGBX16, DRM_FORMAT_XRGB4444, {{2, 1}}, false },
/* xRGB12-4444 */
- { OMAP_DSS_COLOR_RGBA16, DRM_FORMAT_RGBA4444, {{2, 1}}, false },
/* RGBA12-4444 */
- { OMAP_DSS_COLOR_ARGB16, DRM_FORMAT_ARGB4444, {{2, 1}}, false },
/* ARGB16-4444 */
- { OMAP_DSS_COLOR_XRGB16_1555, DRM_FORMAT_XRGB1555, {{2, 1}}, false },
/* xRGB15-1555 */
- { OMAP_DSS_COLOR_ARGB16_1555, DRM_FORMAT_ARGB1555, {{2, 1}}, false },
/* ARGB16-1555 */
+ { OMAP_DSS_COLOR_RGB16, DRM_FORMAT_RGB565, 2, { 1, 0 }, false
}, /* RGB16-565 */
+ { OMAP_DSS_COLOR_RGB12U, DRM_FORMAT_RGBX4444, 2, { 1, 0 }, false
}, /* RGB12x-4444 */
+ { OMAP_DSS_COLOR_RGBX16, DRM_FORMAT_XRGB4444, 2, { 1, 0 }, false
}, /* xRGB12-4444 */
+ { OMAP_DSS_COLOR_RGBA16, DRM_FORMAT_RGBA4444, 2, { 1, 0 }, false
}, /* RGBA12-4444 */
+ { OMAP_DSS_COLOR_ARGB16, DRM_FORMAT_ARGB4444, 2, { 1, 0 }, false
}, /* ARGB16-4444 */
+ { OMAP_DSS_COLOR_XRGB16_1555, DRM_FORMAT_XRGB1555, 2, { 1, 0 }, false
}, /* xRGB15-1555 */
+ { OMAP_DSS_COLOR_ARGB16_1555, DRM_FORMAT_ARGB1555, 2, { 1, 0 }, false
}, /* ARGB16-1555 */
/* 24bpp RGB: */
- { OMAP_DSS_COLOR_RGB24P, DRM_FORMAT_RGB888, {{3, 1}}, false },
/* RGB24-888 */
+ { OMAP_DSS_COLOR_RGB24P, DRM_FORMAT_RGB888, 3, { 1, 0 }, false
}, /* RGB24-888 */
/* 32bpp [A]RGB: */
- { OMAP_DSS_COLOR_RGBX32, DRM_FORMAT_RGBX8888, {{4, 1}}, false },
/* RGBx24-8888 */
- { OMAP_DSS_COLOR_RGB24U, DRM_FORMAT_XRGB8888, {{4, 1}}, false },
/* xRGB24-8888 */
- { OMAP_DSS_COLOR_RGBA32, DRM_FORMAT_RGBA8888, {{4, 1}}, false },
/* RGBA32-8888 */
- { OMAP_DSS_COLOR_ARGB32, DRM_FORMAT_ARGB8888, {{4, 1}}, false },
/* ARGB32-8888 */
+ { OMAP_DSS_COLOR_RGBX32, DRM_FORMAT_RGBX8888, 4, { 1, 0 }, false
}, /* RGBx24-8888 */
+ { OMAP_DSS_COLOR_RGB24U, DRM_FORMAT_XRGB8888, 4, { 1, 0 }, false
}, /* xRGB24-8888 */
+ { OMAP_DSS_COLOR_RGBA32, DRM_FORMAT_RGBA8888, 4, { 1, 0 }, false
}, /* RGBA32-8888 */
+ { OMAP_DSS_COLOR_ARGB32, DRM_FORMAT_ARGB8888, 4, { 1, 0 }, false
}, /* ARGB32-8888 */
/* YUV: */
- { OMAP_DSS_COLOR_NV12, DRM_FORMAT_NV12, {{1, 1}, {1, 2}},
true },
- { OMAP_DSS_COLOR_YUV2, DRM_FORMAT_YUYV, {{2, 1}}, true },
- { OMAP_DSS_COLOR_UYVY, DRM_FORMAT_UYVY, {{2, 1}}, true },
+ { OMAP_DSS_COLOR_NV12, DRM_FORMAT_NV12, 1, { 1, 2 }, true },
+ { OMAP_DSS_COLOR_YUV2, DRM_FORMAT_YUYV, 2, { 1, 0 }, true },
+ { OMAP_DSS_COLOR_UYVY, DRM_FORMAT_UYVY, 2, { 1, 0 }, true },
};
/* convert from overlay's pixel formats bitmask to an array of fourcc's */
@@ -138,9 +136,8 @@ static uint32_t get_linear_addr(struct plane *plane,
{
uint32_t offset;
- offset = plane->offset +
- (x * format->planes[n].stride_bpp) +
- (y * plane->pitch / format->planes[n].sub_y);
+ offset = plane->offset + x * format->stride_bpp
+ + y * plane->pitch / format->sub_y[n];
return plane->paddr + offset;
}
@@ -237,7 +234,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer
*fb,
}
/* convert to pixels: */
- info->screen_width /= format->planes[0].stride_bpp;
+ info->screen_width /= format->stride_bpp;
if (format->dss_format == OMAP_DSS_COLOR_NV12) {
plane = &omap_fb->planes[1];
@@ -433,22 +430,22 @@ struct drm_framebuffer *omap_framebuffer_init(struct
drm_device *dev,
struct plane *plane = &omap_fb->planes[i];
int size, pitch = mode_cmd->pitches[i];
- if (pitch < (mode_cmd->width * format->planes[i].stride_bpp)) {
+ if (pitch < (mode_cmd->width * format->stride_bpp)) {
dev_err(dev->dev, "provided buffer pitch is too small!
%d < %d\n",
- pitch, mode_cmd->width *
format->planes[i].stride_bpp);
+ pitch, mode_cmd->width *
format->stride_bpp);
ret = -EINVAL;
goto fail;
}
- if (pitch % format->planes[i].stride_bpp != 0) {
+ if (pitch % format->stride_bpp != 0) {
dev_err(dev->dev,
"buffer pitch (%d bytes) is not a multiple of
pixel size (%d bytes)\n",
- pitch, format->planes[i].stride_bpp);
+ pitch, format->stride_bpp);
ret = -EINVAL;
goto fail;
}
- size = pitch * mode_cmd->height / format->planes[i].sub_y;
+ size = pitch * mode_cmd->height / format->sub_y[i];
if (size > (omap_gem_mmap_size(bos[i]) - mode_cmd->offsets[i]))
{
dev_err(dev->dev, "provided buffer object is too small!
%d < %d\n",
--
2.7.3
