mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
39cba5cf8c
The VKMS blend function was ignoring the alpha channel and just overwriting vaddr_src with vaddr_dst. This XRGB approach triggers a warning when running the kms_cursor_crc/cursor-alpha-transparent test case. In IGT, cairo_format_argb32 uses premultiplied alpha (according to documentation). Also current DRM assumption is that alpha is premultiplied. Therefore, this patch considers premultiplied alpha blending eq to compose vaddr_src with vaddr_dst. This change removes the following cursor-alpha-transparent warning: "Suspicious CRC: All values are 0." V2: - static for local functions - const for the read-only variable argb_src - replaces variable names - drops unnecessary comment Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com> Cc: Haneen Mohammed <hamohammed.sa@gmail.com> Signed-off-by: Melissa Wen <melissa.srw@gmail.com> Reviewed-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com> Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200825114532.abzdooluny2ekzvm@smtp.gmail.com
286 lines
7.3 KiB
C
286 lines
7.3 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
|
|
#include <linux/crc32.h>
|
|
|
|
#include <drm/drm_atomic.h>
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_gem_framebuffer_helper.h>
|
|
#include <drm/drm_vblank.h>
|
|
|
|
#include "vkms_drv.h"
|
|
|
|
/**
|
|
* compute_crc - Compute CRC value on output frame
|
|
*
|
|
* @vaddr_out: address to final framebuffer
|
|
* @composer: framebuffer's metadata
|
|
*
|
|
* returns CRC value computed using crc32 on the visible portion of
|
|
* the final framebuffer at vaddr_out
|
|
*/
|
|
static uint32_t compute_crc(void *vaddr_out, struct vkms_composer *composer)
|
|
{
|
|
int i, j, src_offset;
|
|
int x_src = composer->src.x1 >> 16;
|
|
int y_src = composer->src.y1 >> 16;
|
|
int h_src = drm_rect_height(&composer->src) >> 16;
|
|
int w_src = drm_rect_width(&composer->src) >> 16;
|
|
u32 crc = 0;
|
|
|
|
for (i = y_src; i < y_src + h_src; ++i) {
|
|
for (j = x_src; j < x_src + w_src; ++j) {
|
|
src_offset = composer->offset
|
|
+ (i * composer->pitch)
|
|
+ (j * composer->cpp);
|
|
crc = crc32_le(crc, vaddr_out + src_offset,
|
|
sizeof(u32));
|
|
}
|
|
}
|
|
|
|
return crc;
|
|
}
|
|
|
|
static u8 blend_channel(u8 src, u8 dst, u8 alpha)
|
|
{
|
|
u32 pre_blend;
|
|
u8 new_color;
|
|
|
|
pre_blend = (src * 255 + dst * (255 - alpha));
|
|
|
|
/* Faster div by 255 */
|
|
new_color = ((pre_blend + ((pre_blend + 257) >> 8)) >> 8);
|
|
|
|
return new_color;
|
|
}
|
|
|
|
static void alpha_blending(const u8 *argb_src, u8 *argb_dst)
|
|
{
|
|
u8 alpha;
|
|
|
|
alpha = argb_src[3];
|
|
argb_dst[0] = blend_channel(argb_src[0], argb_dst[0], alpha);
|
|
argb_dst[1] = blend_channel(argb_src[1], argb_dst[1], alpha);
|
|
argb_dst[2] = blend_channel(argb_src[2], argb_dst[2], alpha);
|
|
/* Opaque primary */
|
|
argb_dst[3] = 0xFF;
|
|
}
|
|
|
|
/**
|
|
* blend - blend value at vaddr_src with value at vaddr_dst
|
|
* @vaddr_dst: destination address
|
|
* @vaddr_src: source address
|
|
* @dst_composer: destination framebuffer's metadata
|
|
* @src_composer: source framebuffer's metadata
|
|
*
|
|
* Blend the vaddr_src value with the vaddr_dst value using the pre-multiplied
|
|
* alpha blending equation, since DRM currently assumes that the pixel color
|
|
* values have already been pre-multiplied with the alpha channel values. See
|
|
* more drm_plane_create_blend_mode_property(). This function uses buffer's
|
|
* metadata to locate the new composite values at vaddr_dst.
|
|
*/
|
|
static void blend(void *vaddr_dst, void *vaddr_src,
|
|
struct vkms_composer *dst_composer,
|
|
struct vkms_composer *src_composer)
|
|
{
|
|
int i, j, j_dst, i_dst;
|
|
int offset_src, offset_dst;
|
|
u8 *pixel_dst, *pixel_src;
|
|
|
|
int x_src = src_composer->src.x1 >> 16;
|
|
int y_src = src_composer->src.y1 >> 16;
|
|
|
|
int x_dst = src_composer->dst.x1;
|
|
int y_dst = src_composer->dst.y1;
|
|
int h_dst = drm_rect_height(&src_composer->dst);
|
|
int w_dst = drm_rect_width(&src_composer->dst);
|
|
|
|
int y_limit = y_src + h_dst;
|
|
int x_limit = x_src + w_dst;
|
|
|
|
for (i = y_src, i_dst = y_dst; i < y_limit; ++i) {
|
|
for (j = x_src, j_dst = x_dst; j < x_limit; ++j) {
|
|
offset_dst = dst_composer->offset
|
|
+ (i_dst * dst_composer->pitch)
|
|
+ (j_dst++ * dst_composer->cpp);
|
|
offset_src = src_composer->offset
|
|
+ (i * src_composer->pitch)
|
|
+ (j * src_composer->cpp);
|
|
|
|
pixel_src = (u8 *)(vaddr_src + offset_src);
|
|
pixel_dst = (u8 *)(vaddr_dst + offset_dst);
|
|
alpha_blending(pixel_src, pixel_dst);
|
|
}
|
|
i_dst++;
|
|
}
|
|
}
|
|
|
|
static void compose_cursor(struct vkms_composer *cursor_composer,
|
|
struct vkms_composer *primary_composer,
|
|
void *vaddr_out)
|
|
{
|
|
struct drm_gem_object *cursor_obj;
|
|
struct vkms_gem_object *cursor_vkms_obj;
|
|
|
|
cursor_obj = drm_gem_fb_get_obj(&cursor_composer->fb, 0);
|
|
cursor_vkms_obj = drm_gem_to_vkms_gem(cursor_obj);
|
|
|
|
if (WARN_ON(!cursor_vkms_obj->vaddr))
|
|
return;
|
|
|
|
blend(vaddr_out, cursor_vkms_obj->vaddr,
|
|
primary_composer, cursor_composer);
|
|
}
|
|
|
|
static uint32_t _vkms_get_crc(struct vkms_composer *primary_composer,
|
|
struct vkms_composer *cursor_composer)
|
|
{
|
|
struct drm_framebuffer *fb = &primary_composer->fb;
|
|
struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0);
|
|
struct vkms_gem_object *vkms_obj = drm_gem_to_vkms_gem(gem_obj);
|
|
void *vaddr_out = kzalloc(vkms_obj->gem.size, GFP_KERNEL);
|
|
u32 crc = 0;
|
|
|
|
if (!vaddr_out) {
|
|
DRM_ERROR("Failed to allocate memory for output frame.");
|
|
return 0;
|
|
}
|
|
|
|
if (WARN_ON(!vkms_obj->vaddr)) {
|
|
kfree(vaddr_out);
|
|
return crc;
|
|
}
|
|
|
|
memcpy(vaddr_out, vkms_obj->vaddr, vkms_obj->gem.size);
|
|
|
|
if (cursor_composer)
|
|
compose_cursor(cursor_composer, primary_composer, vaddr_out);
|
|
|
|
crc = compute_crc(vaddr_out, primary_composer);
|
|
|
|
kfree(vaddr_out);
|
|
|
|
return crc;
|
|
}
|
|
|
|
/**
|
|
* vkms_composer_worker - ordered work_struct to compute CRC
|
|
*
|
|
* @work: work_struct
|
|
*
|
|
* Work handler for composing and computing CRCs. work_struct scheduled in
|
|
* an ordered workqueue that's periodically scheduled to run by
|
|
* _vblank_handle() and flushed at vkms_atomic_crtc_destroy_state().
|
|
*/
|
|
void vkms_composer_worker(struct work_struct *work)
|
|
{
|
|
struct vkms_crtc_state *crtc_state = container_of(work,
|
|
struct vkms_crtc_state,
|
|
composer_work);
|
|
struct drm_crtc *crtc = crtc_state->base.crtc;
|
|
struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
|
|
struct vkms_composer *primary_composer = NULL;
|
|
struct vkms_composer *cursor_composer = NULL;
|
|
u32 crc32 = 0;
|
|
u64 frame_start, frame_end;
|
|
bool crc_pending;
|
|
|
|
spin_lock_irq(&out->composer_lock);
|
|
frame_start = crtc_state->frame_start;
|
|
frame_end = crtc_state->frame_end;
|
|
crc_pending = crtc_state->crc_pending;
|
|
crtc_state->frame_start = 0;
|
|
crtc_state->frame_end = 0;
|
|
crtc_state->crc_pending = false;
|
|
spin_unlock_irq(&out->composer_lock);
|
|
|
|
/*
|
|
* We raced with the vblank hrtimer and previous work already computed
|
|
* the crc, nothing to do.
|
|
*/
|
|
if (!crc_pending)
|
|
return;
|
|
|
|
if (crtc_state->num_active_planes >= 1)
|
|
primary_composer = crtc_state->active_planes[0]->composer;
|
|
|
|
if (crtc_state->num_active_planes == 2)
|
|
cursor_composer = crtc_state->active_planes[1]->composer;
|
|
|
|
if (primary_composer)
|
|
crc32 = _vkms_get_crc(primary_composer, cursor_composer);
|
|
|
|
/*
|
|
* The worker can fall behind the vblank hrtimer, make sure we catch up.
|
|
*/
|
|
while (frame_start <= frame_end)
|
|
drm_crtc_add_crc_entry(crtc, true, frame_start++, &crc32);
|
|
}
|
|
|
|
static const char * const pipe_crc_sources[] = {"auto"};
|
|
|
|
const char *const *vkms_get_crc_sources(struct drm_crtc *crtc,
|
|
size_t *count)
|
|
{
|
|
*count = ARRAY_SIZE(pipe_crc_sources);
|
|
return pipe_crc_sources;
|
|
}
|
|
|
|
static int vkms_crc_parse_source(const char *src_name, bool *enabled)
|
|
{
|
|
int ret = 0;
|
|
|
|
if (!src_name) {
|
|
*enabled = false;
|
|
} else if (strcmp(src_name, "auto") == 0) {
|
|
*enabled = true;
|
|
} else {
|
|
*enabled = false;
|
|
ret = -EINVAL;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int vkms_verify_crc_source(struct drm_crtc *crtc, const char *src_name,
|
|
size_t *values_cnt)
|
|
{
|
|
bool enabled;
|
|
|
|
if (vkms_crc_parse_source(src_name, &enabled) < 0) {
|
|
DRM_DEBUG_DRIVER("unknown source %s\n", src_name);
|
|
return -EINVAL;
|
|
}
|
|
|
|
*values_cnt = 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void vkms_set_composer(struct vkms_output *out, bool enabled)
|
|
{
|
|
bool old_enabled;
|
|
|
|
if (enabled)
|
|
drm_crtc_vblank_get(&out->crtc);
|
|
|
|
spin_lock_irq(&out->lock);
|
|
old_enabled = out->composer_enabled;
|
|
out->composer_enabled = enabled;
|
|
spin_unlock_irq(&out->lock);
|
|
|
|
if (old_enabled)
|
|
drm_crtc_vblank_put(&out->crtc);
|
|
}
|
|
|
|
int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name)
|
|
{
|
|
struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
|
|
bool enabled = false;
|
|
int ret = 0;
|
|
|
|
ret = vkms_crc_parse_source(src_name, &enabled);
|
|
|
|
vkms_set_composer(out, enabled);
|
|
|
|
return ret;
|
|
}
|