27b36ba7c2
Changes in 5.10.152 ocfs2: clear dinode links count in case of error ocfs2: fix BUG when iput after ocfs2_mknod fails selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context() cpufreq: qcom: fix writes in read-only memory region i2c: qcom-cci: Fix ordering of pm_runtime_xx and i2c_add_adapter x86/microcode/AMD: Apply the patch early on every logical thread hwmon/coretemp: Handle large core ID value ata: ahci-imx: Fix MODULE_ALIAS ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS cpufreq: qcom: fix memory leak in error path kvm: Add support for arch compat vm ioctls KVM: arm64: vgic: Fix exit condition in scan_its_table() media: mceusb: set timeout to at least timeout provided media: venus: dec: Handle the case where find_format fails block: wbt: Remove unnecessary invoking of wbt_update_limits in wbt_init blk-wbt: call rq_qos_add() after wb_normal is initialized arm64: errata: Remove AES hwcap for COMPAT tasks r8152: add PID for the Lenovo OneLink+ Dock btrfs: fix processing of delayed data refs during backref walking btrfs: fix processing of delayed tree block refs during backref walking ACPI: extlog: Handle multiple records tipc: Fix recognition of trial period tipc: fix an information leak in tipc_topsrv_kern_subscr i40e: Fix DMA mappings leak HID: magicmouse: Do not set BTN_MOUSE on double report sfc: Change VF mac via PF as first preference if available. net/atm: fix proc_mpc_write incorrect return value net: phy: dp83867: Extend RX strap quirk for SGMII mode cifs: Fix xid leak in cifs_copy_file_range() cifs: Fix xid leak in cifs_flock() cifs: Fix xid leak in cifs_ses_add_channel() net: hsr: avoid possible NULL deref in skb_clone() ionic: catch NULL pointer issue on reconfig nvme-hwmon: rework to avoid devm allocation nvme-hwmon: Return error code when registration fails nvme-hwmon: consistently ignore errors from nvme_hwmon_init nvme-hwmon: kmalloc the NVME SMART log buffer net: sched: cake: fix null pointer access issue when cake_init() fails net: sched: delete duplicate cleanup of backlog and qlen net: sched: sfb: fix null pointer access issue when sfb_init() fails sfc: include vport_id in filter spec hash and equal() net: hns: fix possible memory leak in hnae_ae_register() net: sched: fix race condition in qdisc_graft() net: phy: dp83822: disable MDI crossover status change interrupt iommu/vt-d: Allow NVS regions in arch_rmrr_sanity_check() iommu/vt-d: Clean up si_domain in the init_dmars() error path drm/virtio: Use appropriate atomic state in virtio_gpu_plane_cleanup_fb() dmaengine: mxs-dma: Remove the unused .id_table dmaengine: mxs: use platform_driver_register tracing: Simplify conditional compilation code in tracing_set_tracer() tracing: Do not free snapshot if tracer is on cmdline xen: assume XENFEAT_gnttab_map_avail_bits being set for pv guests xen/gntdev: Accommodate VMA splitting mmc: sdhci-tegra: Use actual clock rate for SW tuning correction riscv: Add machine name to kernel boot log and stack dump output riscv: always honor the CONFIG_CMDLINE_FORCE when parsing dtb perf pmu: Validate raw event with sysfs exported format bits perf: Skip and warn on unknown format 'configN' attrs fcntl: make F_GETOWN(EX) return 0 on dead owner task fcntl: fix potential deadlocks for &fown_struct.lock arm64: dts: qcom: sc7180-trogdor: Fixup modem memory region arm64: topology: move store_cpu_topology() to shared code riscv: topology: fix default topology reporting perf/x86/intel/pt: Relax address filter validation hv_netvsc: Fix race between VF offering and VF association message from host ACPI: video: Force backlight native for more TongFang devices x86/Kconfig: Drop check for -mabi=ms for CONFIG_EFI_STUB Makefile.debug: re-enable debug info for .S files mmc: core: Add SD card quirk for broken discard blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init() mm: /proc/pid/smaps_rollup: fix no vma's null-deref udp: Update reuse->has_conns under reuseport_lock. Linux 5.10.152 Change-Id: I2c75b6fd3ae205968bcc3133ebf71b82ff2a19b6 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
400 lines
11 KiB
C
400 lines
11 KiB
C
/*
|
|
* Copyright (C) 2015 Red Hat, Inc.
|
|
* All Rights Reserved.
|
|
*
|
|
* 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 the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, 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 NONINFRINGEMENT.
|
|
* IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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 <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_damage_helper.h>
|
|
#include <drm/drm_fourcc.h>
|
|
#include <drm/drm_plane_helper.h>
|
|
|
|
#include "virtgpu_drv.h"
|
|
|
|
static const uint32_t virtio_gpu_formats[] = {
|
|
DRM_FORMAT_XRGB8888,
|
|
DRM_FORMAT_ARGB8888,
|
|
DRM_FORMAT_BGRX8888,
|
|
DRM_FORMAT_BGRA8888,
|
|
DRM_FORMAT_RGBX8888,
|
|
DRM_FORMAT_RGBA8888,
|
|
DRM_FORMAT_XBGR8888,
|
|
DRM_FORMAT_ABGR8888,
|
|
};
|
|
|
|
static const uint32_t virtio_gpu_cursor_formats[] = {
|
|
DRM_FORMAT_HOST_ARGB8888,
|
|
};
|
|
|
|
uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc)
|
|
{
|
|
uint32_t format;
|
|
|
|
switch (drm_fourcc) {
|
|
#ifdef __BIG_ENDIAN
|
|
case DRM_FORMAT_XRGB8888:
|
|
format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_ARGB8888:
|
|
format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_BGRX8888:
|
|
format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_BGRA8888:
|
|
format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_RGBX8888:
|
|
format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_RGBA8888:
|
|
format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_XBGR8888:
|
|
format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_ABGR8888:
|
|
format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM;
|
|
break;
|
|
#else
|
|
case DRM_FORMAT_XRGB8888:
|
|
format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_ARGB8888:
|
|
format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_BGRX8888:
|
|
format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_BGRA8888:
|
|
format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_RGBX8888:
|
|
format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_RGBA8888:
|
|
format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_XBGR8888:
|
|
format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM;
|
|
break;
|
|
case DRM_FORMAT_ABGR8888:
|
|
format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM;
|
|
break;
|
|
#endif
|
|
default:
|
|
/*
|
|
* This should not happen, we handle everything listed
|
|
* in virtio_gpu_formats[].
|
|
*/
|
|
format = 0;
|
|
break;
|
|
}
|
|
WARN_ON(format == 0);
|
|
return format;
|
|
}
|
|
|
|
static void virtio_gpu_plane_destroy(struct drm_plane *plane)
|
|
{
|
|
drm_plane_cleanup(plane);
|
|
kfree(plane);
|
|
}
|
|
|
|
static const struct drm_plane_funcs virtio_gpu_plane_funcs = {
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
.destroy = virtio_gpu_plane_destroy,
|
|
.reset = drm_atomic_helper_plane_reset,
|
|
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
|
|
};
|
|
|
|
static int virtio_gpu_plane_atomic_check(struct drm_plane *plane,
|
|
struct drm_plane_state *state)
|
|
{
|
|
bool is_cursor = plane->type == DRM_PLANE_TYPE_CURSOR;
|
|
struct drm_crtc_state *crtc_state;
|
|
int ret;
|
|
|
|
if (!state->fb || WARN_ON(!state->crtc))
|
|
return 0;
|
|
|
|
crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
|
|
if (IS_ERR(crtc_state))
|
|
return PTR_ERR(crtc_state);
|
|
|
|
ret = drm_atomic_helper_check_plane_state(state, crtc_state,
|
|
DRM_PLANE_HELPER_NO_SCALING,
|
|
DRM_PLANE_HELPER_NO_SCALING,
|
|
is_cursor, true);
|
|
return ret;
|
|
}
|
|
|
|
static void virtio_gpu_update_dumb_bo(struct virtio_gpu_device *vgdev,
|
|
struct drm_plane_state *state,
|
|
struct drm_rect *rect)
|
|
{
|
|
struct virtio_gpu_object *bo =
|
|
gem_to_virtio_gpu_obj(state->fb->obj[0]);
|
|
struct virtio_gpu_object_array *objs;
|
|
uint32_t w = rect->x2 - rect->x1;
|
|
uint32_t h = rect->y2 - rect->y1;
|
|
uint32_t x = rect->x1;
|
|
uint32_t y = rect->y1;
|
|
uint32_t off = x * state->fb->format->cpp[0] +
|
|
y * state->fb->pitches[0];
|
|
|
|
objs = virtio_gpu_array_alloc(1);
|
|
if (!objs)
|
|
return;
|
|
virtio_gpu_array_add_obj(objs, &bo->base.base);
|
|
|
|
virtio_gpu_cmd_transfer_to_host_2d(vgdev, off, w, h, x, y,
|
|
objs, NULL);
|
|
}
|
|
|
|
static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
|
|
struct drm_plane_state *old_state)
|
|
{
|
|
struct drm_device *dev = plane->dev;
|
|
struct virtio_gpu_device *vgdev = dev->dev_private;
|
|
struct virtio_gpu_output *output = NULL;
|
|
struct virtio_gpu_object *bo;
|
|
struct drm_rect rect;
|
|
|
|
if (plane->state->crtc)
|
|
output = drm_crtc_to_virtio_gpu_output(plane->state->crtc);
|
|
if (old_state->crtc)
|
|
output = drm_crtc_to_virtio_gpu_output(old_state->crtc);
|
|
if (WARN_ON(!output))
|
|
return;
|
|
|
|
if (!plane->state->fb || !output->crtc.state->active) {
|
|
DRM_DEBUG("nofb\n");
|
|
virtio_gpu_cmd_set_scanout(vgdev, output->index, 0,
|
|
plane->state->src_w >> 16,
|
|
plane->state->src_h >> 16,
|
|
0, 0);
|
|
virtio_gpu_notify(vgdev);
|
|
return;
|
|
}
|
|
|
|
if (!drm_atomic_helper_damage_merged(old_state, plane->state, &rect))
|
|
return;
|
|
|
|
bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
|
|
if (bo->dumb)
|
|
virtio_gpu_update_dumb_bo(vgdev, plane->state, &rect);
|
|
|
|
if (plane->state->fb != old_state->fb ||
|
|
plane->state->src_w != old_state->src_w ||
|
|
plane->state->src_h != old_state->src_h ||
|
|
plane->state->src_x != old_state->src_x ||
|
|
plane->state->src_y != old_state->src_y ||
|
|
output->needs_modeset) {
|
|
output->needs_modeset = false;
|
|
DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n",
|
|
bo->hw_res_handle,
|
|
plane->state->crtc_w, plane->state->crtc_h,
|
|
plane->state->crtc_x, plane->state->crtc_y,
|
|
plane->state->src_w >> 16,
|
|
plane->state->src_h >> 16,
|
|
plane->state->src_x >> 16,
|
|
plane->state->src_y >> 16);
|
|
virtio_gpu_cmd_set_scanout(vgdev, output->index,
|
|
bo->hw_res_handle,
|
|
plane->state->src_w >> 16,
|
|
plane->state->src_h >> 16,
|
|
plane->state->src_x >> 16,
|
|
plane->state->src_y >> 16);
|
|
}
|
|
|
|
virtio_gpu_cmd_resource_flush(vgdev, bo->hw_res_handle,
|
|
rect.x1,
|
|
rect.y1,
|
|
rect.x2 - rect.x1,
|
|
rect.y2 - rect.y1);
|
|
virtio_gpu_notify(vgdev);
|
|
}
|
|
|
|
static int virtio_gpu_cursor_prepare_fb(struct drm_plane *plane,
|
|
struct drm_plane_state *new_state)
|
|
{
|
|
struct drm_device *dev = plane->dev;
|
|
struct virtio_gpu_device *vgdev = dev->dev_private;
|
|
struct virtio_gpu_framebuffer *vgfb;
|
|
struct virtio_gpu_object *bo;
|
|
|
|
if (!new_state->fb)
|
|
return 0;
|
|
|
|
vgfb = to_virtio_gpu_framebuffer(new_state->fb);
|
|
bo = gem_to_virtio_gpu_obj(vgfb->base.obj[0]);
|
|
if (bo && bo->dumb && (plane->state->fb != new_state->fb)) {
|
|
vgfb->fence = virtio_gpu_fence_alloc(vgdev);
|
|
if (!vgfb->fence)
|
|
return -ENOMEM;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void virtio_gpu_cursor_cleanup_fb(struct drm_plane *plane,
|
|
struct drm_plane_state *state)
|
|
{
|
|
struct virtio_gpu_framebuffer *vgfb;
|
|
|
|
if (!state->fb)
|
|
return;
|
|
|
|
vgfb = to_virtio_gpu_framebuffer(state->fb);
|
|
if (vgfb->fence) {
|
|
dma_fence_put(&vgfb->fence->f);
|
|
vgfb->fence = NULL;
|
|
}
|
|
}
|
|
|
|
static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
|
|
struct drm_plane_state *old_state)
|
|
{
|
|
struct drm_device *dev = plane->dev;
|
|
struct virtio_gpu_device *vgdev = dev->dev_private;
|
|
struct virtio_gpu_output *output = NULL;
|
|
struct virtio_gpu_framebuffer *vgfb;
|
|
struct virtio_gpu_object *bo = NULL;
|
|
uint32_t handle;
|
|
|
|
if (plane->state->crtc)
|
|
output = drm_crtc_to_virtio_gpu_output(plane->state->crtc);
|
|
if (old_state->crtc)
|
|
output = drm_crtc_to_virtio_gpu_output(old_state->crtc);
|
|
if (WARN_ON(!output))
|
|
return;
|
|
|
|
if (plane->state->fb) {
|
|
vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
|
|
bo = gem_to_virtio_gpu_obj(vgfb->base.obj[0]);
|
|
handle = bo->hw_res_handle;
|
|
} else {
|
|
handle = 0;
|
|
}
|
|
|
|
if (bo && bo->dumb && (plane->state->fb != old_state->fb)) {
|
|
/* new cursor -- update & wait */
|
|
struct virtio_gpu_object_array *objs;
|
|
|
|
objs = virtio_gpu_array_alloc(1);
|
|
if (!objs)
|
|
return;
|
|
virtio_gpu_array_add_obj(objs, vgfb->base.obj[0]);
|
|
virtio_gpu_array_lock_resv(objs);
|
|
virtio_gpu_cmd_transfer_to_host_2d
|
|
(vgdev, 0,
|
|
plane->state->crtc_w,
|
|
plane->state->crtc_h,
|
|
0, 0, objs, vgfb->fence);
|
|
virtio_gpu_notify(vgdev);
|
|
dma_fence_wait(&vgfb->fence->f, true);
|
|
dma_fence_put(&vgfb->fence->f);
|
|
vgfb->fence = NULL;
|
|
}
|
|
|
|
if (plane->state->fb != old_state->fb) {
|
|
DRM_DEBUG("update, handle %d, pos +%d+%d, hot %d,%d\n", handle,
|
|
plane->state->crtc_x,
|
|
plane->state->crtc_y,
|
|
plane->state->fb ? plane->state->fb->hot_x : 0,
|
|
plane->state->fb ? plane->state->fb->hot_y : 0);
|
|
output->cursor.hdr.type =
|
|
cpu_to_le32(VIRTIO_GPU_CMD_UPDATE_CURSOR);
|
|
output->cursor.resource_id = cpu_to_le32(handle);
|
|
if (plane->state->fb) {
|
|
output->cursor.hot_x =
|
|
cpu_to_le32(plane->state->fb->hot_x);
|
|
output->cursor.hot_y =
|
|
cpu_to_le32(plane->state->fb->hot_y);
|
|
} else {
|
|
output->cursor.hot_x = cpu_to_le32(0);
|
|
output->cursor.hot_y = cpu_to_le32(0);
|
|
}
|
|
} else {
|
|
DRM_DEBUG("move +%d+%d\n",
|
|
plane->state->crtc_x,
|
|
plane->state->crtc_y);
|
|
output->cursor.hdr.type =
|
|
cpu_to_le32(VIRTIO_GPU_CMD_MOVE_CURSOR);
|
|
}
|
|
output->cursor.pos.x = cpu_to_le32(plane->state->crtc_x);
|
|
output->cursor.pos.y = cpu_to_le32(plane->state->crtc_y);
|
|
virtio_gpu_cursor_ping(vgdev, output);
|
|
}
|
|
|
|
static const struct drm_plane_helper_funcs virtio_gpu_primary_helper_funcs = {
|
|
.atomic_check = virtio_gpu_plane_atomic_check,
|
|
.atomic_update = virtio_gpu_primary_plane_update,
|
|
};
|
|
|
|
static const struct drm_plane_helper_funcs virtio_gpu_cursor_helper_funcs = {
|
|
.prepare_fb = virtio_gpu_cursor_prepare_fb,
|
|
.cleanup_fb = virtio_gpu_cursor_cleanup_fb,
|
|
.atomic_check = virtio_gpu_plane_atomic_check,
|
|
.atomic_update = virtio_gpu_cursor_plane_update,
|
|
};
|
|
|
|
struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev,
|
|
enum drm_plane_type type,
|
|
int index)
|
|
{
|
|
struct drm_device *dev = vgdev->ddev;
|
|
const struct drm_plane_helper_funcs *funcs;
|
|
struct drm_plane *plane;
|
|
const uint32_t *formats;
|
|
int ret, nformats;
|
|
|
|
plane = kzalloc(sizeof(*plane), GFP_KERNEL);
|
|
if (!plane)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
if (type == DRM_PLANE_TYPE_CURSOR) {
|
|
formats = virtio_gpu_cursor_formats;
|
|
nformats = ARRAY_SIZE(virtio_gpu_cursor_formats);
|
|
funcs = &virtio_gpu_cursor_helper_funcs;
|
|
} else {
|
|
formats = virtio_gpu_formats;
|
|
nformats = ARRAY_SIZE(virtio_gpu_formats);
|
|
funcs = &virtio_gpu_primary_helper_funcs;
|
|
}
|
|
ret = drm_universal_plane_init(dev, plane, 1 << index,
|
|
&virtio_gpu_plane_funcs,
|
|
formats, nformats,
|
|
NULL, type, NULL);
|
|
if (ret)
|
|
goto err_plane_init;
|
|
|
|
drm_plane_helper_add(plane, funcs);
|
|
return plane;
|
|
|
|
err_plane_init:
|
|
kfree(plane);
|
|
return ERR_PTR(ret);
|
|
}
|