.. | .. |
---|
32 | 32 | struct drm_device *dev, |
---|
33 | 33 | struct drm_mode_create_dumb *args) |
---|
34 | 34 | { |
---|
35 | | - struct qxl_device *qdev = dev->dev_private; |
---|
| 35 | + struct qxl_device *qdev = to_qxl(dev); |
---|
36 | 36 | struct qxl_bo *qobj; |
---|
37 | 37 | uint32_t handle; |
---|
38 | 38 | int r; |
---|
39 | 39 | struct qxl_surface surf; |
---|
40 | 40 | uint32_t pitch, format; |
---|
| 41 | + |
---|
41 | 42 | pitch = args->width * ((args->bpp + 1) / 8); |
---|
42 | 43 | args->size = pitch * args->height; |
---|
43 | 44 | args->size = ALIGN(args->size, PAGE_SIZE); |
---|
.. | .. |
---|
52 | 53 | default: |
---|
53 | 54 | return -EINVAL; |
---|
54 | 55 | } |
---|
55 | | - |
---|
| 56 | + |
---|
56 | 57 | surf.width = args->width; |
---|
57 | 58 | surf.height = args->height; |
---|
58 | 59 | surf.stride = pitch; |
---|
.. | .. |
---|
60 | 61 | surf.data = 0; |
---|
61 | 62 | |
---|
62 | 63 | r = qxl_gem_object_create_with_handle(qdev, file_priv, |
---|
63 | | - QXL_GEM_DOMAIN_VRAM, |
---|
| 64 | + QXL_GEM_DOMAIN_SURFACE, |
---|
64 | 65 | args->size, &surf, &qobj, |
---|
65 | 66 | &handle); |
---|
66 | 67 | if (r) |
---|
.. | .. |
---|
84 | 85 | return -ENOENT; |
---|
85 | 86 | qobj = gem_to_qxl_bo(gobj); |
---|
86 | 87 | *offset_p = qxl_bo_mmap_offset(qobj); |
---|
87 | | - drm_gem_object_put_unlocked(gobj); |
---|
| 88 | + drm_gem_object_put(gobj); |
---|
88 | 89 | return 0; |
---|
89 | 90 | } |
---|