mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 10:32:35 +00: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
293 lines
6.5 KiB
C
293 lines
6.5 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (c) 2015 MediaTek Inc.
|
|
*/
|
|
|
|
#include <linux/dma-buf.h>
|
|
|
|
#include <drm/drm.h>
|
|
#include <drm/drm_device.h>
|
|
#include <drm/drm_gem.h>
|
|
#include <drm/drm_prime.h>
|
|
|
|
#include "mtk_drm_drv.h"
|
|
#include "mtk_drm_gem.h"
|
|
|
|
static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev,
|
|
unsigned long size)
|
|
{
|
|
struct mtk_drm_gem_obj *mtk_gem_obj;
|
|
int ret;
|
|
|
|
size = round_up(size, PAGE_SIZE);
|
|
|
|
mtk_gem_obj = kzalloc(sizeof(*mtk_gem_obj), GFP_KERNEL);
|
|
if (!mtk_gem_obj)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
ret = drm_gem_object_init(dev, &mtk_gem_obj->base, size);
|
|
if (ret < 0) {
|
|
DRM_ERROR("failed to initialize gem object\n");
|
|
kfree(mtk_gem_obj);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
return mtk_gem_obj;
|
|
}
|
|
|
|
struct mtk_drm_gem_obj *mtk_drm_gem_create(struct drm_device *dev,
|
|
size_t size, bool alloc_kmap)
|
|
{
|
|
struct mtk_drm_private *priv = dev->dev_private;
|
|
struct mtk_drm_gem_obj *mtk_gem;
|
|
struct drm_gem_object *obj;
|
|
int ret;
|
|
|
|
mtk_gem = mtk_drm_gem_init(dev, size);
|
|
if (IS_ERR(mtk_gem))
|
|
return ERR_CAST(mtk_gem);
|
|
|
|
obj = &mtk_gem->base;
|
|
|
|
mtk_gem->dma_attrs = DMA_ATTR_WRITE_COMBINE;
|
|
|
|
if (!alloc_kmap)
|
|
mtk_gem->dma_attrs |= DMA_ATTR_NO_KERNEL_MAPPING;
|
|
|
|
mtk_gem->cookie = dma_alloc_attrs(priv->dma_dev, obj->size,
|
|
&mtk_gem->dma_addr, GFP_KERNEL,
|
|
mtk_gem->dma_attrs);
|
|
if (!mtk_gem->cookie) {
|
|
DRM_ERROR("failed to allocate %zx byte dma buffer", obj->size);
|
|
ret = -ENOMEM;
|
|
goto err_gem_free;
|
|
}
|
|
|
|
if (alloc_kmap)
|
|
mtk_gem->kvaddr = mtk_gem->cookie;
|
|
|
|
DRM_DEBUG_DRIVER("cookie = %p dma_addr = %pad size = %zu\n",
|
|
mtk_gem->cookie, &mtk_gem->dma_addr,
|
|
size);
|
|
|
|
return mtk_gem;
|
|
|
|
err_gem_free:
|
|
drm_gem_object_release(obj);
|
|
kfree(mtk_gem);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
void mtk_drm_gem_free_object(struct drm_gem_object *obj)
|
|
{
|
|
struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
|
|
struct mtk_drm_private *priv = obj->dev->dev_private;
|
|
|
|
if (mtk_gem->sg)
|
|
drm_prime_gem_destroy(obj, mtk_gem->sg);
|
|
else
|
|
dma_free_attrs(priv->dma_dev, obj->size, mtk_gem->cookie,
|
|
mtk_gem->dma_addr, mtk_gem->dma_attrs);
|
|
|
|
/* release file pointer to gem object. */
|
|
drm_gem_object_release(obj);
|
|
|
|
kfree(mtk_gem);
|
|
}
|
|
|
|
int mtk_drm_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
|
|
struct drm_mode_create_dumb *args)
|
|
{
|
|
struct mtk_drm_gem_obj *mtk_gem;
|
|
int ret;
|
|
|
|
args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
|
|
args->size = args->pitch * args->height;
|
|
|
|
mtk_gem = mtk_drm_gem_create(dev, args->size, false);
|
|
if (IS_ERR(mtk_gem))
|
|
return PTR_ERR(mtk_gem);
|
|
|
|
/*
|
|
* allocate a id of idr table where the obj is registered
|
|
* and handle has the id what user can see.
|
|
*/
|
|
ret = drm_gem_handle_create(file_priv, &mtk_gem->base, &args->handle);
|
|
if (ret)
|
|
goto err_handle_create;
|
|
|
|
/* drop reference from allocate - handle holds it now. */
|
|
drm_gem_object_put(&mtk_gem->base);
|
|
|
|
return 0;
|
|
|
|
err_handle_create:
|
|
mtk_drm_gem_free_object(&mtk_gem->base);
|
|
return ret;
|
|
}
|
|
|
|
static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj,
|
|
struct vm_area_struct *vma)
|
|
|
|
{
|
|
int ret;
|
|
struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
|
|
struct mtk_drm_private *priv = obj->dev->dev_private;
|
|
|
|
/*
|
|
* dma_alloc_attrs() allocated a struct page table for mtk_gem, so clear
|
|
* VM_PFNMAP flag that was set by drm_gem_mmap_obj()/drm_gem_mmap().
|
|
*/
|
|
vma->vm_flags &= ~VM_PFNMAP;
|
|
|
|
ret = dma_mmap_attrs(priv->dma_dev, vma, mtk_gem->cookie,
|
|
mtk_gem->dma_addr, obj->size, mtk_gem->dma_attrs);
|
|
if (ret)
|
|
drm_gem_vm_close(vma);
|
|
|
|
return ret;
|
|
}
|
|
|
|
int mtk_drm_gem_mmap_buf(struct drm_gem_object *obj, struct vm_area_struct *vma)
|
|
{
|
|
int ret;
|
|
|
|
ret = drm_gem_mmap_obj(obj, obj->size, vma);
|
|
if (ret)
|
|
return ret;
|
|
|
|
return mtk_drm_gem_object_mmap(obj, vma);
|
|
}
|
|
|
|
int mtk_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
|
|
{
|
|
struct drm_gem_object *obj;
|
|
int ret;
|
|
|
|
ret = drm_gem_mmap(filp, vma);
|
|
if (ret)
|
|
return ret;
|
|
|
|
obj = vma->vm_private_data;
|
|
|
|
/*
|
|
* Set vm_pgoff (used as a fake buffer offset by DRM) to 0 and map the
|
|
* whole buffer from the start.
|
|
*/
|
|
vma->vm_pgoff = 0;
|
|
|
|
return mtk_drm_gem_object_mmap(obj, vma);
|
|
}
|
|
|
|
/*
|
|
* Allocate a sg_table for this GEM object.
|
|
* Note: Both the table's contents, and the sg_table itself must be freed by
|
|
* the caller.
|
|
* Returns a pointer to the newly allocated sg_table, or an ERR_PTR() error.
|
|
*/
|
|
struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj)
|
|
{
|
|
struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
|
|
struct mtk_drm_private *priv = obj->dev->dev_private;
|
|
struct sg_table *sgt;
|
|
int ret;
|
|
|
|
sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
|
|
if (!sgt)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
ret = dma_get_sgtable_attrs(priv->dma_dev, sgt, mtk_gem->cookie,
|
|
mtk_gem->dma_addr, obj->size,
|
|
mtk_gem->dma_attrs);
|
|
if (ret) {
|
|
DRM_ERROR("failed to allocate sgt, %d\n", ret);
|
|
kfree(sgt);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
return sgt;
|
|
}
|
|
|
|
struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *dev,
|
|
struct dma_buf_attachment *attach, struct sg_table *sg)
|
|
{
|
|
struct mtk_drm_gem_obj *mtk_gem;
|
|
int ret;
|
|
struct scatterlist *s;
|
|
unsigned int i;
|
|
dma_addr_t expected;
|
|
|
|
mtk_gem = mtk_drm_gem_init(dev, attach->dmabuf->size);
|
|
|
|
if (IS_ERR(mtk_gem))
|
|
return ERR_CAST(mtk_gem);
|
|
|
|
expected = sg_dma_address(sg->sgl);
|
|
for_each_sg(sg->sgl, s, sg->nents, i) {
|
|
if (!sg_dma_len(s))
|
|
break;
|
|
|
|
if (sg_dma_address(s) != expected) {
|
|
DRM_ERROR("sg_table is not contiguous");
|
|
ret = -EINVAL;
|
|
goto err_gem_free;
|
|
}
|
|
expected = sg_dma_address(s) + sg_dma_len(s);
|
|
}
|
|
|
|
mtk_gem->dma_addr = sg_dma_address(sg->sgl);
|
|
mtk_gem->sg = sg;
|
|
|
|
return &mtk_gem->base;
|
|
|
|
err_gem_free:
|
|
kfree(mtk_gem);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj)
|
|
{
|
|
struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
|
|
struct sg_table *sgt;
|
|
struct sg_page_iter iter;
|
|
unsigned int npages;
|
|
unsigned int i = 0;
|
|
|
|
if (mtk_gem->kvaddr)
|
|
return mtk_gem->kvaddr;
|
|
|
|
sgt = mtk_gem_prime_get_sg_table(obj);
|
|
if (IS_ERR(sgt))
|
|
return NULL;
|
|
|
|
npages = obj->size >> PAGE_SHIFT;
|
|
mtk_gem->pages = kcalloc(npages, sizeof(*mtk_gem->pages), GFP_KERNEL);
|
|
if (!mtk_gem->pages)
|
|
goto out;
|
|
|
|
for_each_sg_page(sgt->sgl, &iter, sgt->orig_nents, 0) {
|
|
mtk_gem->pages[i++] = sg_page_iter_page(&iter);
|
|
if (i > npages)
|
|
break;
|
|
}
|
|
mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
|
|
pgprot_writecombine(PAGE_KERNEL));
|
|
|
|
out:
|
|
kfree(sgt);
|
|
|
|
return mtk_gem->kvaddr;
|
|
}
|
|
|
|
void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
|
|
{
|
|
struct mtk_drm_gem_obj *mtk_gem = to_mtk_gem_obj(obj);
|
|
|
|
if (!mtk_gem->pages)
|
|
return;
|
|
|
|
vunmap(vaddr);
|
|
mtk_gem->kvaddr = 0;
|
|
kfree(mtk_gem->pages);
|
|
}
|