drm-misc-next for 5.11:
UAPI Changes:
- doc: rules for EBUSY on non-blocking commits; requirements for fourcc
modifiers; on parsing EDID
- fbdev/sbuslib: Remove unused FBIOSCURSOR32
- fourcc: deprecate DRM_FORMAT_MOD_NONE
- virtio: Support blob resources for memory allocations; Expose host-visible
and cross-device features
Cross-subsystem Changes:
- devicetree: Add vendor Prefix for Yes Optoelectronics, Shanghai Top Display
Optoelectronics
- dma-buf: Add struct dma_buf_map that stores DMA pointer and I/O-memory flag;
dma_buf_vmap()/vunmap() return address in dma_buf_map; Use struct_size() macro
Core Changes:
- atomic: pass full state to CRTC atomic enable/disable; warn for EBUSY during
non-blocking commits
- dp: Prepare for DP 2.0 DPCD
- dp_mst: Receive extended DPCD caps
- dma-buf: Documentation
- doc: Format modifiers; dma-buf-map; Cleanups
- fbdev: Don't use compat_alloc_user_space(); mark as orphaned
- fb-helper: Take lock in drm_fb_helper_restore_work_fb()
- gem: Convert implementation and drivers to GEM object functions, remove
GEM callbacks from struct drm_driver (expect gem_prime_mmap)
- panel: Cleanups
- pci: Add legacy infix to drm_irq_by_busid()
- sched: Avoid infinite waits in drm_sched_entity_destroy()
- switcheroo: Cleanups
- ttm: Remove AGP support; Don't modify caching during swapout; Major
refactoring of the implementation and API that affects all depending
drivers; Add ttm_bo_wait_ctx(); Add ttm_bo_pin()/unpin() in favor of
TTM_PL_FLAG_NO_EVICT; Remove ttm_bo_create(); Remove fault_reserve_notify()
callback; Push move() implementation into drivers; Remove TTM_PAGE_FLAG_WRITE;
Replace caching flags with init-time cache setting; Push ttm_tt_bind() into
drivers; Replace move_notify() with delete_mem_notify(); No overlapping memcpy();
no more ttm_set_populated()
- vram-helper: Fix BO top-down placement; TTM-related changes; Init GEM
object functions with defaults; Default placement in system memory; Cleanups
Driver Changes:
- amdgpu: Use GEM object functions
- armada: Use GEM object functions
- aspeed: Configure output via sysfs; Init struct drm_driver with
- ast: Reload LUT after FB format changes
- bridge: Add driver and DT bindings for anx7625; Cleanups
- bridge/dw-hdmi: Constify ops
- bridge/ti-sn65dsi86: Add retries for link training
- bridge/lvds-codec: Add support for regulator
- bridge/tc358768: Restore connector support DRM_GEM_CMA_DRIVEROPS; Cleanups
- display/ti,j721e-dss: Add DT properies assigned-clocks, assigned-clocks-parent and
dma-coherent
- display/ti,am65s-dss: Add DT properies assigned-clocks, assigned-clocks-parent and
dma-coherent
- etnaviv: Use GEM object functions
- exynos: Use GEM object functions
- fbdev: Cleanups and compiler fixes throughout framebuffer drivers
- fbdev/cirrusfb: Avoid division by 0
- gma500: Use GEM object functions; Fix double-free of connector; Cleanups
- hisilicon/hibmc: I2C-based DDC support; Use to_hibmc_drm_device(); Cleanups
- i915: Use GEM object functions
- imx/dcss: Init driver with DRM_GEM_CMA_DRIVER_OPS; Cleanups
- ingenic: Reset pixel clock when parent clock changes; support reserved
memory; Alloc F0 and F1 DMA channels at once; Support different pixel formats;
Revert support for cached mmap buffers
on F0/F1; support 30-bit/24-bit/8-bit-palette modes
- komeda: Use DEFINE_SHOW_ATTRIBUTE
- mcde: Detect platform_get_irq() errors
- mediatek: Use GEM object functions
- msm: Use GEM object functions
- nouveau: Cleanups; TTM-related changes; Use GEM object functions
- omapdrm: Use GEM object functions
- panel: Add driver and DT bindings for Novatak nt36672a; Add driver and DT
bindings for YTC700TLAG-05-201C; Add driver and DT bindings for TDO TL070WSH30;
Cleanups
- panel/mantix: Fix reset; Fix deref of NULL pointer in mantix_get_modes()
- panel/otm8009a: Allow non-continuous dsi clock; Cleanups
- panel/rm68200: Allow non-continuous dsi clock; Fix mode to 50 FPS
- panfrost: Fix job timeout handling; Cleanups
- pl111: Use GEM object functions
- qxl: Cleanups; TTM-related changes; Pin new BOs with ttm_bo_init_reserved()
- radeon: Cleanups; TTM-related changes; Use GEM object functions
- rockchip: Use GEM object functions
- shmobile: Cleanups
- tegra: Use GEM object functions
- tidss: Set drm_plane_helper_funcs.prepare_fb
- tilcdc: Don't keep vblank interrupt enabled all the time
- tve200: Detect platform_get_irq() errors
- vc4: Use GEM object functions; Only register components once DSI is attached;
Add Maxime as maintainer
- vgem: Use GEM object functions
- via: Simplify critical section in via_mem_alloc()
- virtgpu: Use GEM object functions
- virtio: Implement blob resources, host-visible and cross-device features;
Support mapping of host-allocated resources; Use UUID APi; Cleanups
- vkms: Use GEM object functions; Switch to SHMEM
- vmwgfx: TTM-related changes; Inline ttm_bo_swapout_all()
- xen: Use GEM object functions
- xlnx: Use GEM object functions
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201027100936.GA4858@linux-uq9g
279 lines
7.8 KiB
C
279 lines
7.8 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 <linux/dma-mapping.h>
|
|
#include <linux/moduleparam.h>
|
|
|
|
#include "virtgpu_drv.h"
|
|
|
|
static int virtio_gpu_virglrenderer_workaround = 1;
|
|
module_param_named(virglhack, virtio_gpu_virglrenderer_workaround, int, 0400);
|
|
|
|
int virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev, uint32_t *resid)
|
|
{
|
|
if (virtio_gpu_virglrenderer_workaround) {
|
|
/*
|
|
* Hack to avoid re-using resource IDs.
|
|
*
|
|
* virglrenderer versions up to (and including) 0.7.0
|
|
* can't deal with that. virglrenderer commit
|
|
* "f91a9dd35715 Fix unlinking resources from hash
|
|
* table." (Feb 2019) fixes the bug.
|
|
*/
|
|
static atomic_t seqno = ATOMIC_INIT(0);
|
|
int handle = atomic_inc_return(&seqno);
|
|
*resid = handle + 1;
|
|
} else {
|
|
int handle = ida_alloc(&vgdev->resource_ida, GFP_KERNEL);
|
|
if (handle < 0)
|
|
return handle;
|
|
*resid = handle + 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void virtio_gpu_resource_id_put(struct virtio_gpu_device *vgdev, uint32_t id)
|
|
{
|
|
if (!virtio_gpu_virglrenderer_workaround) {
|
|
ida_free(&vgdev->resource_ida, id - 1);
|
|
}
|
|
}
|
|
|
|
void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo)
|
|
{
|
|
struct virtio_gpu_device *vgdev = bo->base.base.dev->dev_private;
|
|
|
|
virtio_gpu_resource_id_put(vgdev, bo->hw_res_handle);
|
|
if (virtio_gpu_is_shmem(bo)) {
|
|
struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
|
|
|
|
if (shmem->pages) {
|
|
if (shmem->mapped) {
|
|
dma_unmap_sgtable(vgdev->vdev->dev.parent,
|
|
shmem->pages, DMA_TO_DEVICE, 0);
|
|
shmem->mapped = 0;
|
|
}
|
|
|
|
sg_free_table(shmem->pages);
|
|
kfree(shmem->pages);
|
|
shmem->pages = NULL;
|
|
drm_gem_shmem_unpin(&bo->base.base);
|
|
}
|
|
|
|
drm_gem_shmem_free_object(&bo->base.base);
|
|
} else if (virtio_gpu_is_vram(bo)) {
|
|
struct virtio_gpu_object_vram *vram = to_virtio_gpu_vram(bo);
|
|
|
|
spin_lock(&vgdev->host_visible_lock);
|
|
if (drm_mm_node_allocated(&vram->vram_node))
|
|
drm_mm_remove_node(&vram->vram_node);
|
|
|
|
spin_unlock(&vgdev->host_visible_lock);
|
|
|
|
drm_gem_free_mmap_offset(&vram->base.base.base);
|
|
drm_gem_object_release(&vram->base.base.base);
|
|
kfree(vram);
|
|
}
|
|
}
|
|
|
|
static void virtio_gpu_free_object(struct drm_gem_object *obj)
|
|
{
|
|
struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj);
|
|
struct virtio_gpu_device *vgdev = bo->base.base.dev->dev_private;
|
|
|
|
if (bo->created) {
|
|
virtio_gpu_cmd_unref_resource(vgdev, bo);
|
|
virtio_gpu_notify(vgdev);
|
|
/* completion handler calls virtio_gpu_cleanup_object() */
|
|
return;
|
|
}
|
|
virtio_gpu_cleanup_object(bo);
|
|
}
|
|
|
|
static const struct drm_gem_object_funcs virtio_gpu_shmem_funcs = {
|
|
.free = virtio_gpu_free_object,
|
|
.open = virtio_gpu_gem_object_open,
|
|
.close = virtio_gpu_gem_object_close,
|
|
|
|
.print_info = drm_gem_shmem_print_info,
|
|
.export = virtgpu_gem_prime_export,
|
|
.pin = drm_gem_shmem_pin,
|
|
.unpin = drm_gem_shmem_unpin,
|
|
.get_sg_table = drm_gem_shmem_get_sg_table,
|
|
.vmap = drm_gem_shmem_vmap,
|
|
.vunmap = drm_gem_shmem_vunmap,
|
|
.mmap = drm_gem_shmem_mmap,
|
|
};
|
|
|
|
bool virtio_gpu_is_shmem(struct virtio_gpu_object *bo)
|
|
{
|
|
return bo->base.base.funcs == &virtio_gpu_shmem_funcs;
|
|
}
|
|
|
|
struct drm_gem_object *virtio_gpu_create_object(struct drm_device *dev,
|
|
size_t size)
|
|
{
|
|
struct virtio_gpu_object_shmem *shmem;
|
|
struct drm_gem_shmem_object *dshmem;
|
|
|
|
shmem = kzalloc(sizeof(*shmem), GFP_KERNEL);
|
|
if (!shmem)
|
|
return NULL;
|
|
|
|
dshmem = &shmem->base.base;
|
|
dshmem->base.funcs = &virtio_gpu_shmem_funcs;
|
|
dshmem->map_cached = true;
|
|
return &dshmem->base;
|
|
}
|
|
|
|
static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
|
|
struct virtio_gpu_object *bo,
|
|
struct virtio_gpu_mem_entry **ents,
|
|
unsigned int *nents)
|
|
{
|
|
bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);
|
|
struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
|
|
struct scatterlist *sg;
|
|
int si, ret;
|
|
|
|
ret = drm_gem_shmem_pin(&bo->base.base);
|
|
if (ret < 0)
|
|
return -EINVAL;
|
|
|
|
/*
|
|
* virtio_gpu uses drm_gem_shmem_get_sg_table instead of
|
|
* drm_gem_shmem_get_pages_sgt because virtio has it's own set of
|
|
* dma-ops. This is discouraged for other drivers, but should be fine
|
|
* since virtio_gpu doesn't support dma-buf import from other devices.
|
|
*/
|
|
shmem->pages = drm_gem_shmem_get_sg_table(&bo->base.base);
|
|
if (!shmem->pages) {
|
|
drm_gem_shmem_unpin(&bo->base.base);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (use_dma_api) {
|
|
ret = dma_map_sgtable(vgdev->vdev->dev.parent,
|
|
shmem->pages, DMA_TO_DEVICE, 0);
|
|
if (ret)
|
|
return ret;
|
|
*nents = shmem->mapped = shmem->pages->nents;
|
|
} else {
|
|
*nents = shmem->pages->orig_nents;
|
|
}
|
|
|
|
*ents = kmalloc_array(*nents, sizeof(struct virtio_gpu_mem_entry),
|
|
GFP_KERNEL);
|
|
if (!(*ents)) {
|
|
DRM_ERROR("failed to allocate ent list\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
if (use_dma_api) {
|
|
for_each_sgtable_dma_sg(shmem->pages, sg, si) {
|
|
(*ents)[si].addr = cpu_to_le64(sg_dma_address(sg));
|
|
(*ents)[si].length = cpu_to_le32(sg_dma_len(sg));
|
|
(*ents)[si].padding = 0;
|
|
}
|
|
} else {
|
|
for_each_sgtable_sg(shmem->pages, sg, si) {
|
|
(*ents)[si].addr = cpu_to_le64(sg_phys(sg));
|
|
(*ents)[si].length = cpu_to_le32(sg->length);
|
|
(*ents)[si].padding = 0;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
|
|
struct virtio_gpu_object_params *params,
|
|
struct virtio_gpu_object **bo_ptr,
|
|
struct virtio_gpu_fence *fence)
|
|
{
|
|
struct virtio_gpu_object_array *objs = NULL;
|
|
struct drm_gem_shmem_object *shmem_obj;
|
|
struct virtio_gpu_object *bo;
|
|
struct virtio_gpu_mem_entry *ents;
|
|
unsigned int nents;
|
|
int ret;
|
|
|
|
*bo_ptr = NULL;
|
|
|
|
params->size = roundup(params->size, PAGE_SIZE);
|
|
shmem_obj = drm_gem_shmem_create(vgdev->ddev, params->size);
|
|
if (IS_ERR(shmem_obj))
|
|
return PTR_ERR(shmem_obj);
|
|
bo = gem_to_virtio_gpu_obj(&shmem_obj->base);
|
|
|
|
ret = virtio_gpu_resource_id_get(vgdev, &bo->hw_res_handle);
|
|
if (ret < 0)
|
|
goto err_free_gem;
|
|
|
|
bo->dumb = params->dumb;
|
|
|
|
if (fence) {
|
|
ret = -ENOMEM;
|
|
objs = virtio_gpu_array_alloc(1);
|
|
if (!objs)
|
|
goto err_put_id;
|
|
virtio_gpu_array_add_obj(objs, &bo->base.base);
|
|
|
|
ret = virtio_gpu_array_lock_resv(objs);
|
|
if (ret != 0)
|
|
goto err_put_objs;
|
|
}
|
|
|
|
ret = virtio_gpu_object_shmem_init(vgdev, bo, &ents, &nents);
|
|
if (ret != 0) {
|
|
virtio_gpu_free_object(&shmem_obj->base);
|
|
return ret;
|
|
}
|
|
|
|
if (params->blob) {
|
|
virtio_gpu_cmd_resource_create_blob(vgdev, bo, params,
|
|
ents, nents);
|
|
} else if (params->virgl) {
|
|
virtio_gpu_cmd_resource_create_3d(vgdev, bo, params,
|
|
objs, fence);
|
|
virtio_gpu_object_attach(vgdev, bo, ents, nents);
|
|
} else {
|
|
virtio_gpu_cmd_create_resource(vgdev, bo, params,
|
|
objs, fence);
|
|
virtio_gpu_object_attach(vgdev, bo, ents, nents);
|
|
}
|
|
|
|
*bo_ptr = bo;
|
|
return 0;
|
|
|
|
err_put_objs:
|
|
virtio_gpu_array_put_free(objs);
|
|
err_put_id:
|
|
virtio_gpu_resource_id_put(vgdev, bo->hw_res_handle);
|
|
err_free_gem:
|
|
drm_gem_shmem_free_object(&shmem_obj->base);
|
|
return ret;
|
|
}
|