| @@ -49,14 +49,16 @@ cirrus_user_framebuffer_create(struct drm_device *dev, · 48 unmodified lines |
| 49 | 49 | struct drm_file *filp, |
| 50 | 50 | struct drm_mode_fb_cmd2 *mode_cmd) |
| 51 | 51 | { |
| 52 | + struct cirrus_device *cdev = dev->dev_private; |
| 52 | 53 | struct drm_gem_object *obj; |
| 53 | 54 | struct cirrus_framebuffer *cirrus_fb; |
| 54 | 55 | int ret; |
| 55 | 56 | u32 bpp, depth; |
| 56 | 57 | |
| 57 | 58 | drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp); |
| 58 | | − /* cirrus can't handle > 24bpp framebuffers at all */ |
| 59 | | − if (bpp > 24) |
| 59 | + |
| 60 | + if (!cirrus_check_framebuffer(cdev, mode_cmd->width, mode_cmd->height, |
| 61 | + bpp, mode_cmd->pitches[0])) |
| 60 | 62 | return ERR_PTR(-EINVAL); |
| 61 | 63 | |
| 62 | 64 | obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]); |
| @@ -96,8 +98,7 @@ static int cirrus_vram_init(struct cirrus_device *cdev) · 33 unmodified lines |
| 96 | 98 | { |
| 97 | 99 | /* BAR 0 is VRAM */ |
| 98 | 100 | cdev->mc.vram_base = pci_resource_start(cdev->dev->pdev, 0); |
| 99 | | − /* We have 4MB of VRAM */ |
| 100 | | − cdev->mc.vram_size = 4 * 1024 * 1024; |
| 101 | + cdev->mc.vram_size = pci_resource_len(cdev->dev->pdev, 0); |
| 101 | 102 | |
| 102 | 103 | if (!request_mem_region(cdev->mc.vram_base, cdev->mc.vram_size, |
| 103 | 104 | "cirrusdrmfb_vram")) { |
| @@ -312,3 +313,21 @@ out_unlock: · 208 unmodified lines |
| 312 | 313 | return ret; |
| 313 | 314 | |
| 314 | 315 | } |
| 316 | + |
| 317 | +bool cirrus_check_framebuffer(struct cirrus_device *cdev, int width, int height, |
| 318 | + int bpp, int pitch) |
| 319 | +{ |
| 320 | + const int max_pitch = 0x1FF << 3; /* (4096 - 1) & ~111b bytes */ |
| 321 | + const int max_size = cdev->mc.vram_size; |
| 322 | + |
| 323 | + if (bpp > 32) |
| 324 | + return false; |
| 325 | + |
| 326 | + if (pitch > max_pitch) |
| 327 | + return false; |
| 328 | + |
| 329 | + if (pitch * height > max_size) |
| 330 | + return false; |
| 331 | + |
| 332 | + return true; |
| 333 | +} |