From patchwork Wed Mar 21 15:29:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 10299711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B37C6602B3 for ; Wed, 21 Mar 2018 15:37:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A79AE28D82 for ; Wed, 21 Mar 2018 15:37:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BF9F297BC; Wed, 21 Mar 2018 15:37:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0CC7928D82 for ; Wed, 21 Mar 2018 15:37:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=5fQrXjQeHVeXIUkERCPQGJmGVROIIZ9tx0TVCrxS8tU=; b=ssT1Xy1SeyP5ECMq1Ruz1qBQsX txvGeDvaf4j+ocYR2g/5Q4qqTSgNyHyY7pSAr+MmEitNHLd7hygDEVMasinQx1qaMV+u2iC+JbMIq VeWUuQ95GtLyZ7TFbUrU+vruxM+fmz08JpuklEMojA/5PRvwP1KpZiKQGJsR+oj3xqSRsj3iOo/FL ktqUlOTC0ifaKZiIOOlB8YfGpF54XfbozP04OoCM8SHgVM6q6Fd9fTBHDqeTKQkYAGZW+IqtcGLK7 YVpYwgMo6CdtpvcER9YJ/y6skKc4Yn9YjVQbkxy7x7QTTpc8sFONzaiYNb8fzgdE2op4qK33Zbn55 UDTDQUug==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyfnw-0008RP-1S; Wed, 21 Mar 2018 15:37:32 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyfho-00048s-Ga for linux-arm-kernel@lists.infradead.org; Wed, 21 Mar 2018 15:31:28 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id E5A56208A8; Wed, 21 Mar 2018 16:30:47 +0100 (CET) Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.bootlin.com (Postfix) with ESMTPSA id 6111F203B8; Wed, 21 Mar 2018 16:30:47 +0100 (CET) From: Paul Kocialkowski To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/10] drm/sun4i: Add a dedicated ioctl call for allocating tiled buffers Date: Wed, 21 Mar 2018 16:29:03 +0100 Message-Id: <20180321152904.22411-10-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180321152904.22411-1-paul.kocialkowski@bootlin.com> References: <20180321152904.22411-1-paul.kocialkowski@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180321_083113_742634_5E182639 X-CRM114-Status: GOOD ( 21.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Gustavo Padovan , Paul Kocialkowski , Chen-Yu Tsai , Sean Paul , Daniel Vetter , Maxime Ripard MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This introduces a dedicated ioctl for allocating tiled buffers in the Allwinner MB32 format, that comes with a handful of specific constraints. In particular, the stride of the buffers is expected to be aligned to 32 bytes. Signed-off-by: Paul Kocialkowski --- drivers/gpu/drm/sun4i/sun4i_drv.c | 96 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/sun4i/sun4i_drv.h | 2 + include/uapi/drm/sun4i_drm.h | 42 +++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 include/uapi/drm/sun4i_drm.h diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index d374bb61c565..e9cb03d34b44 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -21,11 +21,18 @@ #include #include #include +#include #include "sun4i_drv.h" #include "sun4i_frontend.h" #include "sun4i_framebuffer.h" #include "sun4i_tcon.h" +#include "sun4i_format.h" + +static const struct drm_ioctl_desc sun4i_drv_ioctls[] = { + DRM_IOCTL_DEF_DRV(SUN4I_GEM_CREATE_TILED, drm_sun4i_gem_create_tiled, + DRM_AUTH | DRM_RENDER_ALLOW), +}; DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops); @@ -34,6 +41,8 @@ static struct drm_driver sun4i_drv_driver = { /* Generic Operations */ .lastclose = drm_fb_helper_lastclose, + .ioctls = sun4i_drv_ioctls, + .num_ioctls = ARRAY_SIZE(sun4i_drv_ioctls), .fops = &sun4i_drv_fops, .name = "sun4i-drm", .desc = "Allwinner sun4i Display Engine", @@ -69,6 +78,93 @@ int drm_sun4i_gem_dumb_create(struct drm_file *file_priv, return drm_gem_cma_dumb_create_internal(file_priv, drm, args); } +int drm_sun4i_gem_create_tiled(struct drm_device *drm, void *data, + struct drm_file *file_priv) +{ + struct drm_sun4i_gem_create_tiled *args = data; + struct drm_gem_cma_object *cma_obj; + struct drm_gem_object *gem_obj; + uint32_t luma_stride, chroma_stride; + uint32_t luma_height, chroma_height; + int ret; + + if (!sun4i_format_supports_tiling(args->format)) + return -EINVAL; + + memset(args->pitches, 0, sizeof(args->pitches)); + memset(args->offsets, 0, sizeof(args->offsets)); + + /* Stride and height are aligned to 32 bytes for MB32 tiled format. */ + luma_stride = ALIGN(args->width, 32); + luma_height = ALIGN(args->height, 32); + + if (sun4i_format_is_semiplanar(args->format)) { + chroma_stride = luma_stride; + + if (sun4i_format_is_yuv420(args->format)) + chroma_height = ALIGN(DIV_ROUND_UP(args->height, 2), 32); + else if (sun4i_format_is_yuv422(args->format)) + chroma_height = luma_height; + else + return -EINVAL; + + args->pitches[0] = luma_stride; + args->pitches[1] = chroma_stride; + + args->offsets[0] = 0; + args->offsets[1] = luma_stride * luma_height; + + args->size = luma_stride * luma_height + + chroma_stride * chroma_height; + } else if (sun4i_format_is_planar(args->format)) { + if (sun4i_format_is_yuv411(args->format)) { + chroma_stride = ALIGN(DIV_ROUND_UP(args->width, 4), 32); + chroma_height = luma_height; + } if (sun4i_format_is_yuv420(args->format)) { + chroma_stride = ALIGN(DIV_ROUND_UP(args->width, 2), 32); + chroma_height = ALIGN(DIV_ROUND_UP(args->height, 2), 32); + } else if (sun4i_format_is_yuv422(args->format)) { + chroma_stride = ALIGN(DIV_ROUND_UP(args->width, 2), 32); + chroma_height = luma_height; + } else { + return -EINVAL; + } + + args->pitches[0] = luma_stride; + args->pitches[1] = chroma_stride; + args->pitches[2] = chroma_stride; + + args->offsets[0] = 0; + args->offsets[1] = luma_stride * luma_height; + args->offsets[2] = luma_stride * luma_height + + chroma_stride * chroma_height; + + args->size = luma_stride * luma_height + + chroma_stride * chroma_height * 2; + } else { + /* No support for packed formats in tiled mode. */ + return -EINVAL; + } + + cma_obj = drm_gem_cma_create(drm, args->size); + if (IS_ERR(cma_obj)) + return PTR_ERR(cma_obj); + + gem_obj = &cma_obj->base; + + /* + * 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, gem_obj, &args->handle); + /* drop reference from allocate - handle holds it now. */ + drm_gem_object_put_unlocked(gem_obj); + if (ret) + return ret; + + return PTR_ERR_OR_ZERO(cma_obj); +} + static void sun4i_remove_framebuffers(void) { struct apertures_struct *ap; diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.h b/drivers/gpu/drm/sun4i/sun4i_drv.h index 47969711a889..308ff4bfcdd5 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.h +++ b/drivers/gpu/drm/sun4i/sun4i_drv.h @@ -26,5 +26,7 @@ struct sun4i_drv { int drm_sun4i_gem_dumb_create(struct drm_file *file_priv, struct drm_device *drm, struct drm_mode_create_dumb *args); +int drm_sun4i_gem_create_tiled(struct drm_device *dev, void *data, + struct drm_file *file_priv); #endif /* _SUN4I_DRV_H_ */ diff --git a/include/uapi/drm/sun4i_drm.h b/include/uapi/drm/sun4i_drm.h new file mode 100644 index 000000000000..2c77584b057b --- /dev/null +++ b/include/uapi/drm/sun4i_drm.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* sun4i_drm.h + * + * Copyright (C) 2018 Paul Kocialkowski + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#ifndef _UAPI_SUN4I_DRM_H_ +#define _UAPI_SUN4I_DRM_H_ + +#include "drm.h" + +#if defined(__cplusplus) +extern "C" { +#endif + +struct drm_sun4i_gem_create_tiled { + __u32 height; + __u32 width; + __u32 format; + /* handle, offsets, pitches, size will be returned */ + __u32 handle; + __u32 pitches[4]; + __u32 offsets[4]; + __u64 size; +}; + +#define DRM_SUN4I_GEM_CREATE_TILED 0x00 + +#define DRM_IOCTL_SUN4I_GEM_CREATE_TILED \ + DRM_IOWR(DRM_COMMAND_BASE + DRM_SUN4I_GEM_CREATE_TILED, \ + struct drm_sun4i_gem_create_tiled) + +#if defined(__cplusplus) +} +#endif + +#endif /* _UAPI_SUN4I_DRM_H_ */