Menu
▾
▴
drm: Branch 'i915-pageflip' - 4 commits
|
From: <da...@ke...> - 2007-02-28 16:53:42
|
shared-core/i915_dma.c | 62 ++++++++++++++++++++++---------------------------
shared-core/i915_drv.h | 5 ---
shared-core/i915_irq.c | 7 +++--
3 files changed, 33 insertions(+), 41 deletions(-)
New commits:
diff-tree a33859184aa852777a50ea83f9dfa013f63f806f (from 074e10b384c893a256fcf964676562792fdf93c8)
Author: Michel Dänzer <mi...@tu...>
Date: Wed Feb 28 17:48:56 2007 +0100
i915: Eliminate dev_priv->current_page.
Always use dev_priv->sarea_priv->pf_current_page directly. This allows clients
to modify it as well while they hold the HW lock, e.g. in order to sync pages
between pipes.
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 282d4b8..b9dea8a 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -165,8 +165,7 @@ static int i915_initialize(drm_device_t
dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
dev_priv->cpp = init->cpp;
- dev_priv->current_page = 0;
- dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
+ dev_priv->sarea_priv->pf_current_page = 0;
/* We are using separate values as placeholders for mechanisms for
* private backbuffer/depthbuffer usage.
@@ -560,7 +559,7 @@ static void i915_do_dispatch_flip(drm_de
/* Calculate display base offset */
num_pages = dev_priv->sarea_priv->third_handle ? 3 : 2;
- current_page = (dev_priv->current_page >> shift) & 0x3;
+ current_page = (dev_priv->sarea_priv->pf_current_page >> shift) & 0x3;
next_page = (current_page + 1) % num_pages;
switch (next_page) {
@@ -597,8 +596,8 @@ static void i915_do_dispatch_flip(drm_de
OUT_RING(0);
ADVANCE_LP_RING();
- dev_priv->current_page &= ~(0x3 << shift);
- dev_priv->current_page |= next_page << shift;
+ dev_priv->sarea_priv->pf_current_page &= ~(0x3 << shift);
+ dev_priv->sarea_priv->pf_current_page |= next_page << shift;
}
void i915_dispatch_flip(drm_device_t * dev, int pipes, int sync)
@@ -607,10 +606,9 @@ void i915_dispatch_flip(drm_device_t * d
int i;
RING_LOCALS;
- DRM_DEBUG("%s: pipes=0x%x page=%d pfCurrentPage=%d\n",
+ DRM_DEBUG("%s: pipes=0x%x pfCurrentPage=%d\n",
__FUNCTION__,
- pipes, dev_priv->current_page,
- dev_priv->sarea_priv->pf_current_page);
+ pipes, dev_priv->sarea_priv->pf_current_page);
i915_emit_mi_flush(dev, MI_READ_FLUSH | MI_EXE_FLUSH);
@@ -639,8 +637,6 @@ void i915_dispatch_flip(drm_device_t * d
if (!sync)
drm_fence_flush_old(dev, 0, dev_priv->counter);
#endif
-
- dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
}
static int i915_quiescent(drm_device_t * dev)
@@ -733,19 +729,21 @@ static int i915_cmdbuffer(DRM_IOCTL_ARGS
static int i915_do_cleanup_pageflip(drm_device_t * dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
- int j;
+ int i, pipes, num_pages = dev_priv->sarea_priv->third_handle ? 3 : 2;
DRM_DEBUG("%s\n", __FUNCTION__);
- for (j = 0; j < 2 && dev_priv->current_page != 0; j++) {
- int i, pipes;
+ for (i = 0, pipes = 0; i < 2; i++)
+ if (dev_priv->sarea_priv->pf_current_page & (0x3 << (2 * i))) {
+ dev_priv->sarea_priv->pf_current_page =
+ (dev_priv->sarea_priv->pf_current_page &
+ ~(0x3 << (2 * i))) | (num_pages - 1) << (2 * i);
- for (i = 0, pipes = 0; i < 2; i++)
- if (dev_priv->current_page & (0x3 << (2 * i)))
- pipes |= 1 << i;
+ pipes |= 1 << i;
+ }
+ if (pipes)
i915_dispatch_flip(dev, pipes, 0);
- }
return 0;
}
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index de9105a..a373616 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -101,7 +101,6 @@ typedef struct drm_i915_private {
uint32_t counter;
unsigned int cpp;
- int current_page;
int use_mi_batchbuffer_start;
wait_queue_head_t irq_queue;
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index e17eec5..5da5410 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -235,7 +235,8 @@ static void i915_vblank_tasklet(drm_devi
top = upper[pipe];
bottom = lower[pipe];
- front = (dev_priv->current_page >> (2 * pipe)) & 0x3;
+ front = (dev_priv->sarea_priv->pf_current_page >>
+ (2 * pipe)) & 0x3;
back = (front + 1) % num_pages;
for (num_rects = drw->num_rects; num_rects--; rect++) {
diff-tree 074e10b384c893a256fcf964676562792fdf93c8 (from 1cdc1b6fbabffc0dd4d3c1f8405d9372a45480a2)
Author: Michel Dänzer <mi...@tu...>
Date: Wed Feb 28 15:57:08 2007 +0100
i915: Only clean up page flipping when the last client goes away, not any one.
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 7078ec9..282d4b8 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -915,6 +915,7 @@ void i915_driver_lastclose(drm_device_t
{
if (dev->dev_private) {
drm_i915_private_t *dev_priv = dev->dev_private;
+ i915_do_cleanup_pageflip(dev);
i915_mem_takedown(&(dev_priv->agp_heap));
}
i915_dma_cleanup(dev);
@@ -924,7 +925,6 @@ void i915_driver_preclose(drm_device_t *
{
if (dev->dev_private) {
drm_i915_private_t *dev_priv = dev->dev_private;
- i915_do_cleanup_pageflip(dev);
i915_mem_release(dev, filp, dev_priv->agp_heap);
}
}
diff-tree 1cdc1b6fbabffc0dd4d3c1f8405d9372a45480a2 (from fd0fed3f1e10d7ff1205a485621767b650c6f5ff)
Author: Michel Dänzer <mi...@tu...>
Date: Wed Feb 28 15:23:19 2007 +0100
i915: Don't emit waits for pending flips before emitting synchronous flips.
The assumption is that synchronous flips are not isolated usually, and waiting
for all of them could result in stalling the pipeline for long periods of time.
Also use i915_emit_mi_flush() instead of an old-fashioned way to achieve the
same effect.
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 883f3b9..7078ec9 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -604,7 +604,6 @@ static void i915_do_dispatch_flip(drm_de
void i915_dispatch_flip(drm_device_t * dev, int pipes, int sync)
{
drm_i915_private_t *dev_priv = dev->dev_private;
- u32 mi_wait = MI_WAIT_FOR_EVENT;
int i;
RING_LOCALS;
@@ -613,24 +612,23 @@ void i915_dispatch_flip(drm_device_t * d
pipes, dev_priv->current_page,
dev_priv->sarea_priv->pf_current_page);
- if (pipes & 0x1)
- mi_wait |= MI_WAIT_FOR_PLANE_A_FLIP;
+ i915_emit_mi_flush(dev, MI_READ_FLUSH | MI_EXE_FLUSH);
- if (pipes & 0x2)
- mi_wait |= MI_WAIT_FOR_PLANE_B_FLIP;
+ if (!sync) {
+ u32 mi_wait = MI_WAIT_FOR_EVENT;
- i915_kernel_lost_context(dev);
-
- BEGIN_LP_RING(2);
- OUT_RING(INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE);
- OUT_RING(0);
- ADVANCE_LP_RING();
-
- /* Wait for pending flips to take effect */
- BEGIN_LP_RING(2);
- OUT_RING(mi_wait);
- OUT_RING(0);
- ADVANCE_LP_RING();
+ /* Wait for pending flips to take effect */
+ if (pipes & 0x1)
+ mi_wait |= MI_WAIT_FOR_PLANE_A_FLIP;
+
+ if (pipes & 0x2)
+ mi_wait |= MI_WAIT_FOR_PLANE_B_FLIP;
+
+ BEGIN_LP_RING(2);
+ OUT_RING(mi_wait);
+ OUT_RING(0);
+ ADVANCE_LP_RING();
+ }
for (i = 0; i < 2; i++)
if (pipes & (1 << i))
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index cc6c12d..de9105a 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -252,10 +252,6 @@ extern int i915_wait_ring(drm_device_t *
#define CMD_STORE_DWORD_IDX ((0x21<<23) | 0x1)
#define CMD_OP_BATCH_BUFFER ((0x0<<29)|(0x30<<23)|0x1)
-#define INST_PARSER_CLIENT 0x00000000
-#define INST_OP_FLUSH 0x02000000
-#define INST_FLUSH_MAP_CACHE 0x00000001
-
#define CMD_MI_FLUSH (0x04 << 23)
#define MI_NO_WRITE_FLUSH (1 << 2)
#define MI_READ_FLUSH (1 << 0)
diff-tree fd0fed3f1e10d7ff1205a485621767b650c6f5ff (from 1a0d890a42bee78177ad45d5e5956d2c3c4fcdc7)
Author: Michel Dänzer <mi...@tu...>
Date: Wed Feb 28 12:33:56 2007 +0100
i915: Fix test for synchronous flip affecting both pipes.
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index e6c88d2..e17eec5 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -70,8 +70,8 @@ i915_dispatch_vsync_flip(drm_device_t *d
drm_clip_rect_t *rect = drw->rects;
for (i = 0; i < num_rects; i++)
- if (!((rect[i].x1 > x2 && rect[i].y1 > y2) ||
- (rect[i].x2 < x1 && rect[i].y2 < y1))) {
+ if (!(rect[i].x1 >= x2 || rect[i].y1 >= y2 ||
+ rect[i].x2 <= x1 || rect[i].y2 <= y1)) {
pf_pipes = 0x3;
break;
|