xf86-video-intel: 3 commits - configure.ac src/sna/kgem.c src/sna/sna_display.c src/sna/sna_dri2.c
Chris Wilson
ickle at kemper.freedesktop.org
Tue Feb 24 15:04:32 PST 2015
configure.ac | 1 +
src/sna/kgem.c | 9 ++++++---
src/sna/sna_display.c | 24 +++++++++++++++++++-----
src/sna/sna_dri2.c | 12 +++++++++---
4 files changed, 35 insertions(+), 11 deletions(-)
New commits:
commit 1ae0dc460d3a6b0aed763ab4f8f8af02d2af1940
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Feb 24 22:56:46 2015 +0000
sna: Clamp aperture size to 32bits
Internally we only use 32bits for limiting the maximum object size
(both for CPU and GPU allocations) so to prevent overflow limit the
reported aperture size.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index b87d49e..94f881c 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1646,6 +1646,9 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
(long long)aperture.aper_size,
(long long)aperture.aper_available_size));
+ /* clamp aperture to uint32_t for simplicity */
+ if (aperture.aper_size > 0xc0000000)
+ aperture.aper_size = 0xc0000000;
kgem->aperture_total = aperture.aper_size;
kgem->aperture_high = aperture.aper_size * 3/4;
kgem->aperture_low = aperture.aper_size * 1/3;
@@ -1744,11 +1747,11 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
if (DBG_NO_CPU)
kgem->max_cpu_size = 0;
- DBG(("%s: maximum object size=%d\n",
+ DBG(("%s: maximum object size=%u\n",
__FUNCTION__, kgem->max_object_size));
- DBG(("%s: large object thresold=%d\n",
+ DBG(("%s: large object thresold=%u\n",
__FUNCTION__, kgem->large_object_size));
- DBG(("%s: max object sizes (gpu=%d, cpu=%d, tile upload=%d, copy=%d)\n",
+ DBG(("%s: max object sizes (gpu=%u, cpu=%u, tile upload=%u, copy=%u)\n",
__FUNCTION__,
kgem->max_gpu_size, kgem->max_cpu_size,
kgem->max_upload_tile_size, kgem->max_copy_tile_size));
commit 98245a5cff095a3a50cfe6fa41a0233f5bd6f75e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Feb 24 22:36:11 2015 +0000
sna: Improve DBG messages for MST probing
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 606c13a..d7f5500 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3689,14 +3689,20 @@ gather_encoders(struct sna *sna, uint32_t id, int count,
struct drm_mode_get_encoder enc;
uint32_t *ids = NULL;
+ DBG(("%s(%d): expected count=%d\n", __FUNCTION__, id, count));
+
VG_CLEAR(compat_conn);
memset(out, 0, sizeof(*out));
do {
- free(ids);
- ids = malloc(sizeof(*ids) * count);
- if (ids == 0)
+ uint32_t *nids;
+
+ nids = realloc(ids, sizeof(*ids) * count);
+ if (nids == NULL) {
+ free(ids);
return false;
+ }
+ ids = nids;
compat_conn.conn.connector_id = id;
compat_conn.conn.count_props = 0;
@@ -3716,6 +3722,7 @@ gather_encoders(struct sna *sna, uint32_t id, int count,
count = compat_conn.conn.count_encoders;
} while (1);
+ DBG(("%s(%d): gathering %d encoders\n", __FUNCTION__, id, count));
for (count = 0; count < compat_conn.conn.count_encoders; count++) {
enc.encoder_id = ids[count];
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETENCODER, &enc)) {
@@ -3723,6 +3730,8 @@ gather_encoders(struct sna *sna, uint32_t id, int count,
count = 0;
break;
}
+ DBG(("%s(%d): encoder=%d, possible_crtcs=%x, possible_clones=%x\n",
+ __FUNCTION__, id, enc.encoder_id, enc.possible_crtcs, enc.possible_clones));
out->possible_crtcs |= enc.possible_crtcs;
out->possible_clones |= enc.possible_clones;
@@ -3882,6 +3891,7 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
return -1;
}
assert(compat_conn.conn.connector_id == id);
+ DBG(("%s(%d): has %d associated encoders\n", __FUNCTION__, id, compat_conn.conn.count_encoders));
if (compat_conn.conn.connector_type < ARRAY_SIZE(output_names))
output_name = output_names[compat_conn.conn.connector_type];
@@ -4247,8 +4257,9 @@ void sna_mode_discover(struct sna *sna)
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
return;
- DBG(("%s: now %d (was %d) connectors\n", __FUNCTION__,
- res.count_connectors, sna->mode.num_real_output));
+ DBG(("%s: now %d (was %d) connectors, %d encoders, %d crtc\n", __FUNCTION__,
+ res.count_connectors, sna->mode.num_real_output,
+ res.count_encoders, res.count_crtcs));
if (res.count_connectors > 32)
return;
@@ -6052,6 +6063,9 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
if (res) {
xf86CrtcConfigPtr xf86_config;
+ DBG(("%s: found %d CRTC, %d encoders, %d connectors\n",
+ __FUNCTION__, res->count_crtcs, res->count_encoders, res->count_connectors));
+
assert(res->count_crtcs);
assert(res->count_connectors);
commit 88e84320a3a8b3faf20941d666ab846fe12b7a67
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Feb 24 12:44:19 2015 +0000
sna/dri2: Flush triple buffer swap on [un]redirection
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index de3a4b3..cef2486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,6 +195,7 @@ AC_ARG_ENABLE(udev,
[UDEV="$enableval"],
[UDEV=auto])
+udev_msg=" disabled"
if test "x$UDEV" != "xno"; then
PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"])
AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"])
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 0a35e33..d879ac2 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -245,6 +245,7 @@ sna_dri2_get_back(struct sna *sna,
}
}
+ assert(bo->active_scanout == 0);
assert(bo != get_private(back)->bo);
kgem_bo_destroy(&sna->kgem, get_private(back)->bo);
@@ -343,7 +344,6 @@ sna_dri2_reuse_buffer(DrawablePtr draw, DRI2BufferPtr buffer)
draw->type != DRAWABLE_PIXMAP) {
DBG(("%s: replacing back buffer on window %ld\n", __FUNCTION__, draw->id));
sna_dri2_get_back(to_sna_from_drawable(draw), draw, buffer, dri2_chain(draw));
-
assert(get_private(buffer)->bo->refcnt);
assert(get_private(buffer)->bo->active_scanout == 0);
assert(kgem_bo_flink(&to_sna_from_drawable(draw)->kgem, get_private(buffer)->bo) == buffer->name);
@@ -1391,6 +1391,7 @@ sna_dri2_client_gone(CallbackListPtr *list, void *closure, void *data)
event);
event->client = NULL;
event->draw = NULL;
+ event->flip_continue = 0;
list_del(&event->link);
} else
sna_dri2_event_free(event);
@@ -1479,6 +1480,8 @@ void sna_dri2_decouple_window(WindowPtr win)
_sna_dri2_destroy_buffer(sna, priv->front);
priv->front = NULL;
}
+
+ swap_limit(&win->drawable, 1);
}
void sna_dri2_destroy_window(WindowPtr win)
@@ -1508,6 +1511,7 @@ void sna_dri2_destroy_window(WindowPtr win)
assert(info->draw == &win->drawable);
info->draw = NULL;
info->client = NULL;
+ info->flip_continue = 0;
list_del(&info->link);
chain = info->chain;
@@ -2597,7 +2601,7 @@ static bool immediate_swap(struct sna *sna,
*current_msc = get_current_msc(sna, draw, crtc);
DBG(("%s: current_msc=%ld, target_msc=%ld -- %s\n",
- __FUNCTION__, (long)*current_msc, (long)target_msc,
+ __FUNCTION__, (long)*current_msc, (long)*target_msc,
(*current_msc >= *target_msc - 1) ? "yes" : "no"));
return *current_msc >= *target_msc - 1;
}
@@ -2643,11 +2647,12 @@ sna_dri2_schedule_flip(ClientPtr client, DrawablePtr draw, xf86CrtcPtr crtc,
if (info && info->draw == draw) {
assert(info->type != FLIP);
assert(info->front == front);
+ assert(info->queued);
if (info->back != back) {
_sna_dri2_destroy_buffer(sna, info->back);
info->back = sna_dri2_reference_buffer(back);
}
- DBG(("%s: executing xchg of pending flip\n", __FUNCTION__));
+ DBG(("%s: executing xchg of pending flip: flip_continue=%d, keepalive=%d\n", __FUNCTION__, info->flip_continue, info->keepalive));
sna_dri2_xchg(draw, front, back);
info->keepalive++;
if (xorg_can_triple_buffer() &&
@@ -2694,6 +2699,7 @@ sna_dri2_schedule_flip(ClientPtr client, DrawablePtr draw, xf86CrtcPtr crtc,
sna_dri2_event_free(info);
return false;
}
+ assert(get_private(info->front)->bo->active_scanout);
}
swap_limit(draw, 1 + (info->type == FLIP_THROTTLE));
More information about the xorg-commit
mailing list