bsd-core/ati_pcigart.c | 127 +-
bsd-core/drmP.h | 10
bsd-core/drm_bufs.c | 4
bsd-core/drm_drv.c | 16
bsd-core/drm_irq.c | 126 +-
bsd-core/i915/Makefile | 2
bsd-core/i915_drv.c | 32
bsd-core/i915_suspend.c | 1
debian/changelog | 54 +
debian/control | 4
linux-core/Makefile.kernel | 2
linux-core/ati_pcigart.c | 39
linux-core/drm_agpsupport.c | 4
linux-core/drm_drv.c | 6
linux-core/i915_drv.c | 463 ----------
linux-core/i915_fence.c | 2
linux-core/i915_suspend.c | 1
linux-core/xgi_cmdlist.c | 2
linux-core/xgi_drv.c | 21
linux-core/xgi_drv.h | 21
linux-core/xgi_fb.c | 4
linux-core/xgi_fence.c | 92 +-
shared-core/drm_pciids.txt | 13
shared-core/i915_dma.c | 16
shared-core/i915_drv.h | 1813 ++++++++++++++++++++++++++---------------
shared-core/i915_irq.c | 105 +-
shared-core/i915_suspend.c | 520 +++++++++++
shared-core/nouveau_drm.h | 4
shared-core/nouveau_drv.h | 2
shared-core/nouveau_mem.c | 74 +
shared-core/nouveau_notifier.c | 2
shared-core/nouveau_object.c | 8
shared-core/nv50_fifo.c | 4
shared-core/r300_cmdbuf.c | 135 ++-
shared-core/r300_reg.h | 229 ++++-
shared-core/radeon_cp.c | 52 -
shared-core/radeon_drv.h | 45 -
shared-core/xgi_drm.h | 4
38 files changed, 2584 insertions(+), 1475 deletions(-)
New commits:
commit f04df1dd84723d2fed0d8570e0b6555a9910b349
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:30:58 2008 +0100
Fix changelog formatting.
Signed-off-by: Chris Lamb <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index c65c6a6..dd3dbfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,12 @@ drm-snapshot (2.3.1~git+20080703+301d984-1) experimental;
urgency=low
- 94dcc83a... Revert "i915: only use tiled blits on 965+"
- 727d4f1d... i915: only use tiled blits on 965+
- e935925c... i915: enable bus mastering on i915 at resume time
- - 5d27fd94... nv50: when destroying a channel make sure it's not still
current on PFIFO
+ - 5d27fd94... nv50: when destroying a channel make sure it's not still
+ current on PFIFO
- d726eb2e... i915: remove unused variable
- 893cd01a... i915: register definition & header file cleanup
- - 01e8f0ea... nv50: oops, keep VRAM allocations aligned at 64KiB - that's
our page size..
+ - 01e8f0ea... nv50: oops, keep VRAM allocations aligned at 64KiB - that's
+ our page size..
- 89cf2ee2... nv50: use same dma object for fb/tt access
- b9ed0f99... nouveau: allocate drm-use vram buffers from end of vram.
- 11f2a2ed... agp: use true/false instead of TRUE/FALSE
@@ -17,14 +19,16 @@ drm-snapshot (2.3.1~git+20080703+301d984-1) experimental;
urgency=low
- 9d79944a... r300: fix warning
- 8712f0a1... drm: fix the ioctl to not believe userspace.
- 00f549bd... i915: Add support for Intel 4 series chipsets
- - 59112c9e... radeon: *really* fix screen corruption thanks to Lukasz
Krotowski
+ - 59112c9e... radeon: *really* fix screen corruption thanks to Lukasz
+ Krotowski
- 6f8cc957... radeon: actualy try to fix the corruption
- 9dd58d65... radeon: fix screen corruption introduced by last patch
- 29ffa001... [FreeBSD] Fix another lock leak
- 00b40639... radeon: bump driver date to know if lockup fix is in
- 1aafbb83... radeon: r345xx fixe hard lockup
- 5d99e79c... xgi: Bump kernel version
- - a07c8218... RADEON: use DSTCACHE_CTLSTAT rather than
RB2D_DSTCACHE_CTLSTAT
+ - a07c8218... RADEON: use DSTCACHE_CTLSTAT rather than
+ B2D_DSTCACHE_CTLSTAT
- b535567e... xgixp: Remove dependency on TTM fences
- 4f3da2f2... xgi: Fix 64-bit kernel / 32-bit user issue.
- cdd0cb0a... ati_pcigart: split out the page insert function
@@ -36,9 +40,11 @@ drm-snapshot (2.3.1~git+20080703+301d984-1) experimental;
urgency=low
- 3b6ca4bf... [FreeBSD] Rework ati_pcigart.c
- 96141bd3... [FreeBSD] We need to request busmastering support.
- 6d692171... [FreeBSD] Incorporate vblank fixes for bsd.
- - ec3d9960... [FreeBSD] Forgot to call mtx_destroy on all the locks at
unload.
+ - ec3d9960... [FreeBSD] Forgot to call mtx_destroy on all the locks at
+ unload.
- 93c57ff4... [FreeBSD] Remove the locks in the vblank_disable_fn
- - fc74c2e9... [FreeBSD] Go back to using vbl_lock and move init/destroy
to load/unload.
+ - fc74c2e9... [FreeBSD] Go back to using vbl_lock and move init/destroy to
+ load/unload.
* Don't create usr/share/lintian/overrides
* Add dependency on quilt to drm-modules-source binary package. (Closes:
#487260)
commit 5b364cf9bdad87ff3f189d90b7137c3de4449d25
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:30:05 2008 +0100
Bump Standards-Version to 3.8.0 (no changes).
diff --git a/debian/changelog b/debian/changelog
index 00a492f..c65c6a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ drm-snapshot (2.3.1~git+20080703+301d984-1) experimental;
urgency=low
* Don't create usr/share/lintian/overrides
* Add dependency on quilt to drm-modules-source binary package. (Closes:
#487260)
+ * Bump Standards-Version to 3.8.0 (no changes).
-- Chris Lamb <[EMAIL PROTECTED]> Thu, 03 Jul 2008 00:27:41 +0100
diff --git a/debian/control b/debian/control
index a52de82..8b19cb6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Chris Lamb <[EMAIL PROTECTED]>, Matthew Johnson <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5), autotools-dev, libx11-dev, dpkg-dev (>=
1.13.19), quilt (>= 0.40), bzip2, git-core
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Section: libs
Homepage: http://dri.freedesktop.org/wiki/FrontPage
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/drm-snapshot
commit 0d878a2fc61b634965a1507fd49f13d6477f2cfd
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:28:38 2008 +0100
New upstream snapshot
Signed-off-by: Chris Lamb <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index f403bbc..00a492f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,49 @@
-drm-snapshot (2.3.1~git+20080602+ac4da86-2) UNRELEASED; urgency=low
-
+drm-snapshot (2.3.1~git+20080703+301d984-1) experimental; urgency=low
+
+ * New upstream snapshot:
+ - 301d984e... i915: only use tiled blits on 965+
+ - 94dcc83a... Revert "i915: only use tiled blits on 965+"
+ - 727d4f1d... i915: only use tiled blits on 965+
+ - e935925c... i915: enable bus mastering on i915 at resume time
+ - 5d27fd94... nv50: when destroying a channel make sure it's not still
current on PFIFO
+ - d726eb2e... i915: remove unused variable
+ - 893cd01a... i915: register definition & header file cleanup
+ - 01e8f0ea... nv50: oops, keep VRAM allocations aligned at 64KiB - that's
our page size..
+ - 89cf2ee2... nv50: use same dma object for fb/tt access
+ - b9ed0f99... nouveau: allocate drm-use vram buffers from end of vram.
+ - 11f2a2ed... agp: use true/false instead of TRUE/FALSE
+ - 207f701e... RADEON: 0x1002 0x5657 is actually an RV410
+ - 1915de2c... drm: only use kernel ioctl cmd when doing a core ioctl.
+ - 9d79944a... r300: fix warning
+ - 8712f0a1... drm: fix the ioctl to not believe userspace.
+ - 00f549bd... i915: Add support for Intel 4 series chipsets
+ - 59112c9e... radeon: *really* fix screen corruption thanks to Lukasz
Krotowski
+ - 6f8cc957... radeon: actualy try to fix the corruption
+ - 9dd58d65... radeon: fix screen corruption introduced by last patch
+ - 29ffa001... [FreeBSD] Fix another lock leak
+ - 00b40639... radeon: bump driver date to know if lockup fix is in
+ - 1aafbb83... radeon: r345xx fixe hard lockup
+ - 5d99e79c... xgi: Bump kernel version
+ - a07c8218... RADEON: use DSTCACHE_CTLSTAT rather than
RB2D_DSTCACHE_CTLSTAT
+ - b535567e... xgixp: Remove dependency on TTM fences
+ - 4f3da2f2... xgi: Fix 64-bit kernel / 32-bit user issue.
+ - cdd0cb0a... ati_pcigart: split out the page insert function
+ - 4b8aecbd... RADEON: Add untested support for RS400 chips
+ - f6982b54... RADEON: switch IGP gart to use radeon_write_agp_base()
+ - 63eb5804... Fix typo in i915_suspend
+ - 116870a9... I915 suspend/resume for FreeBSD
+ - d43f3cb0... r300/r500: add hier-z regs
+ - 3b6ca4bf... [FreeBSD] Rework ati_pcigart.c
+ - 96141bd3... [FreeBSD] We need to request busmastering support.
+ - 6d692171... [FreeBSD] Incorporate vblank fixes for bsd.
+ - ec3d9960... [FreeBSD] Forgot to call mtx_destroy on all the locks at
unload.
+ - 93c57ff4... [FreeBSD] Remove the locks in the vblank_disable_fn
+ - fc74c2e9... [FreeBSD] Go back to using vbl_lock and move init/destroy
to load/unload.
* Don't create usr/share/lintian/overrides
* Add dependency on quilt to drm-modules-source binary package. (Closes:
#487260)
- -- Chris Lamb <[EMAIL PROTECTED]> Wed, 02 Jul 2008 13:29:27 +0100
+ -- Chris Lamb <[EMAIL PROTECTED]> Thu, 03 Jul 2008 00:27:41 +0100
drm-snapshot (2.3.1~git+20080602+ac4da86-1) experimental; urgency=low
commit 0e612856960237fc25cb7af6f7f16e650b51b2f0
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Wed Jul 2 13:30:08 2008 +0100
Add dependency on quilt to drm-modules-source binary package. (Closes:
#487260)
diff --git a/debian/changelog b/debian/changelog
index e1df452..f403bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
drm-snapshot (2.3.1~git+20080602+ac4da86-2) UNRELEASED; urgency=low
* Don't create usr/share/lintian/overrides
+ * Add dependency on quilt to drm-modules-source binary package. (Closes:
+ #487260)
- -- Chris Lamb <[EMAIL PROTECTED]> Fri, 06 Jun 2008 06:29:21 +0100
+ -- Chris Lamb <[EMAIL PROTECTED]> Wed, 02 Jul 2008 13:29:27 +0100
drm-snapshot (2.3.1~git+20080602+ac4da86-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index fc02655..a52de82 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Description: Userspace interface to kernel DRM services
(snapshot) -- debugging
Package: drm-modules-source
Architecture: all
-Depends: debhelper (>= 5), make, git-core, module-assistant, ${misc:Depends}
+Depends: debhelper (>= 5), quilt, make, git-core, module-assistant,
${misc:Depends}
Suggests: kernel-package, linux-headers | linux-source
Description: Source for the drm kernel modules
This package provides the source code for the DRM kernel modules. The DRM
commit 301d984ea80cb250460d6701c4373cf0af8bf59e
Author: Jesse Barnes <[EMAIL PROTECTED](none)>
Date: Tue Jul 1 16:10:01 2008 -0700
i915: only use tiled blits on 965+
When scheduled swaps occur, we need to blit between front & back buffers. I
the buffers are tiled, we need to set the appropriate XY_SRC_COPY tile bit,
only on 965 chips, since it will cause corruption on pre-965 (e.g. 945).
Bug reported by and fix tested by Tomas Janousek <[EMAIL PROTECTED]>.
Signed-off-by: Jesse Barnes <[EMAIL PROTECTED]>
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 0bf01bd..28f9f6a 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -162,11 +162,11 @@ static void i915_vblank_tasklet(struct drm_device *dev)
u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24);
RING_LOCALS;
- if (sarea_priv->front_tiled) {
+ if (IS_I965G(dev) && sarea_priv->front_tiled) {
cmd |= XY_SRC_COPY_BLT_DST_TILED;
dst_pitch >>= 2;
}
- if (sarea_priv->back_tiled) {
+ if (IS_I965G(dev) && sarea_priv->back_tiled) {
cmd |= XY_SRC_COPY_BLT_SRC_TILED;
src_pitch >>= 2;
}
commit 94dcc83ad2e8f848a3cac6cdc6f123e676e91cf8
Author: Jesse Barnes <[EMAIL PROTECTED](none)>
Date: Tue Jul 1 16:09:02 2008 -0700
Revert "i915: only use tiled blits on 965+"
This reverts commit 727d4f1d1667e43b3558bd5f6ed6dc2cd9c29401, somehow git
deleted the symlink and replaced it with the file.
diff --git a/linux-core/i915_irq.c b/linux-core/i915_irq.c
deleted file mode 100644
index 28f9f6a..2058a2e
--- a/linux-core/i915_irq.c
+++ /dev/null
@@ -1,970 +0,0 @@
-/* i915_irq.c -- IRQ support for the I915 -*- linux-c -*-
- */
-/*
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
-#include "i915_drv.h"
-
-#define MAX_NOPID ((u32)~0)
-
-/**
- * i915_get_pipe - return the the pipe associated with a given plane
- * @dev: DRM device
- * @plane: plane to look for
- *
- * The Intel Mesa & 2D drivers call the vblank routines with a plane number
- * rather than a pipe number, since they may not always be equal. This routine
- * maps the given @plane back to a pipe number.
- */
-static int
-i915_get_pipe(struct drm_device *dev, int plane)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- u32 dspcntr;
-
- dspcntr = plane ? I915_READ(DSPBCNTR) : I915_READ(DSPACNTR);
-
- return dspcntr & DISPPLANE_SEL_PIPE_MASK ? 1 : 0;
-}
-
-/**
- * i915_get_plane - return the the plane associated with a given pipe
- * @dev: DRM device
- * @pipe: pipe to look for
- *
- * The Intel Mesa & 2D drivers call the vblank routines with a plane number
- * rather than a plane number, since they may not always be equal. This
routine
- * maps the given @pipe back to a plane number.
- */
-static int
-i915_get_plane(struct drm_device *dev, int pipe)
-{
- if (i915_get_pipe(dev, 0) == pipe)
- return 0;
- return 1;
-}
-
-/**
- * i915_pipe_enabled - check if a pipe is enabled
- * @dev: DRM device
- * @pipe: pipe to check
- *
- * Reading certain registers when the pipe is disabled can hang the chip.
- * Use this routine to make sure the PLL is running and the pipe is active
- * before reading such registers if unsure.
- */
-static int
-i915_pipe_enabled(struct drm_device *dev, int pipe)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- unsigned long pipeconf = pipe ? PIPEBCONF : PIPEACONF;
-
- if (I915_READ(pipeconf) & PIPEACONF_ENABLE)
- return 1;
-
- return 0;
-}
-
-/**
- * Emit a synchronous flip.
- *
- * This function must be called with the drawable spinlock held.
- */
-static void
-i915_dispatch_vsync_flip(struct drm_device *dev, struct drm_drawable_info *drw,
- int plane)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
- u16 x1, y1, x2, y2;
- int pf_planes = 1 << plane;
-
- DRM_SPINLOCK_ASSERT(&dev->drw_lock);
-
- /* If the window is visible on the other plane, we have to flip on that
- * plane as well.
- */
- if (plane == 1) {
- x1 = sarea_priv->planeA_x;
- y1 = sarea_priv->planeA_y;
- x2 = x1 + sarea_priv->planeA_w;
- y2 = y1 + sarea_priv->planeA_h;
- } else {
- x1 = sarea_priv->planeB_x;
- y1 = sarea_priv->planeB_y;
- x2 = x1 + sarea_priv->planeB_w;
- y2 = y1 + sarea_priv->planeB_h;
- }
-
- if (x2 > 0 && y2 > 0) {
- int i, num_rects = drw->num_rects;
- struct drm_clip_rect *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)) {
- pf_planes = 0x3;
-
- break;
- }
- }
-
- i915_dispatch_flip(dev, pf_planes, 1);
-}
-
-/**
- * Emit blits for scheduled buffer swaps.
- *
- * This function will be called with the HW lock held.
- */
-static void i915_vblank_tasklet(struct drm_device *dev)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- struct list_head *list, *tmp, hits, *hit;
- int nhits, nrects, slice[2], upper[2], lower[2], i, num_pages;
- unsigned counter[2];
- struct drm_drawable_info *drw;
- drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
- u32 cpp = dev_priv->cpp, offsets[3];
- u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
- XY_SRC_COPY_BLT_WRITE_ALPHA |
- XY_SRC_COPY_BLT_WRITE_RGB)
- : XY_SRC_COPY_BLT_CMD;
- u32 src_pitch = sarea_priv->pitch * cpp;
- u32 dst_pitch = sarea_priv->pitch * cpp;
- /* COPY rop (0xcc), map cpp to magic color depth constants */
- u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24);
- RING_LOCALS;
-
- if (IS_I965G(dev) && sarea_priv->front_tiled) {
- cmd |= XY_SRC_COPY_BLT_DST_TILED;
- dst_pitch >>= 2;
- }
- if (IS_I965G(dev) && sarea_priv->back_tiled) {
- cmd |= XY_SRC_COPY_BLT_SRC_TILED;
- src_pitch >>= 2;
- }
-
- counter[0] = drm_vblank_count(dev, 0);
- counter[1] = drm_vblank_count(dev, 1);
-
- DRM_DEBUG("\n");
-
- INIT_LIST_HEAD(&hits);
-
- nhits = nrects = 0;
-
- /* No irqsave/restore necessary. This tasklet may be run in an
- * interrupt context or normal context, but we don't have to worry
- * about getting interrupted by something acquiring the lock, because
- * we are the interrupt context thing that acquires the lock.
- */
- DRM_SPINLOCK(&dev_priv->swaps_lock);
-
- /* Find buffer swaps scheduled for this vertical blank */
- list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
- drm_i915_vbl_swap_t *vbl_swap =
- list_entry(list, drm_i915_vbl_swap_t, head);
- int pipe = i915_get_pipe(dev, vbl_swap->plane);
-
- if ((counter[pipe] - vbl_swap->sequence) > (1<<23))
- continue;
-
- list_del(list);
- dev_priv->swaps_pending--;
- drm_vblank_put(dev, pipe);
-
- DRM_SPINUNLOCK(&dev_priv->swaps_lock);
- DRM_SPINLOCK(&dev->drw_lock);
-
- drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
-
- if (!drw) {
- DRM_SPINUNLOCK(&dev->drw_lock);
- drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
- DRM_SPINLOCK(&dev_priv->swaps_lock);
- continue;
- }
-
- list_for_each(hit, &hits) {
- drm_i915_vbl_swap_t *swap_cmp =
- list_entry(hit, drm_i915_vbl_swap_t, head);
- struct drm_drawable_info *drw_cmp =
- drm_get_drawable_info(dev, swap_cmp->drw_id);
-
- if (drw_cmp &&
- drw_cmp->rects[0].y1 > drw->rects[0].y1) {
- list_add_tail(list, hit);
- break;
- }
- }
-
- DRM_SPINUNLOCK(&dev->drw_lock);
-
- /* List of hits was empty, or we reached the end of it */
- if (hit == &hits)
- list_add_tail(list, hits.prev);
-
- nhits++;
-
- DRM_SPINLOCK(&dev_priv->swaps_lock);
- }
-
- DRM_SPINUNLOCK(&dev_priv->swaps_lock);
-
- if (nhits == 0) {
- return;
- }
-
- i915_kernel_lost_context(dev);
-
- upper[0] = upper[1] = 0;
- slice[0] = max(sarea_priv->planeA_h / nhits, 1);
- slice[1] = max(sarea_priv->planeB_h / nhits, 1);
- lower[0] = sarea_priv->planeA_y + slice[0];
- lower[1] = sarea_priv->planeB_y + slice[0];
-
- offsets[0] = sarea_priv->front_offset;
- offsets[1] = sarea_priv->back_offset;
- offsets[2] = sarea_priv->third_offset;
- num_pages = sarea_priv->third_handle ? 3 : 2;
-
- DRM_SPINLOCK(&dev->drw_lock);
-
- /* Emit blits for buffer swaps, partitioning both outputs into as many
- * slices as there are buffer swaps scheduled in order to avoid tearing
- * (based on the assumption that a single buffer swap would always
- * complete before scanout starts).
- */
- for (i = 0; i++ < nhits;
- upper[0] = lower[0], lower[0] += slice[0],
- upper[1] = lower[1], lower[1] += slice[1]) {
- int init_drawrect = 1;
-
- if (i == nhits)
- lower[0] = lower[1] = sarea_priv->height;
-
- list_for_each(hit, &hits) {
- drm_i915_vbl_swap_t *swap_hit =
- list_entry(hit, drm_i915_vbl_swap_t, head);
- struct drm_clip_rect *rect;
- int num_rects, plane, front, back;
- unsigned short top, bottom;
-
- drw = drm_get_drawable_info(dev, swap_hit->drw_id);
-
- if (!drw)
- continue;
-
- plane = swap_hit->plane;
-
- if (swap_hit->flip) {
- i915_dispatch_vsync_flip(dev, drw, plane);
- continue;
- }
-
- if (init_drawrect) {
- int width = sarea_priv->width;
- int height = sarea_priv->height;
- if (IS_I965G(dev)) {
- BEGIN_LP_RING(4);
-
- OUT_RING(GFX_OP_DRAWRECT_INFO_I965);
- OUT_RING(0);
- OUT_RING(((width - 1) & 0xffff) |
((height - 1) << 16));
- OUT_RING(0);
-
- ADVANCE_LP_RING();
- } else {
- BEGIN_LP_RING(6);
-
- OUT_RING(GFX_OP_DRAWRECT_INFO);
- OUT_RING(0);
- OUT_RING(0);
- OUT_RING(((width - 1) & 0xffff) |
((height - 1) << 16));
- OUT_RING(0);
- OUT_RING(0);
-
- ADVANCE_LP_RING();
- }
-
- sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
-
- init_drawrect = 0;
- }
-
- rect = drw->rects;
- top = upper[plane];
- bottom = lower[plane];
-
- front = (dev_priv->sarea_priv->pf_current_page >>
- (2 * plane)) & 0x3;
- back = (front + 1) % num_pages;
-
- for (num_rects = drw->num_rects; num_rects--; rect++) {
- int y1 = max(rect->y1, top);
- int y2 = min(rect->y2, bottom);
-
- if (y1 >= y2)
- continue;
-
- BEGIN_LP_RING(8);
-
- OUT_RING(cmd);
- OUT_RING(ropcpp | dst_pitch);
- OUT_RING((y1 << 16) | rect->x1);
- OUT_RING((y2 << 16) | rect->x2);
- OUT_RING(offsets[front]);
- OUT_RING((y1 << 16) | rect->x1);
- OUT_RING(src_pitch);
- OUT_RING(offsets[back]);
-
- ADVANCE_LP_RING();
- }
- }
- }
-
- DRM_SPINUNLOCK(&dev->drw_lock);
-
- list_for_each_safe(hit, tmp, &hits) {
- drm_i915_vbl_swap_t *swap_hit =
- list_entry(hit, drm_i915_vbl_swap_t, head);
-
- list_del(hit);
-
- drm_free(swap_hit, sizeof(*swap_hit), DRM_MEM_DRIVER);
- }
-}
-#if 0
-static int i915_in_vblank(struct drm_device *dev, int pipe)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- unsigned long pipedsl, vblank, vtotal;
- unsigned long vbl_start, vbl_end, cur_line;
-
- pipedsl = pipe ? PIPEBDSL : PIPEADSL;
- vblank = pipe ? VBLANK_B : VBLANK_A;
- vtotal = pipe ? VTOTAL_B : VTOTAL_A;
-
- vbl_start = I915_READ(vblank) & VBLANK_START_MASK;
- vbl_end = (I915_READ(vblank) >> VBLANK_END_SHIFT) & VBLANK_END_MASK;
-
- cur_line = I915_READ(pipedsl);
-
- if (cur_line >= vbl_start)
- return 1;
-
- return 0;
-}
-#endif
-u32 i915_get_vblank_counter(struct drm_device *dev, int plane)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- unsigned long high_frame;
- unsigned long low_frame;
- u32 high1, high2, low, count;
- int pipe;
-
- pipe = i915_get_pipe(dev, plane);
- high_frame = pipe ? PIPEBFRAMEHIGH : PIPEAFRAMEHIGH;
- low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;
-
- if (!i915_pipe_enabled(dev, pipe)) {
- DRM_ERROR("trying to get vblank count for disabled pipe %d\n",
pipe);
- return 0;
- }
-
- /*
- * High & low register fields aren't synchronized, so make sure
- * we get a low value that's stable across two reads of the high
- * register.
- */
- do {
- high1 = ((I915_READ(high_frame) & PIPE_FRAME_HIGH_MASK) >>
- PIPE_FRAME_HIGH_SHIFT);
- low = ((I915_READ(low_frame) & PIPE_FRAME_LOW_MASK) >>
- PIPE_FRAME_LOW_SHIFT);
- high2 = ((I915_READ(high_frame) & PIPE_FRAME_HIGH_MASK) >>
- PIPE_FRAME_HIGH_SHIFT);
- } while (high1 != high2);
-
- count = (high1 << 8) | low;
-
- /*
- * If we're in the middle of the vblank period, the
- * above regs won't have been updated yet, so return
- * an incremented count to stay accurate
- */
-#if 0
- if (i915_in_vblank(dev, pipe))
- count++;
-#endif
- /* count may be reset by other driver(e.g. 2D driver),
- we have no way to know if it is wrapped or resetted
- when count is zero. do a rough guess.
- */
- if (count == 0 && dev->last_vblank[pipe] < dev->max_vblank_count/2)
- dev->last_vblank[pipe] = 0;
-
- return count;
-}
-
-irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
-{
- struct drm_device *dev = (struct drm_device *) arg;
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- u32 iir;
- u32 pipea_stats, pipeb_stats;
- int vblank = 0;
-
- iir = I915_READ(IIR);
-#if 0
- DRM_DEBUG("flag=%08x\n", iir);
-#endif
- if (iir == 0) {
- DRM_DEBUG ("iir 0x%08x im 0x%08x ie 0x%08x pipea 0x%08x pipeb
0x%08x\n",
- iir,
- I915_READ(IMR),
- I915_READ(IER),
- I915_READ(PIPEASTAT),
- I915_READ(PIPEBSTAT));
- return IRQ_NONE;
- }
-
- /*
- * Clear the PIPE(A|B)STAT regs before the IIR otherwise
- * we may get extra interrupts.
- */
- if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
- pipea_stats = I915_READ(PIPEASTAT);
- if (pipea_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
- PIPE_VBLANK_INTERRUPT_STATUS))
- {
- vblank++;
- drm_handle_vblank(dev, i915_get_plane(dev, 0));
- }
-
- I915_WRITE(PIPEASTAT, pipea_stats);
- }
- if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
- pipeb_stats = I915_READ(PIPEBSTAT);
- if (pipeb_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
- PIPE_VBLANK_INTERRUPT_STATUS))
- {
- vblank++;
- drm_handle_vblank(dev, i915_get_plane(dev, 1));
- }
- I915_WRITE(PIPEBSTAT, pipeb_stats);
- }
-
- if (dev_priv->sarea_priv)
- dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
-
- I915_WRITE(IIR, iir);
- (void) I915_READ(IIR);
-
- if (iir & I915_USER_INTERRUPT) {
- DRM_WAKEUP(&dev_priv->irq_queue);
-#ifdef I915_HAVE_FENCE
- i915_fence_handler(dev);
-#endif
- }
-
- if (vblank) {
- if (dev_priv->swaps_pending > 0)
- drm_locked_tasklet(dev, i915_vblank_tasklet);
- }
-
- return IRQ_HANDLED;
-}
-
-int i915_emit_irq(struct drm_device *dev)
-{
- drm_i915_private_t *dev_priv = dev->dev_private;
- RING_LOCALS;
-
- i915_kernel_lost_context(dev);
-
- DRM_DEBUG("\n");
-
- i915_emit_breadcrumb(dev);
-
- BEGIN_LP_RING(2);
- OUT_RING(0);
- OUT_RING(MI_USER_INTERRUPT);
- ADVANCE_LP_RING();
-
- return dev_priv->counter;
-}
-
-void i915_user_irq_on(drm_i915_private_t *dev_priv)
-{
- DRM_SPINLOCK(&dev_priv->user_irq_lock);
- if (dev_priv->irq_enabled && (++dev_priv->user_irq_refcount == 1)){
- dev_priv->irq_enable_reg |= I915_USER_INTERRUPT;
- I915_WRITE(IER, dev_priv->irq_enable_reg);
- }
- DRM_SPINUNLOCK(&dev_priv->user_irq_lock);
-
-}
-
-void i915_user_irq_off(drm_i915_private_t *dev_priv)
-{
- DRM_SPINLOCK(&dev_priv->user_irq_lock);
- if (dev_priv->irq_enabled && (--dev_priv->user_irq_refcount == 0)) {
- // dev_priv->irq_enable_reg &=
~I915_USER_INTERRUPT;
- // I915_WRITE(IER, dev_priv->irq_enable_reg);
- }
- DRM_SPINUNLOCK(&dev_priv->user_irq_lock);
-}
-
-
-static int i915_wait_irq(struct drm_device * dev, int irq_nr)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- int ret = 0;
-
- DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
- READ_BREADCRUMB(dev_priv));
-
- if (READ_BREADCRUMB(dev_priv) >= irq_nr)
- return 0;
-
- i915_user_irq_on(dev_priv);
- DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
- READ_BREADCRUMB(dev_priv) >= irq_nr);
- i915_user_irq_off(dev_priv);
-
- if (ret == -EBUSY) {
- DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
- READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
- }
-
- if (dev_priv->sarea_priv)
- dev_priv->sarea_priv->last_dispatch =
- READ_BREADCRUMB(dev_priv);
- return ret;
-}
-
-/* Needs the lock as it touches the ring.
- */
-int i915_irq_emit(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
-{
- drm_i915_private_t *dev_priv = dev->dev_private;
- drm_i915_irq_emit_t *emit = data;
- int result;
-
- LOCK_TEST_WITH_RETURN(dev, file_priv);
-
- if (!dev_priv) {
- DRM_ERROR("called with no initialization\n");
- return -EINVAL;
- }
-
- result = i915_emit_irq(dev);
-
- if (DRM_COPY_TO_USER(emit->irq_seq, &result, sizeof(int))) {
- DRM_ERROR("copy_to_user\n");
- return -EFAULT;
- }
-
- return 0;
-}
-
-/* Doesn't need the hardware lock.
- */
-int i915_irq_wait(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
-{
- drm_i915_private_t *dev_priv = dev->dev_private;
- drm_i915_irq_wait_t *irqwait = data;
-
- if (!dev_priv) {
- DRM_ERROR("called with no initialization\n");
- return -EINVAL;
- }
-
- return i915_wait_irq(dev, irqwait->irq_seq);
-}
-
-int i915_enable_vblank(struct drm_device *dev, int plane)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- int pipe = i915_get_pipe(dev, plane);
- u32 pipestat_reg = 0;
- u32 pipestat;
-
- switch (pipe) {
- case 0:
- pipestat_reg = PIPEASTAT;
- dev_priv->irq_enable_reg |= I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
- break;
- case 1:
- pipestat_reg = PIPEBSTAT;
- dev_priv->irq_enable_reg |= I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
- break;
- default:
- DRM_ERROR("tried to enable vblank on non-existent pipe %d\n",
- pipe);
- break;
- }
-
- if (pipestat_reg)
- {
- pipestat = I915_READ (pipestat_reg);
- /*
- * Older chips didn't have the start vblank interrupt,
- * but
- */
- if (IS_I965G (dev))
- pipestat |= PIPE_START_VBLANK_INTERRUPT_ENABLE;
- else
- pipestat |= PIPE_VBLANK_INTERRUPT_ENABLE;
- /*
- * Clear any pending status
- */
- pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
- PIPE_VBLANK_INTERRUPT_STATUS);
- I915_WRITE(pipestat_reg, pipestat);
- }
- I915_WRITE(IER, dev_priv->irq_enable_reg);
-
- return 0;
-}
-
-void i915_disable_vblank(struct drm_device *dev, int plane)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- int pipe = i915_get_pipe(dev, plane);
- u32 pipestat_reg = 0;
- u32 pipestat;
-
- switch (pipe) {
- case 0:
- pipestat_reg = PIPEASTAT;
- dev_priv->irq_enable_reg &=
~I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
- break;
- case 1:
- pipestat_reg = PIPEBSTAT;
- dev_priv->irq_enable_reg &=
~I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
- break;
- default:
- DRM_ERROR("tried to disable vblank on non-existent pipe %d\n",
- pipe);
- break;
- }
-
- I915_WRITE(IER, dev_priv->irq_enable_reg);
-
- if (pipestat_reg)
- {
- pipestat = I915_READ (pipestat_reg);
- pipestat &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
- PIPE_VBLANK_INTERRUPT_ENABLE);
- /*
- * Clear any pending status
- */
- pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
- PIPE_VBLANK_INTERRUPT_STATUS);
- I915_WRITE(pipestat_reg, pipestat);
- }
-}
-
-static void i915_enable_interrupt (struct drm_device *dev)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-
- dev_priv->irq_enable_reg |= I915_USER_INTERRUPT;
-
- I915_WRITE(IER, dev_priv->irq_enable_reg);
- dev_priv->irq_enabled = 1;
-}
-
-/* Set the vblank monitor pipe
- */
-int i915_vblank_pipe_set(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
-{
- drm_i915_private_t *dev_priv = dev->dev_private;
- drm_i915_vblank_pipe_t *pipe = data;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
