* [PATCH v3 libdrm 1/2] include/drm: sync up drm.h
@ 2020-01-22 23:36 Juston Li
2020-01-22 23:36 ` [PATCH v3 libdrm 2/2] Add drmModeGetFB2 Juston Li
0 siblings, 1 reply; 3+ messages in thread
From: Juston Li @ 2020-01-22 23:36 UTC (permalink / raw)
To: dri-devel; +Cc: Juston Li
Adds DRM_IOCTL_MODE_GETFB2
Taken from drm-next-misc:
commit 3ff4c24bdb1f494c217c80348f9db4896043ed81
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Jan 17 17:47:48 2020 -0500
drm/dp_mst: Fix indenting in drm_dp_mst_topology_mgr_set_mst()
Signed-off-by: Juston Li <juston.li@intel.com>
---
include/drm/drm.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/drm/drm.h b/include/drm/drm.h
index ab9403397815..c7fd2a35fd7b 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -942,6 +942,8 @@ extern "C" {
#define DRM_IOCTL_SYNCOBJ_TRANSFER DRM_IOWR(0xCC, struct drm_syncobj_transfer)
#define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL DRM_IOWR(0xCD, struct drm_syncobj_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.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v3 libdrm 2/2] Add drmModeGetFB2
2020-01-22 23:36 [PATCH v3 libdrm 1/2] include/drm: sync up drm.h Juston Li
@ 2020-01-22 23:36 ` Juston Li
2020-01-31 19:44 ` Daniel Stone
0 siblings, 1 reply; 3+ messages in thread
From: Juston Li @ 2020-01-22 23:36 UTC (permalink / raw)
To: dri-devel; +Cc: Juston Li, Daniel Stone
From: Daniel Stone <daniels@collabora.com>
Add a wrapper around the getfb2 ioctl, which returns extended
framebuffer information mirroring addfb2, including multiple planes and
modifiers.
Changes since v2:
- getfb2 ioctl has been merged upstream
- sync include/drm/drm.h in a seperate patch
Changes since v1:
- functions should be drm_public
- modifier should be 64 bits
- update ioctl number
Signed-off-by: Juston Li <juston.li@intel.com>
---
xf86drmMode.c | 40 ++++++++++++++++++++++++++++++++++++++++
xf86drmMode.h | 15 +++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/xf86drmMode.c b/xf86drmMode.c
index 207d7be91caa..6c5f6cc2a075 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -1594,3 +1594,43 @@ drmModeRevokeLease(int fd, uint32_t lessee_id)
return 0;
return -errno;
}
+
+drm_public drmModeFB2Ptr
+drmModeGetFB2(int fd, uint32_t fb_id)
+{
+ struct drm_mode_fb_cmd2 get;
+ drmModeFB2Ptr ret;
+ int err;
+
+ memclear(get);
+ get.fb_id = fb_id;
+
+ err = DRM_IOCTL(fd, DRM_IOCTL_MODE_GETFB2, &get);
+ if (err != 0)
+ return NULL;
+
+ ret = drmMalloc(sizeof(drmModeFB2));
+ if (!ret)
+ return NULL;
+
+ ret->fb_id = fb_id;
+ ret->width = get.width;
+ ret->height = get.height;
+ ret->pixel_format = get.pixel_format;
+ ret->flags = get.flags;
+ ret->modifier = get.modifier[0];
+ memcpy(ret->handles, get.handles, sizeof(uint32_t) * 4);
+ memcpy(ret->pitches, get.pitches, sizeof(uint32_t) * 4);
+ memcpy(ret->offsets, get.offsets, sizeof(uint32_t) * 4);
+
+ return ret;
+}
+
+drm_public void drmModeFreeFB2(drmModeFB2Ptr ptr)
+{
+ if (!ptr)
+ return;
+
+ /* we might add more frees later. */
+ drmFree(ptr);
+}
diff --git a/xf86drmMode.h b/xf86drmMode.h
index 159a39937240..fc0bbd8dcb67 100644
--- a/xf86drmMode.h
+++ b/xf86drmMode.h
@@ -225,6 +225,19 @@ typedef struct _drmModeFB {
uint32_t handle;
} drmModeFB, *drmModeFBPtr;
+typedef struct _drmModeFB2 {
+ uint32_t fb_id;
+ uint32_t width, height;
+ uint32_t pixel_format; /* fourcc code from drm_fourcc.h */
+ uint64_t modifier; /* applies to all buffers */
+ uint32_t flags;
+
+ /* per-plane GEM handle; may be duplicate entries for multiple planes */
+ uint32_t handles[4];
+ uint32_t pitches[4]; /* bytes */
+ uint32_t offsets[4]; /* bytes */
+} drmModeFB2, *drmModeFB2Ptr;
+
typedef struct drm_clip_rect drmModeClip, *drmModeClipPtr;
typedef struct _drmModePropertyBlob {
@@ -343,6 +356,7 @@ typedef struct _drmModePlaneRes {
extern void drmModeFreeModeInfo( drmModeModeInfoPtr ptr );
extern void drmModeFreeResources( drmModeResPtr ptr );
extern void drmModeFreeFB( drmModeFBPtr ptr );
+extern void drmModeFreeFB2( drmModeFB2Ptr ptr );
extern void drmModeFreeCrtc( drmModeCrtcPtr ptr );
extern void drmModeFreeConnector( drmModeConnectorPtr ptr );
extern void drmModeFreeEncoder( drmModeEncoderPtr ptr );
@@ -362,6 +376,7 @@ extern drmModeResPtr drmModeGetResources(int fd);
* Retrieve information about framebuffer bufferId
*/
extern drmModeFBPtr drmModeGetFB(int fd, uint32_t bufferId);
+extern drmModeFB2Ptr drmModeGetFB2(int fd, uint32_t bufferId);
/**
* Creates a new framebuffer with an buffer object as its scanout buffer.
--
2.21.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 libdrm 2/2] Add drmModeGetFB2
2020-01-22 23:36 ` [PATCH v3 libdrm 2/2] Add drmModeGetFB2 Juston Li
@ 2020-01-31 19:44 ` Daniel Stone
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Stone @ 2020-01-31 19:44 UTC (permalink / raw)
To: Juston Li; +Cc: Daniel Stone, dri-devel
Hi Juston,
On Thu, 23 Jan 2020 at 00:37, Juston Li <juston.li@intel.com> wrote:
> +drm_public void drmModeFreeFB2(drmModeFB2Ptr ptr)
> +{
> + if (!ptr)
> + return;
> +
> + /* we might add more frees later. */
> + drmFree(ptr);
I do not recognise this comment, and since free(NULL) is defined to be
safe, this entire function can be defined as drmFree(ptr) without the
comment or early return.
I would like this to be changed before merging. After the revision,
this patch is:
Signed-off-by: Daniel Stone <daniels@collabora.com>
Cheers,
Daniel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-31 19:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-22 23:36 [PATCH v3 libdrm 1/2] include/drm: sync up drm.h Juston Li
2020-01-22 23:36 ` [PATCH v3 libdrm 2/2] Add drmModeGetFB2 Juston Li
2020-01-31 19:44 ` Daniel Stone
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.