From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80FD8C33CAE for ; Mon, 13 Jan 2020 17:13:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 60A612075B for ; Mon, 13 Jan 2020 17:13:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60A612075B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A299C6E10C; Mon, 13 Jan 2020 17:13:35 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DD3B6E096; Mon, 13 Jan 2020 17:13:34 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2020 09:13:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,429,1571727600"; d="scan'208";a="244968908" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga001.fm.intel.com with SMTP; 13 Jan 2020 09:13:29 -0800 Received: by stinkbox (sSMTP sendmail emulation); Mon, 13 Jan 2020 19:13:29 +0200 Date: Mon, 13 Jan 2020 19:13:29 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Juston Li Subject: Re: [PATCH v3] drm: Add getfb2 ioctl Message-ID: <20200113171329.GT13686@intel.com> References: <20191217034642.3814-1-juston.li@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191217034642.3814-1-juston.li@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Stone , Daniel Vetter , tutankhamen@google.com, dri-devel@lists.freedesktop.org, dcastagna@google.com, intel-gfx@lists.freedesktop.org, markyacoub@google.com Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Dec 16, 2019 at 07:46:43PM -0800, Juston Li wrote: > From: Daniel Stone > = > getfb2 allows us to pass multiple planes and modifiers, just like addfb2 > over addfb. > = > Changes since v2: > - add privilege checks from getfb1 since handles should only be > returned to master/root > = > Changes since v1: > - unused modifiers set to 0 instead of DRM_FORMAT_MOD_INVALID > - update ioctl number > = > Signed-off-by: Daniel Stone > Signed-off-by: Juston Li > Acked-by: Daniel Vetter lgtm Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/drm_crtc_internal.h | 2 + > drivers/gpu/drm/drm_framebuffer.c | 122 ++++++++++++++++++++++++++++ > drivers/gpu/drm/drm_ioctl.c | 1 + > include/uapi/drm/drm.h | 2 + > 4 files changed, 127 insertions(+) > = > diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_cr= tc_internal.h > index c7d5e4c21423..16f2413403aa 100644 > --- a/drivers/gpu/drm/drm_crtc_internal.h > +++ b/drivers/gpu/drm/drm_crtc_internal.h > @@ -216,6 +216,8 @@ int drm_mode_rmfb_ioctl(struct drm_device *dev, > void *data, struct drm_file *file_priv); > int drm_mode_getfb(struct drm_device *dev, > void *data, struct drm_file *file_priv); > +int drm_mode_getfb2_ioctl(struct drm_device *dev, > + void *data, struct drm_file *file_priv); > int drm_mode_dirtyfb_ioctl(struct drm_device *dev, > void *data, struct drm_file *file_priv); > = > diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_fram= ebuffer.c > index 57564318ceea..57ac94ce9b9e 100644 > --- a/drivers/gpu/drm/drm_framebuffer.c > +++ b/drivers/gpu/drm/drm_framebuffer.c > @@ -31,6 +31,7 @@ > #include > #include > #include > +#include > #include > #include > = > @@ -548,7 +549,128 @@ int drm_mode_getfb(struct drm_device *dev, > = > out: > drm_framebuffer_put(fb); > + return ret; > +} > + > +/** > + * drm_mode_getfb2 - get extended FB info > + * @dev: drm device for the ioctl > + * @data: data pointer for the ioctl > + * @file_priv: drm file for the ioctl call > + * > + * Lookup the FB given its ID and return info about it. > + * > + * Called by the user via ioctl. > + * > + * Returns: > + * Zero on success, negative errno on failure. > + */ > +int drm_mode_getfb2_ioctl(struct drm_device *dev, > + void *data, struct drm_file *file_priv) > +{ > + struct drm_mode_fb_cmd2 *r =3D data; > + struct drm_framebuffer *fb; > + unsigned int i; > + int ret; > + > + if (!drm_core_check_feature(dev, DRIVER_MODESET)) > + return -EINVAL; > + > + fb =3D drm_framebuffer_lookup(dev, file_priv, r->fb_id); > + if (!fb) > + return -ENOENT; > + > + /* For multi-plane framebuffers, we require the driver to place the > + * GEM objects directly in the drm_framebuffer. For single-plane > + * framebuffers, we can fall back to create_handle. > + */ > + if (!fb->obj[0] && > + (fb->format->num_planes > 1 || !fb->funcs->create_handle)) { > + ret =3D -ENODEV; > + goto out; > + } > + > + r->height =3D fb->height; > + r->width =3D fb->width; > + r->pixel_format =3D fb->format->format; > + > + r->flags =3D 0; > + if (dev->mode_config.allow_fb_modifiers) > + r->flags |=3D DRM_MODE_FB_MODIFIERS; > + > + for (i =3D 0; i < ARRAY_SIZE(r->handles); i++) { > + r->handles[i] =3D 0; > + r->pitches[i] =3D 0; > + r->offsets[i] =3D 0; > + r->modifier[i] =3D 0; > + } > + > + for (i =3D 0; i < fb->format->num_planes; i++) { > + r->pitches[i] =3D fb->pitches[i]; > + r->offsets[i] =3D fb->offsets[i]; > + if (dev->mode_config.allow_fb_modifiers) > + r->modifier[i] =3D fb->modifier; > + } > + > + /* GET_FB2() is an unprivileged ioctl so we must not return a > + * buffer-handle to non master/root processes! To match GET_FB() > + * just return invalid handles (0) for non masters/root > + * rather than making GET_FB2() privileged. > + */ > + if (!drm_is_current_master(file_priv) && !capable(CAP_SYS_ADMIN)) { > + ret =3D 0; > + goto out; > + } > = > + for (i =3D 0; i < fb->format->num_planes; i++) { > + int j; > + > + /* If we reuse the same object for multiple planes, also > + * return the same handle. > + */ > + for (j =3D 0; j < i; j++) { > + if (fb->obj[i] =3D=3D fb->obj[j]) { > + r->handles[i] =3D r->handles[j]; > + break; > + } > + } > + > + if (r->handles[i]) > + continue; > + > + if (fb->obj[i]) { > + ret =3D drm_gem_handle_create(file_priv, fb->obj[i], > + &r->handles[i]); > + } else { > + WARN_ON(i > 0); > + ret =3D fb->funcs->create_handle(fb, file_priv, > + &r->handles[i]); > + } > + > + if (ret !=3D 0) > + goto out; > + } > + > +out: > + if (ret !=3D 0) { > + /* Delete any previously-created handles on failure. */ > + for (i =3D 0; i < ARRAY_SIZE(r->handles); i++) { > + int j; > + > + if (r->handles[i]) > + drm_gem_handle_delete(file_priv, r->handles[i]); > + > + /* Zero out any handles identical to the one we just > + * deleted. > + */ > + for (j =3D i + 1; j < ARRAY_SIZE(r->handles); j++) { > + if (r->handles[j] =3D=3D r->handles[i]) > + r->handles[j] =3D 0; > + } > + } > + } > + > + drm_framebuffer_put(fb); > return ret; > } > = > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c > index 5afb39688b55..9e41972c4bbc 100644 > --- a/drivers/gpu/drm/drm_ioctl.c > +++ b/drivers/gpu/drm/drm_ioctl.c > @@ -671,6 +671,7 @@ static const struct drm_ioctl_desc drm_ioctls[] =3D { > DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_connector_property_set_io= ctl, DRM_MASTER), > DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, 0), > DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, 0), > + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB2, drm_mode_getfb2_ioctl, 0), > DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb_ioctl, 0), > DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB2, drm_mode_addfb2_ioctl, 0), > DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb_ioctl, 0), > diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h > index 868bf7996c0f..808b48a93330 100644 > --- a/include/uapi/drm/drm.h > +++ b/include/uapi/drm/drm.h > @@ -948,6 +948,8 @@ extern "C" { > #define DRM_IOCTL_SYNCOBJ_TRANSFER DRM_IOWR(0xCC, struct drm_syncobj_tra= nsfer) > #define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL DRM_IOWR(0xCD, struct drm_sync= obj_timeline_array) > = > +#define DRM_IOCTL_MODE_GETFB2 DRM_IOWR(0xCE, struct drm_mode_fb_cmd2) > + > /** > * Device specific ioctls should only be in their respective headers > * The device specific ioctl range is from 0x40 to 0x9f. > -- = > 2.21.0 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel