iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/gma500: port framebuffer to new plane interface.

Browse Source 
This takes over the staging change into the mainline driver.

Fixes -next part one.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2011-11-28 14:08:46 +00:00
parent 15b273bb26
commit a9a644ac9e
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/gpu/drm/gma500/framebuffer.c
View File

@ -32,6 +32,7 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm.h> #include <drm/drm.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
#include "psb_drv.h" #include "psb_drv.h"
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
@ -240,14 +241,17 @@ static struct fb_ops psbfb_unaccel_ops = {
*/ */
static int psb_framebuffer_init(struct drm_device *dev, static int psb_framebuffer_init(struct drm_device *dev,
struct psb_framebuffer *fb, struct psb_framebuffer *fb,
struct drm_mode_fb_cmd *mode_cmd, struct drm_mode_fb_cmd2 *mode_cmd,
struct gtt_range *gt) struct gtt_range *gt)
{ {
u32 bpp, depth;
int ret; int ret;
if (mode_cmd->pitch & 63) drm_helper_get_fb_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
if (mode_cmd->pitches[0] & 63)
return -EINVAL; return -EINVAL;
switch (mode_cmd->bpp) { switch (bpp) {
case 8: case 8:
case 16: case 16:
case 24: case 24:
@ -280,7 +284,7 @@ static int psb_framebuffer_init(struct drm_device *dev,
static struct drm_framebuffer *psb_framebuffer_create static struct drm_framebuffer *psb_framebuffer_create
(struct drm_device *dev, (struct drm_device *dev,
struct drm_mode_fb_cmd *mode_cmd, struct drm_mode_fb_cmd2 *mode_cmd,
struct gtt_range *gt) struct gtt_range *gt)
{ {
struct psb_framebuffer *fb; struct psb_framebuffer *fb;
@ -352,25 +356,26 @@ static int psbfb_create(struct psb_fbdev *fbdev,
struct fb_info *info; struct fb_info *info;
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
struct psb_framebuffer *psbfb = &fbdev->pfb; struct psb_framebuffer *psbfb = &fbdev->pfb;
struct drm_mode_fb_cmd mode_cmd; struct drm_mode_fb_cmd2 mode_cmd;
struct device *device = &dev->pdev->dev; struct device *device = &dev->pdev->dev;
int size; int size;
int ret; int ret;
struct gtt_range *backing; struct gtt_range *backing;
u32 bpp, depth;
mode_cmd.width = sizes->surface_width; mode_cmd.width = sizes->surface_width;
mode_cmd.height = sizes->surface_height; mode_cmd.height = sizes->surface_height;
mode_cmd.bpp = sizes->surface_bpp; bpp = sizes->surface_bpp;
/* No 24bit packed */ /* No 24bit packed */
if (mode_cmd.bpp == 24) if (bpp == 24)
mode_cmd.bpp = 32; bpp = 32;
/* HW requires pitch to be 64 byte aligned */ /* HW requires pitch to be 64 byte aligned */
mode_cmd.pitch = ALIGN(mode_cmd.width * ((mode_cmd.bpp + 7) / 8), 64); mode_cmd.pitches[0] = ALIGN(mode_cmd.width * ((bpp + 7) / 8), 64);
mode_cmd.depth = sizes->surface_depth; depth = sizes->surface_depth;
size = mode_cmd.pitch * mode_cmd.height; size = mode_cmd.pitches[0] * mode_cmd.height;
size = ALIGN(size, PAGE_SIZE); size = ALIGN(size, PAGE_SIZE);
/* Allocate the framebuffer in the GTT with stolen page backing */ /* Allocate the framebuffer in the GTT with stolen page backing */
@ -387,6 +392,8 @@ static int psbfb_create(struct psb_fbdev *fbdev,
} }
info->par = fbdev; info->par = fbdev;
mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth);
ret = psb_framebuffer_init(dev, psbfb, &mode_cmd, backing); ret = psb_framebuffer_init(dev, psbfb, &mode_cmd, backing);
if (ret) if (ret)
goto out_unref; goto out_unref;
@ -485,7 +492,7 @@ out_err1:
*/ */
static struct drm_framebuffer *psb_user_framebuffer_create static struct drm_framebuffer *psb_user_framebuffer_create
(struct drm_device *dev, struct drm_file *filp, (struct drm_device *dev, struct drm_file *filp,
struct drm_mode_fb_cmd *cmd) struct drm_mode_fb_cmd2 *cmd)
{ {
struct gtt_range *r; struct gtt_range *r;
struct drm_gem_object *obj; struct drm_gem_object *obj;
@ -494,7 +501,7 @@ static struct drm_framebuffer *psb_user_framebuffer_create
* Find the GEM object and thus the gtt range object that is * Find the GEM object and thus the gtt range object that is
* to back this space * to back this space
*/ */
obj = drm_gem_object_lookup(dev, filp, cmd->handle); obj = drm_gem_object_lookup(dev, filp, cmd->handles[0]);
if (obj == NULL) if (obj == NULL)
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);