Преглед на файлове

drm/nv50: Keep track of the head a channel is vsync'ing to.

In a multihead setup vblank interrupts may end up enabled in both
heads. In that case we want to ignore the vblank interrupts coming
from the wrong CRTC to avoid tearing and unbalanced calls to
drm_vblank_get/put (fdo bug 31074).

Reported-by: Felix Leimbach <felix.leimbach@gmx.net>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Francisco Jerez преди 14 години
родител
ревизия
1f6d2de2c5
променени са 3 файла, в които са добавени 7 реда и са изтрити 0 реда
  1. 1 0
      drivers/gpu/drm/nouveau/nouveau_drv.h
  2. 3 0
      drivers/gpu/drm/nouveau/nv50_display.c
  3. 3 0
      drivers/gpu/drm/nouveau/nv50_graph.c

+ 1 - 0
drivers/gpu/drm/nouveau/nouveau_drv.h

@@ -257,6 +257,7 @@ struct nouveau_channel {
 
 
 	struct {
 	struct {
 		struct nouveau_gpuobj *vblsem;
 		struct nouveau_gpuobj *vblsem;
+		uint32_t vblsem_head;
 		uint32_t vblsem_offset;
 		uint32_t vblsem_offset;
 		uint32_t vblsem_rval;
 		uint32_t vblsem_rval;
 		struct list_head vbl_wait;
 		struct list_head vbl_wait;

+ 3 - 0
drivers/gpu/drm/nouveau/nv50_display.c

@@ -432,6 +432,9 @@ nv50_display_vblank_crtc_handler(struct drm_device *dev, int crtc)
 
 
 	list_for_each_entry_safe(chan, tmp, &dev_priv->vbl_waiting,
 	list_for_each_entry_safe(chan, tmp, &dev_priv->vbl_waiting,
 				 nvsw.vbl_wait) {
 				 nvsw.vbl_wait) {
+		if (chan->nvsw.vblsem_head != crtc)
+			continue;
+
 		nouveau_bo_wr32(chan->notifier_bo, chan->nvsw.vblsem_offset,
 		nouveau_bo_wr32(chan->notifier_bo, chan->nvsw.vblsem_offset,
 						chan->nvsw.vblsem_rval);
 						chan->nvsw.vblsem_rval);
 		list_del(&chan->nvsw.vbl_wait);
 		list_del(&chan->nvsw.vbl_wait);

+ 3 - 0
drivers/gpu/drm/nouveau/nv50_graph.c

@@ -387,7 +387,10 @@ nv50_graph_nvsw_vblsem_release(struct nouveau_channel *chan,
 		return -EINVAL;
 		return -EINVAL;
 
 
 	drm_vblank_get(dev, data);
 	drm_vblank_get(dev, data);
+
+	chan->nvsw.vblsem_head = data;
 	list_add(&chan->nvsw.vbl_wait, &dev_priv->vbl_waiting);
 	list_add(&chan->nvsw.vbl_wait, &dev_priv->vbl_waiting);
+
 	return 0;
 	return 0;
 }
 }