![Ville Syrjälä](/assets/img/avatar_default.png)
Replace uses of fb->bits_per_pixel with fb->format->cpp[0]*8. Less duplicated information is a good thing. Note that I didn't put parens around the cpp*8 in the below cocci script, on account of not wanting spurious parens all over the place. Instead I did the unsafe way, and tried to look over the entire diff to spot if any dangerous expressions were produced. I didn't see any. There are some cases where previously the code did X*bpp/8, so the division happened after the multiplication. Those are now just X*cpp so the division effectively happens before the multiplication, but that is perfectly fine since bpp is always a multiple of 8. @@ struct drm_framebuffer *FB; expression E; @@ drm_helper_mode_fill_fb_struct(...) { ... - FB->bits_per_pixel = E; ... } @@ struct drm_framebuffer *FB; expression E; @@ i9xx_get_initial_plane_config(...) { ... - FB->bits_per_pixel = E; ... } @@ struct drm_framebuffer *FB; expression E; @@ ironlake_get_initial_plane_config(...) { ... - FB->bits_per_pixel = E; ... } @@ struct drm_framebuffer *FB; expression E; @@ skylake_get_initial_plane_config(...) { ... - FB->bits_per_pixel = E; ... } @@ struct drm_framebuffer FB; expression E; @@ ( - E * FB.bits_per_pixel / 8 + E * FB.format->cpp[0] | - FB.bits_per_pixel / 8 + FB.format->cpp[0] | - E * FB.bits_per_pixel >> 3 + E * FB.format->cpp[0] | - FB.bits_per_pixel >> 3 + FB.format->cpp[0] | - (FB.bits_per_pixel + 7) / 8 + FB.format->cpp[0] | - FB.bits_per_pixel + FB.format->cpp[0] * 8 | - FB.format->cpp[0] * 8 != 8 + FB.format->cpp[0] != 1 ) @@ struct drm_framebuffer *FB; expression E; @@ ( - E * FB->bits_per_pixel / 8 + E * FB->format->cpp[0] | - FB->bits_per_pixel / 8 + FB->format->cpp[0] | - E * FB->bits_per_pixel >> 3 + E * FB->format->cpp[0] | - FB->bits_per_pixel >> 3 + FB->format->cpp[0] | - (FB->bits_per_pixel + 7) / 8 + FB->format->cpp[0] | - FB->bits_per_pixel + FB->format->cpp[0] * 8 | - FB->format->cpp[0] * 8 != 8 + FB->format->cpp[0] != 1 ) @@ struct drm_plane_state *state; expression E; @@ ( - E * state->fb->bits_per_pixel / 8 + E * state->fb->format->cpp[0] | - state->fb->bits_per_pixel / 8 + state->fb->format->cpp[0] | - E * state->fb->bits_per_pixel >> 3 + E * state->fb->format->cpp[0] | - state->fb->bits_per_pixel >> 3 + state->fb->format->cpp[0] | - (state->fb->bits_per_pixel + 7) / 8 + state->fb->format->cpp[0] | - state->fb->bits_per_pixel + state->fb->format->cpp[0] * 8 | - state->fb->format->cpp[0] * 8 != 8 + state->fb->format->cpp[0] != 1 ) @@ @@ - (8 * 8) + 8 * 8 @@ struct drm_framebuffer FB; @@ - (FB.format->cpp[0]) + FB.format->cpp[0] @@ struct drm_framebuffer *FB; @@ - (FB->format->cpp[0]) + FB->format->cpp[0] @@ @@ struct drm_framebuffer { ... - int bits_per_pixel; ... }; v2: Clean up the 'cpp*8 != 8' and '(8 * 8)' cases (Laurent) v3: Adjusted the semantic patch a bit and regenerated due to code changes Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1) Link: http://patchwork.freedesktop.org/patch/msgid/1481751140-18352-1-git-send-email-ville.syrjala@linux.intel.com
486 lines
14 KiB
C
486 lines
14 KiB
C
/*
|
|
* Copyright 2011 Red Hat, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* on the rights to use, copy, modify, merge, publish, distribute, sub
|
|
* license, and/or sell copies of the Software, and to permit persons to whom
|
|
* the Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qxl_drv.h"
|
|
#include "qxl_object.h"
|
|
|
|
static int alloc_clips(struct qxl_device *qdev,
|
|
struct qxl_release *release,
|
|
unsigned num_clips,
|
|
struct qxl_bo **clips_bo)
|
|
{
|
|
int size = sizeof(struct qxl_clip_rects) + sizeof(struct qxl_rect) * num_clips;
|
|
|
|
return qxl_alloc_bo_reserved(qdev, release, size, clips_bo);
|
|
}
|
|
|
|
/* returns a pointer to the already allocated qxl_rect array inside
|
|
* the qxl_clip_rects. This is *not* the same as the memory allocated
|
|
* on the device, it is offset to qxl_clip_rects.chunk.data */
|
|
static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev,
|
|
unsigned num_clips,
|
|
struct qxl_bo *clips_bo)
|
|
{
|
|
struct qxl_clip_rects *dev_clips;
|
|
int ret;
|
|
|
|
ret = qxl_bo_kmap(clips_bo, (void **)&dev_clips);
|
|
if (ret) {
|
|
return NULL;
|
|
}
|
|
dev_clips->num_rects = num_clips;
|
|
dev_clips->chunk.next_chunk = 0;
|
|
dev_clips->chunk.prev_chunk = 0;
|
|
dev_clips->chunk.data_size = sizeof(struct qxl_rect) * num_clips;
|
|
return (struct qxl_rect *)dev_clips->chunk.data;
|
|
}
|
|
|
|
static int
|
|
alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
|
|
{
|
|
return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
|
|
QXL_RELEASE_DRAWABLE, release, NULL);
|
|
}
|
|
|
|
static void
|
|
free_drawable(struct qxl_device *qdev, struct qxl_release *release)
|
|
{
|
|
qxl_release_free(qdev, release);
|
|
}
|
|
|
|
/* release needs to be reserved at this point */
|
|
static int
|
|
make_drawable(struct qxl_device *qdev, int surface, uint8_t type,
|
|
const struct qxl_rect *rect,
|
|
struct qxl_release *release)
|
|
{
|
|
struct qxl_drawable *drawable;
|
|
int i;
|
|
|
|
drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
|
|
if (!drawable)
|
|
return -ENOMEM;
|
|
|
|
drawable->type = type;
|
|
|
|
drawable->surface_id = surface; /* Only primary for now */
|
|
drawable->effect = QXL_EFFECT_OPAQUE;
|
|
drawable->self_bitmap = 0;
|
|
drawable->self_bitmap_area.top = 0;
|
|
drawable->self_bitmap_area.left = 0;
|
|
drawable->self_bitmap_area.bottom = 0;
|
|
drawable->self_bitmap_area.right = 0;
|
|
/* FIXME: add clipping */
|
|
drawable->clip.type = SPICE_CLIP_TYPE_NONE;
|
|
|
|
/*
|
|
* surfaces_dest[i] should apparently be filled out with the
|
|
* surfaces that we depend on, and surface_rects should be
|
|
* filled with the rectangles of those surfaces that we
|
|
* are going to use.
|
|
*/
|
|
for (i = 0; i < 3; ++i)
|
|
drawable->surfaces_dest[i] = -1;
|
|
|
|
if (rect)
|
|
drawable->bbox = *rect;
|
|
|
|
drawable->mm_time = qdev->rom->mm_clock;
|
|
qxl_release_unmap(qdev, release, &drawable->release_info);
|
|
return 0;
|
|
}
|
|
|
|
static int alloc_palette_object(struct qxl_device *qdev,
|
|
struct qxl_release *release,
|
|
struct qxl_bo **palette_bo)
|
|
{
|
|
return qxl_alloc_bo_reserved(qdev, release,
|
|
sizeof(struct qxl_palette) + sizeof(uint32_t) * 2,
|
|
palette_bo);
|
|
}
|
|
|
|
static int qxl_palette_create_1bit(struct qxl_bo *palette_bo,
|
|
struct qxl_release *release,
|
|
const struct qxl_fb_image *qxl_fb_image)
|
|
{
|
|
const struct fb_image *fb_image = &qxl_fb_image->fb_image;
|
|
uint32_t visual = qxl_fb_image->visual;
|
|
const uint32_t *pseudo_palette = qxl_fb_image->pseudo_palette;
|
|
struct qxl_palette *pal;
|
|
int ret;
|
|
uint32_t fgcolor, bgcolor;
|
|
static uint64_t unique; /* we make no attempt to actually set this
|
|
* correctly globaly, since that would require
|
|
* tracking all of our palettes. */
|
|
ret = qxl_bo_kmap(palette_bo, (void **)&pal);
|
|
if (ret)
|
|
return ret;
|
|
pal->num_ents = 2;
|
|
pal->unique = unique++;
|
|
if (visual == FB_VISUAL_TRUECOLOR || visual == FB_VISUAL_DIRECTCOLOR) {
|
|
/* NB: this is the only used branch currently. */
|
|
fgcolor = pseudo_palette[fb_image->fg_color];
|
|
bgcolor = pseudo_palette[fb_image->bg_color];
|
|
} else {
|
|
fgcolor = fb_image->fg_color;
|
|
bgcolor = fb_image->bg_color;
|
|
}
|
|
pal->ents[0] = bgcolor;
|
|
pal->ents[1] = fgcolor;
|
|
qxl_bo_kunmap(palette_bo);
|
|
return 0;
|
|
}
|
|
|
|
void qxl_draw_opaque_fb(const struct qxl_fb_image *qxl_fb_image,
|
|
int stride /* filled in if 0 */)
|
|
{
|
|
struct qxl_device *qdev = qxl_fb_image->qdev;
|
|
struct qxl_drawable *drawable;
|
|
struct qxl_rect rect;
|
|
const struct fb_image *fb_image = &qxl_fb_image->fb_image;
|
|
int x = fb_image->dx;
|
|
int y = fb_image->dy;
|
|
int width = fb_image->width;
|
|
int height = fb_image->height;
|
|
const char *src = fb_image->data;
|
|
int depth = fb_image->depth;
|
|
struct qxl_release *release;
|
|
struct qxl_image *image;
|
|
int ret;
|
|
struct qxl_drm_image *dimage;
|
|
struct qxl_bo *palette_bo = NULL;
|
|
if (stride == 0)
|
|
stride = depth * width / 8;
|
|
|
|
ret = alloc_drawable(qdev, &release);
|
|
if (ret)
|
|
return;
|
|
|
|
ret = qxl_image_alloc_objects(qdev, release,
|
|
&dimage,
|
|
height, stride);
|
|
if (ret)
|
|
goto out_free_drawable;
|
|
|
|
if (depth == 1) {
|
|
ret = alloc_palette_object(qdev, release, &palette_bo);
|
|
if (ret)
|
|
goto out_free_image;
|
|
}
|
|
|
|
/* do a reservation run over all the objects we just allocated */
|
|
ret = qxl_release_reserve_list(release, true);
|
|
if (ret)
|
|
goto out_free_palette;
|
|
|
|
rect.left = x;
|
|
rect.right = x + width;
|
|
rect.top = y;
|
|
rect.bottom = y + height;
|
|
|
|
ret = make_drawable(qdev, 0, QXL_DRAW_COPY, &rect, release);
|
|
if (ret) {
|
|
qxl_release_backoff_reserve_list(release);
|
|
goto out_free_palette;
|
|
}
|
|
|
|
ret = qxl_image_init(qdev, release, dimage,
|
|
(const uint8_t *)src, 0, 0,
|
|
width, height, depth, stride);
|
|
if (ret) {
|
|
qxl_release_backoff_reserve_list(release);
|
|
qxl_release_free(qdev, release);
|
|
return;
|
|
}
|
|
|
|
if (depth == 1) {
|
|
void *ptr;
|
|
ret = qxl_palette_create_1bit(palette_bo, release, qxl_fb_image);
|
|
|
|
ptr = qxl_bo_kmap_atomic_page(qdev, dimage->bo, 0);
|
|
image = ptr;
|
|
image->u.bitmap.palette =
|
|
qxl_bo_physical_address(qdev, palette_bo, 0);
|
|
qxl_bo_kunmap_atomic_page(qdev, dimage->bo, ptr);
|
|
}
|
|
|
|
drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
|
|
|
|
drawable->u.copy.src_area.top = 0;
|
|
drawable->u.copy.src_area.bottom = height;
|
|
drawable->u.copy.src_area.left = 0;
|
|
drawable->u.copy.src_area.right = width;
|
|
|
|
drawable->u.copy.rop_descriptor = SPICE_ROPD_OP_PUT;
|
|
drawable->u.copy.scale_mode = 0;
|
|
drawable->u.copy.mask.flags = 0;
|
|
drawable->u.copy.mask.pos.x = 0;
|
|
drawable->u.copy.mask.pos.y = 0;
|
|
drawable->u.copy.mask.bitmap = 0;
|
|
|
|
drawable->u.copy.src_bitmap =
|
|
qxl_bo_physical_address(qdev, dimage->bo, 0);
|
|
qxl_release_unmap(qdev, release, &drawable->release_info);
|
|
|
|
qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
|
qxl_release_fence_buffer_objects(release);
|
|
|
|
out_free_palette:
|
|
if (palette_bo)
|
|
qxl_bo_unref(&palette_bo);
|
|
out_free_image:
|
|
qxl_image_free_objects(qdev, dimage);
|
|
out_free_drawable:
|
|
if (ret)
|
|
free_drawable(qdev, release);
|
|
}
|
|
|
|
/* push a draw command using the given clipping rectangles as
|
|
* the sources from the shadow framebuffer.
|
|
*
|
|
* Right now implementing with a single draw and a clip list. Clip
|
|
* lists are known to be a problem performance wise, this can be solved
|
|
* by treating them differently in the server.
|
|
*/
|
|
void qxl_draw_dirty_fb(struct qxl_device *qdev,
|
|
struct qxl_framebuffer *qxl_fb,
|
|
struct qxl_bo *bo,
|
|
unsigned flags, unsigned color,
|
|
struct drm_clip_rect *clips,
|
|
unsigned num_clips, int inc)
|
|
{
|
|
/*
|
|
* TODO: if flags & DRM_MODE_FB_DIRTY_ANNOTATE_FILL then we should
|
|
* send a fill command instead, much cheaper.
|
|
*
|
|
* See include/drm/drm_mode.h
|
|
*/
|
|
struct drm_clip_rect *clips_ptr;
|
|
int i;
|
|
int left, right, top, bottom;
|
|
int width, height;
|
|
struct qxl_drawable *drawable;
|
|
struct qxl_rect drawable_rect;
|
|
struct qxl_rect *rects;
|
|
int stride = qxl_fb->base.pitches[0];
|
|
/* depth is not actually interesting, we don't mask with it */
|
|
int depth = qxl_fb->base.format->cpp[0] * 8;
|
|
uint8_t *surface_base;
|
|
struct qxl_release *release;
|
|
struct qxl_bo *clips_bo;
|
|
struct qxl_drm_image *dimage;
|
|
int ret;
|
|
|
|
ret = alloc_drawable(qdev, &release);
|
|
if (ret)
|
|
return;
|
|
|
|
left = clips->x1;
|
|
right = clips->x2;
|
|
top = clips->y1;
|
|
bottom = clips->y2;
|
|
|
|
/* skip the first clip rect */
|
|
for (i = 1, clips_ptr = clips + inc;
|
|
i < num_clips; i++, clips_ptr += inc) {
|
|
left = min_t(int, left, (int)clips_ptr->x1);
|
|
right = max_t(int, right, (int)clips_ptr->x2);
|
|
top = min_t(int, top, (int)clips_ptr->y1);
|
|
bottom = max_t(int, bottom, (int)clips_ptr->y2);
|
|
}
|
|
|
|
width = right - left;
|
|
height = bottom - top;
|
|
|
|
ret = alloc_clips(qdev, release, num_clips, &clips_bo);
|
|
if (ret)
|
|
goto out_free_drawable;
|
|
|
|
ret = qxl_image_alloc_objects(qdev, release,
|
|
&dimage,
|
|
height, stride);
|
|
if (ret)
|
|
goto out_free_clips;
|
|
|
|
/* do a reservation run over all the objects we just allocated */
|
|
ret = qxl_release_reserve_list(release, true);
|
|
if (ret)
|
|
goto out_free_image;
|
|
|
|
drawable_rect.left = left;
|
|
drawable_rect.right = right;
|
|
drawable_rect.top = top;
|
|
drawable_rect.bottom = bottom;
|
|
|
|
ret = make_drawable(qdev, 0, QXL_DRAW_COPY, &drawable_rect,
|
|
release);
|
|
if (ret)
|
|
goto out_release_backoff;
|
|
|
|
ret = qxl_bo_kmap(bo, (void **)&surface_base);
|
|
if (ret)
|
|
goto out_release_backoff;
|
|
|
|
|
|
ret = qxl_image_init(qdev, release, dimage, surface_base,
|
|
left, top, width, height, depth, stride);
|
|
qxl_bo_kunmap(bo);
|
|
if (ret)
|
|
goto out_release_backoff;
|
|
|
|
rects = drawable_set_clipping(qdev, num_clips, clips_bo);
|
|
if (!rects)
|
|
goto out_release_backoff;
|
|
|
|
drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
|
|
|
|
drawable->clip.type = SPICE_CLIP_TYPE_RECTS;
|
|
drawable->clip.data = qxl_bo_physical_address(qdev,
|
|
clips_bo, 0);
|
|
|
|
drawable->u.copy.src_area.top = 0;
|
|
drawable->u.copy.src_area.bottom = height;
|
|
drawable->u.copy.src_area.left = 0;
|
|
drawable->u.copy.src_area.right = width;
|
|
|
|
drawable->u.copy.rop_descriptor = SPICE_ROPD_OP_PUT;
|
|
drawable->u.copy.scale_mode = 0;
|
|
drawable->u.copy.mask.flags = 0;
|
|
drawable->u.copy.mask.pos.x = 0;
|
|
drawable->u.copy.mask.pos.y = 0;
|
|
drawable->u.copy.mask.bitmap = 0;
|
|
|
|
drawable->u.copy.src_bitmap = qxl_bo_physical_address(qdev, dimage->bo, 0);
|
|
qxl_release_unmap(qdev, release, &drawable->release_info);
|
|
|
|
clips_ptr = clips;
|
|
for (i = 0; i < num_clips; i++, clips_ptr += inc) {
|
|
rects[i].left = clips_ptr->x1;
|
|
rects[i].right = clips_ptr->x2;
|
|
rects[i].top = clips_ptr->y1;
|
|
rects[i].bottom = clips_ptr->y2;
|
|
}
|
|
qxl_bo_kunmap(clips_bo);
|
|
|
|
qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
|
qxl_release_fence_buffer_objects(release);
|
|
|
|
out_release_backoff:
|
|
if (ret)
|
|
qxl_release_backoff_reserve_list(release);
|
|
out_free_image:
|
|
qxl_image_free_objects(qdev, dimage);
|
|
out_free_clips:
|
|
qxl_bo_unref(&clips_bo);
|
|
out_free_drawable:
|
|
/* only free drawable on error */
|
|
if (ret)
|
|
free_drawable(qdev, release);
|
|
|
|
}
|
|
|
|
void qxl_draw_copyarea(struct qxl_device *qdev,
|
|
u32 width, u32 height,
|
|
u32 sx, u32 sy,
|
|
u32 dx, u32 dy)
|
|
{
|
|
struct qxl_drawable *drawable;
|
|
struct qxl_rect rect;
|
|
struct qxl_release *release;
|
|
int ret;
|
|
|
|
ret = alloc_drawable(qdev, &release);
|
|
if (ret)
|
|
return;
|
|
|
|
/* do a reservation run over all the objects we just allocated */
|
|
ret = qxl_release_reserve_list(release, true);
|
|
if (ret)
|
|
goto out_free_release;
|
|
|
|
rect.left = dx;
|
|
rect.top = dy;
|
|
rect.right = dx + width;
|
|
rect.bottom = dy + height;
|
|
ret = make_drawable(qdev, 0, QXL_COPY_BITS, &rect, release);
|
|
if (ret) {
|
|
qxl_release_backoff_reserve_list(release);
|
|
goto out_free_release;
|
|
}
|
|
|
|
drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
|
|
drawable->u.copy_bits.src_pos.x = sx;
|
|
drawable->u.copy_bits.src_pos.y = sy;
|
|
qxl_release_unmap(qdev, release, &drawable->release_info);
|
|
|
|
qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
|
qxl_release_fence_buffer_objects(release);
|
|
|
|
out_free_release:
|
|
if (ret)
|
|
free_drawable(qdev, release);
|
|
}
|
|
|
|
void qxl_draw_fill(struct qxl_draw_fill *qxl_draw_fill_rec)
|
|
{
|
|
struct qxl_device *qdev = qxl_draw_fill_rec->qdev;
|
|
struct qxl_rect rect = qxl_draw_fill_rec->rect;
|
|
uint32_t color = qxl_draw_fill_rec->color;
|
|
uint16_t rop = qxl_draw_fill_rec->rop;
|
|
struct qxl_drawable *drawable;
|
|
struct qxl_release *release;
|
|
int ret;
|
|
|
|
ret = alloc_drawable(qdev, &release);
|
|
if (ret)
|
|
return;
|
|
|
|
/* do a reservation run over all the objects we just allocated */
|
|
ret = qxl_release_reserve_list(release, true);
|
|
if (ret)
|
|
goto out_free_release;
|
|
|
|
ret = make_drawable(qdev, 0, QXL_DRAW_FILL, &rect, release);
|
|
if (ret) {
|
|
qxl_release_backoff_reserve_list(release);
|
|
goto out_free_release;
|
|
}
|
|
|
|
drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
|
|
drawable->u.fill.brush.type = SPICE_BRUSH_TYPE_SOLID;
|
|
drawable->u.fill.brush.u.color = color;
|
|
drawable->u.fill.rop_descriptor = rop;
|
|
drawable->u.fill.mask.flags = 0;
|
|
drawable->u.fill.mask.pos.x = 0;
|
|
drawable->u.fill.mask.pos.y = 0;
|
|
drawable->u.fill.mask.bitmap = 0;
|
|
|
|
qxl_release_unmap(qdev, release, &drawable->release_info);
|
|
|
|
qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
|
qxl_release_fence_buffer_objects(release);
|
|
|
|
out_free_release:
|
|
if (ret)
|
|
free_drawable(qdev, release);
|
|
}
|