summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2017-04-10 12:32:23 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2017-04-10 12:41:05 +0100
commitb57abe20e81f4b8e4dd203b6a9eda7ff441bc8ce (patch)
tree8e66324cc30542d0ee361f379983bec3a7199fa1
parentcb6ba2da056f3298a765b4da5cd626343c00a533 (diff)
sna: Use a slightly larger preallocated array for properties
We use an on-stack array to GETPROPERTY value to try and do a single ioctl/copy avoiding a short-lived malloc. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_display.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 9b77550e..f69bb4d8 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3292,10 +3292,11 @@ inline static bool prop_is_rotation(struct drm_mode_get_property *prop)
static int plane_details(struct sna *sna, struct plane *p)
{
+#define N_STACK_PROPS 32 /* must be a multiple of 2 */
struct local_mode_obj_get_properties arg;
- uint64_t stack_props[24];
+ uint64_t stack_props[N_STACK_PROPS + N_STACK_PROPS/2];
uint32_t *props = (uint32_t *)stack_props;
- uint64_t *values = stack_props + 8;
+ uint64_t *values = props + N_STACK_PROPS;
int i, type = DRM_PLANE_TYPE_OVERLAY;
memset(&arg, 0, sizeof(struct local_mode_obj_get_properties));
@@ -3304,7 +3305,7 @@ static int plane_details(struct sna *sna, struct plane *p)
arg.props_ptr = (uintptr_t)props;
arg.prop_values_ptr = (uintptr_t)values;
- arg.count_props = 16;
+ arg.count_props = N_STACK_PROPS;
if (drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_OBJ_GETPROPERTIES, &arg))
return -1;
@@ -3312,7 +3313,7 @@ static int plane_details(struct sna *sna, struct plane *p)
DBG(("%s: object %d (type %x) has %d props\n", __FUNCTION__,
p->id, LOCAL_MODE_OBJECT_PLANE, arg.count_props));
- if (arg.count_props > 16) {
+ if (arg.count_props > N_STACK_PROPS) {
props = malloc(2*sizeof(uint64_t)*arg.count_props);
if (props == NULL)
return -1;
@@ -3385,6 +3386,7 @@ static int plane_details(struct sna *sna, struct plane *p)
DBG(("%s: plane=%d type=%d\n", __FUNCTION__, p->id, type));
return type;
+#undef N_STACK_PROPS
}
static void add_sprite_plane(struct sna_crtc *crtc,