diff options
| author | Zach Reizner <zachr@google.com> | 2014-10-29 21:04:24 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-20 04:42:46 +0300 |
| commit | 8975626ea35adcca561f8a81dedccfbc5dd8ec72 (patch) | |
| tree | acf4290d5b83894212eb71dc51d2a5c088fa67b3 /drivers/gpu/drm/cirrus/cirrus_fbdev.c | |
| parent | ebfdd6d5e837bd1c170b9bdd749fee2a4183a7f5 (diff) | |
| download | linux-8975626ea35adcca561f8a81dedccfbc5dd8ec72.tar.xz | |
drm/cirrus: allow 32bpp framebuffers for cirrus drm
This patch allows framebuffers for cirrus to be created with
32bpp pixel formats provided that they do not violate certain
restrictions of the cirrus hardware.
v2: Use pci resource length for vram size.
Signed-off-by: Zach Reizner <zachr@google.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/cirrus/cirrus_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/cirrus/cirrus_fbdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c index d231b1c317af..502a89eb54b5 100644 --- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c +++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c @@ -139,6 +139,7 @@ static int cirrusfb_create_object(struct cirrus_fbdev *afbdev, struct drm_gem_object **gobj_p) { struct drm_device *dev = afbdev->helper.dev; + struct cirrus_device *cdev = dev->dev_private; u32 bpp, depth; u32 size; struct drm_gem_object *gobj; @@ -146,8 +147,10 @@ static int cirrusfb_create_object(struct cirrus_fbdev *afbdev, int ret = 0; drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp); - if (bpp > 24) + if (!cirrus_check_framebuffer(cdev, mode_cmd->width, mode_cmd->height, + bpp, mode_cmd->pitches[0])) return -EINVAL; + size = mode_cmd->pitches[0] * mode_cmd->height; ret = cirrus_gem_create(dev, size, true, &gobj); if (ret) |