From nobody Sun Dec 14 19:20:10 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E125770E2 for ; Fri, 18 Apr 2025 02:27:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744943275; cv=pass; b=W3o5vblyJV2f6UdCOIJoP46Si7EuckGOVy1PKgJQD6m7Vynn89vvQ9YWmE0Ukxk+5M+nv/IdMXfmDm6T77au5LXOEBOOloZU7s2NutHFGRmiywBOkIZnyYr5dBhl6evpHJKn59u5jrelf4qQ2OAdbQdBwpAHlcFtG96c5hvKQ4k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744943275; c=relaxed/simple; bh=pQOOToWRpt0r2Mkw6YvWp7W2NiLK4vgZJsXzQC63c3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l1nbKXfq+vtaWygrgHgfQsQAVhmspu4duF2Okg7M8fyWSL7OyMpgre4ylUx2ad9cv4FPYmOjbU6MmY5q1RYHNbFeuXd01yGORlFt5dXx6CWO2jeyPw+3C3hNoorVEeUWK9l4XMrCxEUuXlisKMLJYqWCOMqP09NVG6WT2Is8Acw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=Zn6GtviS; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="Zn6GtviS" ARC-Seal: i=1; a=rsa-sha256; t=1744943250; cv=none; d=zohomail.com; s=zohoarc; b=YfFsrgj+6jyH1x7eaGYxSKzlZsltn13f6KvfHGDWw5QHuHqnXKuD4LIIa2VVB+++LxtHosG/ZhY8XzI34hCYNoAvGEjZfbMFwy2Sta4Zo+AtYadh8q+8t3hsCJzg1CBcVWpE2Qrjrzo7DOrBIbvofIPnCCKHufzujxz6RPVFKJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744943250; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=mHawrPUxsak51ks72/c+7CHtoLnjJbLOJvRyvM/biaE=; b=KJ12KhBh4LNZjEKpdOu84baT5Nm4m1yBof7cB/1GKQWY8v0Z3vBpEgx1xJLiStLUdsR9MJ2n1ylFUnkjnW7aO4hV77ojOZOof9cgVz885RKZfXKdvEfPSs/MZi2Cb+wY1hxJ7hhfSFYrYg1eUyEEBuXdcB9hZXe56qJre9NFNl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1744943250; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=mHawrPUxsak51ks72/c+7CHtoLnjJbLOJvRyvM/biaE=; b=Zn6GtviSqSSb2R5Z/G4qjPjgBPkcVAhOrCZq0jZHVooarDc8lzdlj0Thm/tL7k3C RFYQTSD8B2WWf+4FFjFlNl13DYP6mi2CmBcsbj/gcgovotWbIspXEx46cgyjPEYim+n kCfD87rMtIdvBTDE2rd1rlKDBKYFlTiX7AOS0Yz0= Received: by mx.zohomail.com with SMTPS id 1744943249017985.0312455294368; Thu, 17 Apr 2025 19:27:29 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Boris Brezillon , kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , Liviu Dudau , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Subject: [PATCH v9 2/4] drm/panthor: Add driver IOCTL for setting BO labels Date: Fri, 18 Apr 2025 03:27:05 +0100 Message-ID: <20250418022710.74749-3-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250418022710.74749-1-adrian.larumbe@collabora.com> References: <20250418022710.74749-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Allow UM to label a BO for which it possesses a DRM handle. Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Liviu Dudau Reviewed-by: Boris Brezillon Reviewed-by: Steven Price --- drivers/gpu/drm/panthor/panthor_drv.c | 45 ++++++++++++++++++++++++++- drivers/gpu/drm/panthor/panthor_gem.h | 2 ++ include/uapi/drm/panthor_drm.h | 23 ++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/pantho= r/panthor_drv.c index 06fe46e32073..8a193886719e 100644 --- a/drivers/gpu/drm/panthor/panthor_drv.c +++ b/drivers/gpu/drm/panthor/panthor_drv.c @@ -1331,6 +1331,47 @@ static int panthor_ioctl_vm_get_state(struct drm_dev= ice *ddev, void *data, return 0; } =20 +static int panthor_ioctl_bo_set_label(struct drm_device *ddev, void *data, + struct drm_file *file) +{ + struct drm_panthor_bo_set_label *args =3D data; + struct drm_gem_object *obj; + const char *label =3D NULL; + int ret =3D 0; + + if (args->pad) + return -EINVAL; + + obj =3D drm_gem_object_lookup(file, args->handle); + if (!obj) + return -ENOENT; + + if (args->label) { + label =3D strndup_user((const char __user *)(uintptr_t)args->label, + PANTHOR_BO_LABEL_MAXLEN); + if (IS_ERR(label)) { + ret =3D PTR_ERR(label); + if (ret =3D=3D -EINVAL) + ret =3D -E2BIG; + goto err_put_obj; + } + } + + /* + * We treat passing a label of length 0 and passing a NULL label + * differently, because even though they might seem conceptually + * similar, future uses of the BO label might expect a different + * behaviour in each case. + */ + panthor_gem_bo_set_label(obj, label); + +err_put_obj: + drm_gem_object_put(obj); + + return ret; +} + + static int panthor_open(struct drm_device *ddev, struct drm_file *file) { @@ -1400,6 +1441,7 @@ static const struct drm_ioctl_desc panthor_drm_driver= _ioctls[] =3D { PANTHOR_IOCTL(TILER_HEAP_CREATE, tiler_heap_create, DRM_RENDER_ALLOW), PANTHOR_IOCTL(TILER_HEAP_DESTROY, tiler_heap_destroy, DRM_RENDER_ALLOW), PANTHOR_IOCTL(GROUP_SUBMIT, group_submit, DRM_RENDER_ALLOW), + PANTHOR_IOCTL(BO_SET_LABEL, bo_set_label, DRM_RENDER_ALLOW), }; =20 static int panthor_mmap(struct file *filp, struct vm_area_struct *vma) @@ -1509,6 +1551,7 @@ static void panthor_debugfs_init(struct drm_minor *mi= nor) * - 1.2 - adds DEV_QUERY_GROUP_PRIORITIES_INFO query * - adds PANTHOR_GROUP_PRIORITY_REALTIME priority * - 1.3 - adds DRM_PANTHOR_GROUP_STATE_INNOCENT flag + * - 1.4 - adds DRM_IOCTL_PANTHOR_BO_SET_LABEL ioctl */ static const struct drm_driver panthor_drm_driver =3D { .driver_features =3D DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ | @@ -1522,7 +1565,7 @@ static const struct drm_driver panthor_drm_driver =3D= { .name =3D "panthor", .desc =3D "Panthor DRM driver", .major =3D 1, - .minor =3D 3, + .minor =3D 4, =20 .gem_create_object =3D panthor_gem_create_object, .gem_prime_import_sg_table =3D drm_gem_shmem_prime_import_sg_table, diff --git a/drivers/gpu/drm/panthor/panthor_gem.h b/drivers/gpu/drm/pantho= r/panthor_gem.h index af0d77338860..983cc8ca264e 100644 --- a/drivers/gpu/drm/panthor/panthor_gem.h +++ b/drivers/gpu/drm/panthor/panthor_gem.h @@ -13,6 +13,8 @@ =20 struct panthor_vm; =20 +#define PANTHOR_BO_LABEL_MAXLEN 4096 + /** * struct panthor_gem_object - Driver specific GEM object. */ diff --git a/include/uapi/drm/panthor_drm.h b/include/uapi/drm/panthor_drm.h index 97e2c4510e69..ad9a70afea6c 100644 --- a/include/uapi/drm/panthor_drm.h +++ b/include/uapi/drm/panthor_drm.h @@ -127,6 +127,9 @@ enum drm_panthor_ioctl_id { =20 /** @DRM_PANTHOR_TILER_HEAP_DESTROY: Destroy a tiler heap. */ DRM_PANTHOR_TILER_HEAP_DESTROY, + + /** @DRM_PANTHOR_BO_SET_LABEL: Label a BO. */ + DRM_PANTHOR_BO_SET_LABEL, }; =20 /** @@ -977,6 +980,24 @@ struct drm_panthor_tiler_heap_destroy { __u32 pad; }; =20 +/** + * struct drm_panthor_bo_set_label - Arguments passed to DRM_IOCTL_PANTHOR= _BO_SET_LABEL + */ +struct drm_panthor_bo_set_label { + /** @handle: Handle of the buffer object to label. */ + __u32 handle; + + /** @pad: MBZ. */ + __u32 pad; + + /** + * @label: User pointer to a NUL-terminated string + * + * Length cannot be greater than 4096 + */ + __u64 label; +}; + /** * DRM_IOCTL_PANTHOR() - Build a Panthor IOCTL number * @__access: Access type. Must be R, W or RW. @@ -1019,6 +1040,8 @@ enum { DRM_IOCTL_PANTHOR(WR, TILER_HEAP_CREATE, tiler_heap_create), DRM_IOCTL_PANTHOR_TILER_HEAP_DESTROY =3D DRM_IOCTL_PANTHOR(WR, TILER_HEAP_DESTROY, tiler_heap_destroy), + DRM_IOCTL_PANTHOR_BO_SET_LABEL =3D + DRM_IOCTL_PANTHOR(WR, BO_SET_LABEL, bo_set_label), }; =20 #if defined(__cplusplus) --=20 2.48.1