Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 287409
b: refs/heads/master
c: ae43d7c
h: refs/heads/master
i:
  287407: 752ae62
v: v3
  • Loading branch information
Rob Clark authored and Greg Kroah-Hartman committed Feb 8, 2012
1 parent dc501b1 commit 2ed4164
Show file tree
Hide file tree
Showing 4 changed files with 144 additions and 46 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ff4f38765d0e3bcc7d992d07cb27c37adb9b16ba
refs/heads/master: ae43d7ca4047b126adedcf7028c1ff99ed18703c
30 changes: 28 additions & 2 deletions trunk/drivers/staging/omapdrm/omap_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <linux/module.h>
#include <linux/types.h>
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include "omap_drm.h"
#include "omap_priv.h"

Expand Down Expand Up @@ -80,9 +81,9 @@ void omap_connector_flush(struct drm_connector *connector,
int x, int y, int w, int h);

struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
struct drm_file *file, struct drm_mode_fb_cmd *mode_cmd);
struct drm_file *file, struct drm_mode_fb_cmd2 *mode_cmd);
struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
struct drm_mode_fb_cmd *mode_cmd, struct drm_gem_object *bo);
struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos);
struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb);
int omap_framebuffer_get_buffer(struct drm_framebuffer *fb, int x, int y,
void **vaddr, dma_addr_t *paddr, unsigned int *screen_width);
Expand Down Expand Up @@ -132,4 +133,29 @@ static inline int align_pitch(int pitch, int width, int bpp)
return ALIGN(pitch, 8 * bytespp);
}

/* should these be made into common util helpers?
*/

static inline int objects_lookup(struct drm_device *dev,
struct drm_file *filp, uint32_t pixel_format,
struct drm_gem_object **bos, uint32_t *handles)
{
int i, n = drm_format_num_planes(pixel_format);

for (i = 0; i < n; i++) {
bos[i] = drm_gem_object_lookup(dev, filp, handles[i]);
if (!bos[i]) {
goto fail;
}
}

return 0;

fail:
while (--i > 0) {
drm_gem_object_unreference_unlocked(bos[i]);
}
return -ENOENT;
}

#endif /* __OMAP_DRV_H__ */
103 changes: 80 additions & 23 deletions trunk/drivers/staging/omapdrm/omap_fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,51 @@
#include "drm_crtc.h"
#include "drm_crtc_helper.h"


/*
* framebuffer funcs
*/

/* per-format info: */
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[4];
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 */
/* 24bpp RGB: */
{ OMAP_DSS_COLOR_RGB24P, DRM_FORMAT_RGB888, {{3, 1}}, 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 */
/* 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 },
};

#define to_omap_framebuffer(x) container_of(x, struct omap_framebuffer, base)

struct omap_framebuffer {
struct drm_framebuffer base;
struct drm_gem_object *bo;
int size;
dma_addr_t paddr;
const struct format *format;
};

static int omap_framebuffer_create_handle(struct drm_framebuffer *fb,
Expand Down Expand Up @@ -91,7 +124,7 @@ int omap_framebuffer_get_buffer(struct drm_framebuffer *fb, int x, int y,
int bpp = fb->bits_per_pixel / 8;
unsigned long offset;

offset = (x * bpp) + (y * fb->pitch);
offset = (x * bpp) + (y * fb->pitches[0]);

if (vaddr) {
void *bo_vaddr = omap_gem_vaddr(omap_fb->bo);
Expand All @@ -105,7 +138,7 @@ int omap_framebuffer_get_buffer(struct drm_framebuffer *fb, int x, int y,
}

*paddr = omap_fb->paddr + offset;
*screen_width = fb->pitch / bpp;
*screen_width = fb->pitches[0] / bpp;

return omap_fb->size - offset;
}
Expand Down Expand Up @@ -171,39 +204,61 @@ void omap_framebuffer_flush(struct drm_framebuffer *fb,
}

struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
struct drm_file *file, struct drm_mode_fb_cmd *mode_cmd)
struct drm_file *file, struct drm_mode_fb_cmd2 *mode_cmd)
{
struct drm_gem_object *bo;
struct drm_gem_object *bos[4];
struct drm_framebuffer *fb;
bo = drm_gem_object_lookup(dev, file, mode_cmd->handle);
if (!bo) {
return ERR_PTR(-ENOENT);
}
fb = omap_framebuffer_init(dev, mode_cmd, bo);
if (!fb) {
return ERR_PTR(-ENOMEM);
int ret;

ret = objects_lookup(dev, file, mode_cmd->pixel_format,
bos, mode_cmd->handles);
if (ret)
return ERR_PTR(ret);

fb = omap_framebuffer_init(dev, mode_cmd, bos);
if (IS_ERR(fb)) {
int i, n = drm_format_num_planes(mode_cmd->pixel_format);
for (i = 0; i < n; i++)
drm_gem_object_unreference_unlocked(bos[i]);
return fb;
}
return fb;
}

struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
struct drm_mode_fb_cmd *mode_cmd, struct drm_gem_object *bo)
struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos)
{
struct omap_framebuffer *omap_fb;
struct drm_framebuffer *fb = NULL;
int size, ret;
const struct format *format = NULL;
int i, size, ret;

DBG("create framebuffer: dev=%p, mode_cmd=%p (%dx%d@%d)",
DBG("create framebuffer: dev=%p, mode_cmd=%p (%dx%d@%4.4s)",
dev, mode_cmd, mode_cmd->width, mode_cmd->height,
mode_cmd->bpp);
(char *)&mode_cmd->pixel_format);

for (i = 0; i < ARRAY_SIZE(formats); i++) {
if (formats[i].pixel_format == mode_cmd->pixel_format) {
format = &formats[i];
break;
}
}

if (!format) {
dev_err(dev->dev, "unsupported pixel format: %4.4s\n",
(char *)&mode_cmd->pixel_format);
ret = -EINVAL;
goto fail;
}

/* in case someone tries to feed us a completely bogus stride: */
mode_cmd->pitch = align_pitch(mode_cmd->pitch,
mode_cmd->width, mode_cmd->bpp);
mode_cmd->pitches[0] = align_pitch(mode_cmd->pitches[0],
mode_cmd->width, format->planes[0].stride_bpp);

omap_fb = kzalloc(sizeof(*omap_fb), GFP_KERNEL);
if (!omap_fb) {
dev_err(dev->dev, "could not allocate fb\n");
ret = -ENOMEM;
goto fail;
}

Expand All @@ -216,17 +271,19 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,

DBG("create: FB ID: %d (%p)", fb->base.id, fb);

size = PAGE_ALIGN(mode_cmd->pitch * mode_cmd->height);
size = PAGE_ALIGN(mode_cmd->pitches[0] * mode_cmd->height);

if (size > bo->size) {
if (size > bos[0]->size) {
dev_err(dev->dev, "provided buffer object is too small!\n");
ret = -EINVAL;
goto fail;
}

omap_fb->bo = bo;
omap_fb->bo = bos[0];
omap_fb->size = size;

if (omap_gem_get_paddr(bo, &omap_fb->paddr, true)) {
ret = omap_gem_get_paddr(bos[0], &omap_fb->paddr, true);
if (ret) {
dev_err(dev->dev, "could not map (paddr)!\n");
goto fail;
}
Expand All @@ -239,5 +296,5 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
if (fb) {
omap_framebuffer_destroy(fb);
}
return NULL;
return ERR_PTR(ret);
}
55 changes: 35 additions & 20 deletions trunk/drivers/staging/omapdrm/omap_fbdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
struct drm_framebuffer *fb = NULL;
union omap_gem_size gsize;
struct fb_info *fbi = NULL;
struct drm_mode_fb_cmd mode_cmd = {0};
struct drm_mode_fb_cmd2 mode_cmd = {0};
dma_addr_t paddr;
void __iomem *vaddr;
int size, screen_width;
int ret;

/* only doing ARGB32 since this is what is needed to alpha-blend
Expand All @@ -145,36 +143,56 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
sizes->surface_height, sizes->surface_bpp,
sizes->fb_width, sizes->fb_height);

mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
sizes->surface_depth);

mode_cmd.width = sizes->surface_width;
mode_cmd.height = sizes->surface_height;

mode_cmd.bpp = sizes->surface_bpp;
mode_cmd.depth = sizes->surface_depth;

mode_cmd.pitch = align_pitch(
mode_cmd.width * ((mode_cmd.bpp + 7) / 8),
mode_cmd.width, mode_cmd.bpp);
mode_cmd.pitches[0] = align_pitch(
mode_cmd.width * ((sizes->surface_bpp + 7) / 8),
mode_cmd.width, sizes->surface_bpp);

fbdev->ywrap_enabled = priv->has_dmm && ywrap_enabled;
if (fbdev->ywrap_enabled) {
/* need to align pitch to page size if using DMM scrolling */
mode_cmd.pitch = ALIGN(mode_cmd.pitch, PAGE_SIZE);
mode_cmd.pitches[0] = ALIGN(mode_cmd.pitches[0], PAGE_SIZE);
}

/* allocate backing bo */
gsize = (union omap_gem_size){
.bytes = PAGE_ALIGN(mode_cmd.pitch * mode_cmd.height),
.bytes = PAGE_ALIGN(mode_cmd.pitches[0] * mode_cmd.height),
};
DBG("allocating %d bytes for fb %d", gsize.bytes, dev->primary->index);
fbdev->bo = omap_gem_new(dev, gsize, OMAP_BO_SCANOUT | OMAP_BO_WC);
if (!fbdev->bo) {
dev_err(dev->dev, "failed to allocate buffer object\n");
ret = -ENOMEM;
goto fail;
}

fb = omap_framebuffer_init(dev, &mode_cmd, fbdev->bo);
if (!fb) {
fb = omap_framebuffer_init(dev, &mode_cmd, &fbdev->bo);
if (IS_ERR(fb)) {
dev_err(dev->dev, "failed to allocate fb\n");
/* note: if fb creation failed, we can't rely on fb destroy
* to unref the bo:
*/
drm_gem_object_unreference(fbdev->bo);
ret = PTR_ERR(fb);
goto fail;
}

/* note: this keeps the bo pinned.. which is perhaps not ideal,
* but is needed as long as we use fb_mmap() to mmap to userspace
* (since this happens using fix.smem_start). Possibly we could
* implement our own mmap using GEM mmap support to avoid this
* (non-tiled buffer doesn't need to be pinned for fbcon to write
* to it). Then we just need to be sure that we are able to re-
* pin it in case of an opps.
*/
ret = omap_gem_get_paddr(fbdev->bo, &paddr, true);
if (ret) {
dev_err(dev->dev, "could not map (paddr)!\n");
ret = -ENOMEM;
goto fail;
}
Expand Down Expand Up @@ -206,18 +224,15 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
goto fail_unlock;
}

drm_fb_helper_fill_fix(fbi, fb->pitch, fb->depth);
drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);
drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);

size = omap_framebuffer_get_buffer(fb, 0, 0,
&vaddr, &paddr, &screen_width);

dev->mode_config.fb_base = paddr;

fbi->screen_base = vaddr;
fbi->screen_size = size;
fbi->screen_base = omap_gem_vaddr(fbdev->bo);
fbi->screen_size = fbdev->bo->size;
fbi->fix.smem_start = paddr;
fbi->fix.smem_len = size;
fbi->fix.smem_len = fbdev->bo->size;

/* if we have DMM, then we can use it for scrolling by just
* shuffling pages around in DMM rather than doing sw blit.
Expand Down

0 comments on commit 2ed4164

Please sign in to comment.