mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-26 07:15:03 +07:00
0a19b068ac
UAPI Changes: - Add DRM_MODE_TYPE_USERDEF for video modes specified in cmdline. Cross-subsystem Changes: - Assorted devicetree binding updates. - Add might_sleep() to dma_fence_wait(). - Fix fbdev's get_user_pages_fast() handling, and use pin_user_pages. - Small cleanup with IS_BUILTIN in video/fbdev drivers. - Fix video/hdmi coding style for infoframe size. Core Changes: - Silence vblank output during init. - Fix DP-MST corruption during send msg timeout. - Clear leak in drm_gem_objecs_lookup(). - Make newlines work with force connector attribute. - Fix module refcounting error in drm_encoder_slave, and use new i2c api. - Header fix for drm_managed.c - More struct_mutex removal for !legacy drivers: - Remove gem_free_object() - Removal of drm_gem_object_put_unlocked(). - Show current->comm alongside pid in debug printfs. - Add drm_client_modeset_check() + drm_client_framebuffer_flush(). - Replace drm_fb_swab16 with drm_fb_swap that also supports 32-bits. - Remove mode->vrefresh, and compactify drm_display_mode. - Use drm_* macros for logging and warnings. - Add WARN when drm_gem_get_pages is used on a private obj. - Handle importing and imported dmabuf better in shmem helpers. - Small fix for drm/mm hole size comparison, and remove invalid entry optimization. - Add a drm/mm selftest. - Set DSI connector type for DSI panels. - Assorted small fixes and documentation updates. - Fix DDI I2C device registration for MST ports, and flushing on destroy. - Fix master_set return type, used by vmwgfx. - Make the drm_set/drop_master ioctl symmetrical. Driver Changes: Allow iommu in the sun4i driver and use it for sun8i. - Simplify backlight lookup for omap, amba-clcd and tilcdc. - Hold reg_lock for rockchip. - Add support for bridge gpio and lane reordering + polarity to ti-sn65dsi86, and fix clock choice. - Small assorted fixes to tilcdc, vc4, i915, omap, fbdev/sm712fb, fbdev/pxafb, console/newport_con, msm, virtio, udl, malidp, hdlcd, bridge/ti-sn65dsi86, panfrost. - Remove hw cursor support for mgag200, and use simple kms helper + shmem helpers. - Add support for KOE Allow iommu in the sun4i driver and use it for sun8i. - Simplify backlight lookup for omap, amba-clcd and tilcdc. - Hold reg_lock for rockchip. - Add support for bridge gpio and lane reordering + polarity to ti-sn65dsi86, and fix clock choice. - Small assorted fixes to tilcdc, vc4 (multiple), i915. - Remove hw cursor support for mgag200, and use simple kms helper + shmem helpers. - Add support for KOE TX26D202VM0BWA panel. - Use GEM CMA functions in arc, arm, atmel-hlcdc, fsi-dcu, hisilicon, imx, ingenic, komeda, malidp, mcde, meson, msxfb, rcar-du, shmobile, stm, sti, tilcdc, tve200, zte. - Remove gem_print_info. - Improve gem_create_object_helper so udl can use shmem helpers. - Convert vc4 dt bindings to schemas, and add clock properties. - Device initialization cleanups for mgag200. - Add a workaround to fix DP-MST short pulses handling on broken hardware in i915. - Allow build test compiling arm drivers. - Use managed pci functions in mgag200 and ast. - Use dev_groups in malidp. - Add per pixel alpha support for PX30 VOP in rockchip. - Silence deferred probe logs in panfrost. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEuXvWqAysSYEJGuVH/lWMcqZwE8MFAl7s11IACgkQ/lWMcqZw E8OYnQ/+K4ZGpU11t4IzXCyJYis2ZPYs/FlJ2BWXH89YhOckN1e1tq7uDBzUE8qK Hlz0gvH5C0WXR/PWqNglPXW7INwc0LtC8PSmvS4vvrZQBaJ2bvf19y7dROqJbR0E xTUje95eq+10H9TysCRTf1osIUuZIoR0gRna22pb+nplKVBkqsQPyPT21AWq4fN0 H/LQfKNfAAHtKwvfsMsuG2U+ZTyTYo7Xi6UP413WAqDmzhewnCm5plifM29m5LhB 9BmKk0/1pL3KzZuCQvcZw4kYUjXYsgoOqD4hkMAOLsjyf6Ad5zbPB5YTxNK0C+NU N04aHWvkRVl62A6rehgXdS5GJ3M4ORPDpIV9zQCVxMZV/886JLTGA1Wb+b3+umdk t5M40kzgYQTDqdSwFoCDCd1tFpEjnLbE7E+eM89AyzTPOxZowrVS0No1dJA3+ST/ g7JOdDu2Zg7VAar6zByow0pMppikZro9H1mpSnk+WHbYNF3dFmW3QHKRuxoRt+Ee l5G52LylwH3ZMPebGH9XB4cWtAUAHOsioe3CS/PKzGeUWNlUK29AqDCCBQmUdbcT HNm5/Yygdg3rRjkDBuUI0I/pifxMYvm+28eNfNGjwq5To9ABXPNONQCEBH6rke+S d1Z2nMmiVDf2MqhpkJppTKtHdMz13IGyZykXB7CdGnAu6k5s59c= =ZmKI -----END PGP SIGNATURE----- Merge tag 'drm-misc-next-2020-06-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next drm-misc-next for v5.9: UAPI Changes: - Add DRM_MODE_TYPE_USERDEF for video modes specified in cmdline. Cross-subsystem Changes: - Assorted devicetree binding updates. - Add might_sleep() to dma_fence_wait(). - Fix fbdev's get_user_pages_fast() handling, and use pin_user_pages. - Small cleanup with IS_BUILTIN in video/fbdev drivers. - Fix video/hdmi coding style for infoframe size. Core Changes: - Silence vblank output during init. - Fix DP-MST corruption during send msg timeout. - Clear leak in drm_gem_objecs_lookup(). - Make newlines work with force connector attribute. - Fix module refcounting error in drm_encoder_slave, and use new i2c api. - Header fix for drm_managed.c - More struct_mutex removal for !legacy drivers: - Remove gem_free_object() - Removal of drm_gem_object_put_unlocked(). - Show current->comm alongside pid in debug printfs. - Add drm_client_modeset_check() + drm_client_framebuffer_flush(). - Replace drm_fb_swab16 with drm_fb_swap that also supports 32-bits. - Remove mode->vrefresh, and compactify drm_display_mode. - Use drm_* macros for logging and warnings. - Add WARN when drm_gem_get_pages is used on a private obj. - Handle importing and imported dmabuf better in shmem helpers. - Small fix for drm/mm hole size comparison, and remove invalid entry optimization. - Add a drm/mm selftest. - Set DSI connector type for DSI panels. - Assorted small fixes and documentation updates. - Fix DDI I2C device registration for MST ports, and flushing on destroy. - Fix master_set return type, used by vmwgfx. - Make the drm_set/drop_master ioctl symmetrical. Driver Changes: Allow iommu in the sun4i driver and use it for sun8i. - Simplify backlight lookup for omap, amba-clcd and tilcdc. - Hold reg_lock for rockchip. - Add support for bridge gpio and lane reordering + polarity to ti-sn65dsi86, and fix clock choice. - Small assorted fixes to tilcdc, vc4, i915, omap, fbdev/sm712fb, fbdev/pxafb, console/newport_con, msm, virtio, udl, malidp, hdlcd, bridge/ti-sn65dsi86, panfrost. - Remove hw cursor support for mgag200, and use simple kms helper + shmem helpers. - Add support for KOE Allow iommu in the sun4i driver and use it for sun8i. - Simplify backlight lookup for omap, amba-clcd and tilcdc. - Hold reg_lock for rockchip. - Add support for bridge gpio and lane reordering + polarity to ti-sn65dsi86, and fix clock choice. - Small assorted fixes to tilcdc, vc4 (multiple), i915. - Remove hw cursor support for mgag200, and use simple kms helper + shmem helpers. - Add support for KOE TX26D202VM0BWA panel. - Use GEM CMA functions in arc, arm, atmel-hlcdc, fsi-dcu, hisilicon, imx, ingenic, komeda, malidp, mcde, meson, msxfb, rcar-du, shmobile, stm, sti, tilcdc, tve200, zte. - Remove gem_print_info. - Improve gem_create_object_helper so udl can use shmem helpers. - Convert vc4 dt bindings to schemas, and add clock properties. - Device initialization cleanups for mgag200. - Add a workaround to fix DP-MST short pulses handling on broken hardware in i915. - Allow build test compiling arm drivers. - Use managed pci functions in mgag200 and ast. - Use dev_groups in malidp. - Add per pixel alpha support for PX30 VOP in rockchip. - Silence deferred probe logs in panfrost. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/001cd9a6-405d-4e29-43d8-354f53ae4e8b@linux.intel.com
273 lines
6.8 KiB
C
273 lines
6.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 <drm/drm_file.h>
|
|
#include <drm/drm_fourcc.h>
|
|
|
|
#include "virtgpu_drv.h"
|
|
|
|
static int virtio_gpu_gem_create(struct drm_file *file,
|
|
struct drm_device *dev,
|
|
struct virtio_gpu_object_params *params,
|
|
struct drm_gem_object **obj_p,
|
|
uint32_t *handle_p)
|
|
{
|
|
struct virtio_gpu_device *vgdev = dev->dev_private;
|
|
struct virtio_gpu_object *obj;
|
|
int ret;
|
|
u32 handle;
|
|
|
|
if (vgdev->has_virgl_3d)
|
|
virtio_gpu_create_context(dev, file);
|
|
|
|
ret = virtio_gpu_object_create(vgdev, params, &obj, NULL);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret = drm_gem_handle_create(file, &obj->base.base, &handle);
|
|
if (ret) {
|
|
drm_gem_object_release(&obj->base.base);
|
|
return ret;
|
|
}
|
|
|
|
*obj_p = &obj->base.base;
|
|
|
|
/* drop reference from allocate - handle holds it now */
|
|
drm_gem_object_put(&obj->base.base);
|
|
|
|
*handle_p = handle;
|
|
return 0;
|
|
}
|
|
|
|
int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
|
|
struct drm_device *dev,
|
|
struct drm_mode_create_dumb *args)
|
|
{
|
|
struct drm_gem_object *gobj;
|
|
struct virtio_gpu_object_params params = { 0 };
|
|
int ret;
|
|
uint32_t pitch;
|
|
|
|
if (args->bpp != 32)
|
|
return -EINVAL;
|
|
|
|
pitch = args->width * 4;
|
|
args->size = pitch * args->height;
|
|
args->size = ALIGN(args->size, PAGE_SIZE);
|
|
|
|
params.format = virtio_gpu_translate_format(DRM_FORMAT_HOST_XRGB8888);
|
|
params.width = args->width;
|
|
params.height = args->height;
|
|
params.size = args->size;
|
|
params.dumb = true;
|
|
ret = virtio_gpu_gem_create(file_priv, dev, ¶ms, &gobj,
|
|
&args->handle);
|
|
if (ret)
|
|
goto fail;
|
|
|
|
args->pitch = pitch;
|
|
return ret;
|
|
|
|
fail:
|
|
return ret;
|
|
}
|
|
|
|
int virtio_gpu_mode_dumb_mmap(struct drm_file *file_priv,
|
|
struct drm_device *dev,
|
|
uint32_t handle, uint64_t *offset_p)
|
|
{
|
|
struct drm_gem_object *gobj;
|
|
|
|
BUG_ON(!offset_p);
|
|
gobj = drm_gem_object_lookup(file_priv, handle);
|
|
if (gobj == NULL)
|
|
return -ENOENT;
|
|
*offset_p = drm_vma_node_offset_addr(&gobj->vma_node);
|
|
drm_gem_object_put(gobj);
|
|
return 0;
|
|
}
|
|
|
|
int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
|
|
struct drm_file *file)
|
|
{
|
|
struct virtio_gpu_device *vgdev = obj->dev->dev_private;
|
|
struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
|
|
struct virtio_gpu_object_array *objs;
|
|
|
|
if (!vgdev->has_virgl_3d)
|
|
goto out_notify;
|
|
|
|
objs = virtio_gpu_array_alloc(1);
|
|
if (!objs)
|
|
return -ENOMEM;
|
|
virtio_gpu_array_add_obj(objs, obj);
|
|
|
|
virtio_gpu_cmd_context_attach_resource(vgdev, vfpriv->ctx_id,
|
|
objs);
|
|
out_notify:
|
|
virtio_gpu_notify(vgdev);
|
|
return 0;
|
|
}
|
|
|
|
void virtio_gpu_gem_object_close(struct drm_gem_object *obj,
|
|
struct drm_file *file)
|
|
{
|
|
struct virtio_gpu_device *vgdev = obj->dev->dev_private;
|
|
struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
|
|
struct virtio_gpu_object_array *objs;
|
|
|
|
if (!vgdev->has_virgl_3d)
|
|
return;
|
|
|
|
objs = virtio_gpu_array_alloc(1);
|
|
if (!objs)
|
|
return;
|
|
virtio_gpu_array_add_obj(objs, obj);
|
|
|
|
virtio_gpu_cmd_context_detach_resource(vgdev, vfpriv->ctx_id,
|
|
objs);
|
|
virtio_gpu_notify(vgdev);
|
|
}
|
|
|
|
struct virtio_gpu_object_array *virtio_gpu_array_alloc(u32 nents)
|
|
{
|
|
struct virtio_gpu_object_array *objs;
|
|
size_t size = sizeof(*objs) + sizeof(objs->objs[0]) * nents;
|
|
|
|
objs = kmalloc(size, GFP_KERNEL);
|
|
if (!objs)
|
|
return NULL;
|
|
|
|
objs->nents = 0;
|
|
objs->total = nents;
|
|
return objs;
|
|
}
|
|
|
|
static void virtio_gpu_array_free(struct virtio_gpu_object_array *objs)
|
|
{
|
|
kfree(objs);
|
|
}
|
|
|
|
struct virtio_gpu_object_array*
|
|
virtio_gpu_array_from_handles(struct drm_file *drm_file, u32 *handles, u32 nents)
|
|
{
|
|
struct virtio_gpu_object_array *objs;
|
|
u32 i;
|
|
|
|
objs = virtio_gpu_array_alloc(nents);
|
|
if (!objs)
|
|
return NULL;
|
|
|
|
for (i = 0; i < nents; i++) {
|
|
objs->objs[i] = drm_gem_object_lookup(drm_file, handles[i]);
|
|
if (!objs->objs[i]) {
|
|
objs->nents = i;
|
|
virtio_gpu_array_put_free(objs);
|
|
return NULL;
|
|
}
|
|
}
|
|
objs->nents = i;
|
|
return objs;
|
|
}
|
|
|
|
void virtio_gpu_array_add_obj(struct virtio_gpu_object_array *objs,
|
|
struct drm_gem_object *obj)
|
|
{
|
|
if (WARN_ON_ONCE(objs->nents == objs->total))
|
|
return;
|
|
|
|
drm_gem_object_get(obj);
|
|
objs->objs[objs->nents] = obj;
|
|
objs->nents++;
|
|
}
|
|
|
|
int virtio_gpu_array_lock_resv(struct virtio_gpu_object_array *objs)
|
|
{
|
|
int ret;
|
|
|
|
if (objs->nents == 1) {
|
|
ret = dma_resv_lock_interruptible(objs->objs[0]->resv, NULL);
|
|
} else {
|
|
ret = drm_gem_lock_reservations(objs->objs, objs->nents,
|
|
&objs->ticket);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void virtio_gpu_array_unlock_resv(struct virtio_gpu_object_array *objs)
|
|
{
|
|
if (objs->nents == 1) {
|
|
dma_resv_unlock(objs->objs[0]->resv);
|
|
} else {
|
|
drm_gem_unlock_reservations(objs->objs, objs->nents,
|
|
&objs->ticket);
|
|
}
|
|
}
|
|
|
|
void virtio_gpu_array_add_fence(struct virtio_gpu_object_array *objs,
|
|
struct dma_fence *fence)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < objs->nents; i++)
|
|
dma_resv_add_excl_fence(objs->objs[i]->resv, fence);
|
|
}
|
|
|
|
void virtio_gpu_array_put_free(struct virtio_gpu_object_array *objs)
|
|
{
|
|
u32 i;
|
|
|
|
for (i = 0; i < objs->nents; i++)
|
|
drm_gem_object_put(objs->objs[i]);
|
|
virtio_gpu_array_free(objs);
|
|
}
|
|
|
|
void virtio_gpu_array_put_free_delayed(struct virtio_gpu_device *vgdev,
|
|
struct virtio_gpu_object_array *objs)
|
|
{
|
|
spin_lock(&vgdev->obj_free_lock);
|
|
list_add_tail(&objs->next, &vgdev->obj_free_list);
|
|
spin_unlock(&vgdev->obj_free_lock);
|
|
schedule_work(&vgdev->obj_free_work);
|
|
}
|
|
|
|
void virtio_gpu_array_put_free_work(struct work_struct *work)
|
|
{
|
|
struct virtio_gpu_device *vgdev =
|
|
container_of(work, struct virtio_gpu_device, obj_free_work);
|
|
struct virtio_gpu_object_array *objs;
|
|
|
|
spin_lock(&vgdev->obj_free_lock);
|
|
while (!list_empty(&vgdev->obj_free_list)) {
|
|
objs = list_first_entry(&vgdev->obj_free_list,
|
|
struct virtio_gpu_object_array, next);
|
|
list_del(&objs->next);
|
|
spin_unlock(&vgdev->obj_free_lock);
|
|
virtio_gpu_array_put_free(objs);
|
|
spin_lock(&vgdev->obj_free_lock);
|
|
}
|
|
spin_unlock(&vgdev->obj_free_lock);
|
|
}
|