Merge branch 'master' into rawhide/user/myoung/xendom0
Conflicts: kernel.spec
This commit is contained in:
Michael Young
commit
b65e52f040
|
|
@ -0,0 +1,69 @@
|
|||
From bea96046b4245e9abd65ed7acfed9adfd5f6c639 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Date: Thu, 3 Mar 2011 23:43:02 +0000
|
||||
Subject: [PATCH] drm/i915: Gen4+ has non-power-of-two strides
|
||||
|
||||
In c2e0eb16707, we started checking that the buffer was the correct size
|
||||
for tiled access by ensuring that the size was a multiple of tiles.
|
||||
However, gen4+ complicates the issue by allowing any multiple of 4096
|
||||
bytes for the stride and so the simple check based on a power-of-two
|
||||
stride was failing for valid bo.
|
||||
|
||||
Reported-by: Dan Williams <dcbw@redhat.com>
|
||||
Reported-by: Robert Hooker <sarvatt@gmail.com>
|
||||
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
---
|
||||
drivers/gpu/drm/i915/i915_gem_tiling.c | 29 ++++++++++++++---------------
|
||||
1 files changed, 14 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
|
||||
index 79a04fd..654f350 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
|
||||
@@ -215,6 +215,19 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (INTEL_INFO(dev)->gen >= 4) {
|
||||
+ /* 965+ just needs multiples of tile width */
|
||||
+ if (stride & (tile_width - 1))
|
||||
+ return false;
|
||||
+ } else {
|
||||
+ /* Pre-965 needs power of two tile widths */
|
||||
+ if (stride < tile_width)
|
||||
+ return false;
|
||||
+
|
||||
+ if (stride & (stride - 1))
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
if (IS_GEN2(dev) ||
|
||||
(tiling_mode == I915_TILING_Y && HAS_128_BYTE_Y_TILING(dev)))
|
||||
tile_height = 32;
|
||||
@@ -226,21 +239,7 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)
|
||||
tile_height *= 2;
|
||||
|
||||
/* Size needs to be aligned to a full tile row */
|
||||
- if (size & (tile_height * stride - 1))
|
||||
- return false;
|
||||
-
|
||||
- /* 965+ just needs multiples of tile width */
|
||||
- if (INTEL_INFO(dev)->gen >= 4) {
|
||||
- if (stride & (tile_width - 1))
|
||||
- return false;
|
||||
- return true;
|
||||
- }
|
||||
-
|
||||
- /* Pre-965 needs power of two tile widths */
|
||||
- if (stride < tile_width)
|
||||
- return false;
|
||||
-
|
||||
- if (stride & (stride - 1))
|
||||
+ if (size % (tile_height * stride))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
omgwtfbbqchainsaw?
|
||||
---
|
||||
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 5 +++++
|
||||
1 files changed, 5 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
||||
index e698343..21e601d1 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
||||
@@ -1090,6 +1090,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
|
||||
if (ret)
|
||||
goto pre_mutex_err;
|
||||
|
||||
+ /* We don't get the flushing right for these chipsets, use the
|
||||
+ * big hammer for now to avoid random crashiness. */
|
||||
+ if (IS_I85X(dev) || IS_I865G(dev))
|
||||
+ wbinvd();
|
||||
+
|
||||
if (dev_priv->mm.suspended) {
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
ret = -EBUSY;
|
||||
|
|
@ -1,24 +1,30 @@
|
|||
drivers/gpu/drm/nouveau/nouveau_bios.c | 25 +--
|
||||
drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +-
|
||||
drivers/gpu/drm/nouveau/nouveau_channel.c | 2 +-
|
||||
drivers/gpu/drm/nouveau/nouveau_display.c | 2 +-
|
||||
drivers/gpu/drm/nouveau/nouveau_dp.c | 2 -
|
||||
drivers/gpu/drm/nouveau/nouveau_drv.h | 13 +-
|
||||
drivers/gpu/drm/nouveau/nouveau_drv.h | 15 +-
|
||||
drivers/gpu/drm/nouveau/nouveau_fence.c | 190 ++++++++++------
|
||||
drivers/gpu/drm/nouveau/nouveau_mem.c | 16 +-
|
||||
drivers/gpu/drm/nouveau/nouveau_mem.c | 50 +++-
|
||||
drivers/gpu/drm/nouveau/nouveau_object.c | 22 ++-
|
||||
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 342 +++++++++++++++++++++++++----
|
||||
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 341 +++++++++++++++++++++++++----
|
||||
drivers/gpu/drm/nouveau/nouveau_state.c | 10 +-
|
||||
drivers/gpu/drm/nouveau/nouveau_temp.c | 4 +-
|
||||
drivers/gpu/drm/nouveau/nv04_fifo.c | 17 ++-
|
||||
drivers/gpu/drm/nouveau/nouveau_util.c | 23 ++-
|
||||
drivers/gpu/drm/nouveau/nouveau_util.h | 4 +
|
||||
drivers/gpu/drm/nouveau/nouveau_vm.c | 13 +-
|
||||
drivers/gpu/drm/nouveau/nv04_fifo.c | 19 ++-
|
||||
drivers/gpu/drm/nouveau/nv40_fb.c | 59 +++++-
|
||||
drivers/gpu/drm/nouveau/nv50_display.c | 7 +-
|
||||
drivers/gpu/drm/nouveau/nv50_fb.c | 150 ++++++++++++-
|
||||
drivers/gpu/drm/nouveau/nv50_fifo.c | 3 +-
|
||||
drivers/gpu/drm/nouveau/nv50_gpio.c | 13 +-
|
||||
drivers/gpu/drm/nouveau/nv50_graph.c | 8 +-
|
||||
drivers/gpu/drm/nouveau/nv50_graph.c | 142 +++++++-----
|
||||
drivers/gpu/drm/nouveau/nv50_vm.c | 1 -
|
||||
drivers/gpu/drm/nouveau/nv84_crypt.c | 2 +-
|
||||
drivers/gpu/drm/nouveau/nvc0_fifo.c | 15 +-
|
||||
drivers/gpu/drm/nouveau/nvc0_graph.c | 2 -
|
||||
20 files changed, 567 insertions(+), 190 deletions(-)
|
||||
26 files changed, 841 insertions(+), 281 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
|
||||
index 6bdab89..b8ff1e7 100644
|
||||
|
|
@ -64,10 +70,10 @@ index 6bdab89..b8ff1e7 100644
|
|||
if (cte->type == 0xff)
|
||||
continue;
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
|
||||
index d38a4d9..bf260af 100644
|
||||
index a521840..53a8000 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
|
||||
@@ -382,7 +382,8 @@ nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev)
|
||||
@@ -385,7 +385,8 @@ nouveau_bo_create_ttm_backend_entry(struct ttm_bo_device *bdev)
|
||||
case NOUVEAU_GART_AGP:
|
||||
return ttm_agp_backend_init(bdev, dev->agp->bridge);
|
||||
#endif
|
||||
|
|
@ -77,7 +83,7 @@ index d38a4d9..bf260af 100644
|
|||
return nouveau_sgdma_init_ttm(dev);
|
||||
default:
|
||||
NV_ERROR(dev, "Unknown GART type %d\n",
|
||||
@@ -436,7 +437,8 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
|
||||
@@ -439,7 +440,8 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
|
||||
TTM_PL_FLAG_WC;
|
||||
man->default_caching = TTM_PL_FLAG_WC;
|
||||
break;
|
||||
|
|
@ -100,6 +106,19 @@ index 3960d66..3d7b316 100644
|
|||
|
||||
if (dev_priv->card_type >= NV_50) {
|
||||
if (dev_priv->card_type < NV_C0) {
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
|
||||
index 505c6bf..566466b 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
|
||||
@@ -244,7 +244,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
|
||||
|
||||
/* Initialize a page flip struct */
|
||||
*s = (struct nouveau_page_flip_state)
|
||||
- { { }, s->event, nouveau_crtc(crtc)->index,
|
||||
+ { { }, event, nouveau_crtc(crtc)->index,
|
||||
fb->bits_per_pixel, fb->pitch, crtc->x, crtc->y,
|
||||
new_bo->bo.offset };
|
||||
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
|
||||
index 38d5995..7beb82a 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
|
||||
|
|
@ -121,7 +140,7 @@ index 38d5995..7beb82a 100644
|
|||
ret = auxch_rd(encoder, DP_ADJUST_REQUEST_LANE0_1, request, 2);
|
||||
if (ret)
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
|
||||
index 9821fca..2e3d7fb 100644
|
||||
index 982d70b..2cae8e7 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
|
||||
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
|
||||
@@ -652,7 +652,6 @@ struct drm_nouveau_private {
|
||||
|
|
@ -156,6 +175,15 @@ index 9821fca..2e3d7fb 100644
|
|||
struct nouveau_gpuobj *sg_ctxdma;
|
||||
struct nouveau_vma vma;
|
||||
} gart_info;
|
||||
@@ -1076,7 +1083,7 @@ extern void nv40_fb_set_tile_region(struct drm_device *dev, int i);
|
||||
/* nv50_fb.c */
|
||||
extern int nv50_fb_init(struct drm_device *);
|
||||
extern void nv50_fb_takedown(struct drm_device *);
|
||||
-extern void nv50_fb_vm_trap(struct drm_device *, int display, const char *);
|
||||
+extern void nv50_fb_vm_trap(struct drm_device *, int display);
|
||||
|
||||
/* nvc0_fb.c */
|
||||
extern int nvc0_fb_init(struct drm_device *);
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
|
||||
index 221b846..8b46392 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
|
||||
|
|
@ -476,7 +504,7 @@ index 221b846..8b46392 100644
|
|||
if (ret)
|
||||
return ret;
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
|
||||
index 26347b7..30bd230 100644
|
||||
index b0fb9bd..5b769eb 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
|
||||
@@ -393,11 +393,17 @@ nouveau_mem_vram_init(struct drm_device *dev)
|
||||
|
|
@ -502,6 +530,47 @@ index 26347b7..30bd230 100644
|
|||
|
||||
ret = pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(dma_bits));
|
||||
if (ret)
|
||||
@@ -419,14 +425,32 @@ nouveau_mem_vram_init(struct drm_device *dev)
|
||||
}
|
||||
|
||||
/* reserve space at end of VRAM for PRAMIN */
|
||||
- if (dev_priv->chipset == 0x40 || dev_priv->chipset == 0x47 ||
|
||||
- dev_priv->chipset == 0x49 || dev_priv->chipset == 0x4b)
|
||||
- dev_priv->ramin_rsvd_vram = (2 * 1024 * 1024);
|
||||
- else
|
||||
- if (dev_priv->card_type >= NV_40)
|
||||
- dev_priv->ramin_rsvd_vram = (1 * 1024 * 1024);
|
||||
- else
|
||||
- dev_priv->ramin_rsvd_vram = (512 * 1024);
|
||||
+ if (dev_priv->card_type >= NV_50) {
|
||||
+ dev_priv->ramin_rsvd_vram = 1 * 1024 * 1024;
|
||||
+ } else
|
||||
+ if (dev_priv->card_type >= NV_40) {
|
||||
+ u32 vs = hweight8((nv_rd32(dev, 0x001540) & 0x0000ff00) >> 8);
|
||||
+ u32 rsvd;
|
||||
+
|
||||
+ /* estimate grctx size, the magics come from nv40_grctx.c */
|
||||
+ if (dev_priv->chipset == 0x40) rsvd = 0x6aa0 * vs;
|
||||
+ else if (dev_priv->chipset < 0x43) rsvd = 0x4f00 * vs;
|
||||
+ else if (nv44_graph_class(dev)) rsvd = 0x4980 * vs;
|
||||
+ else rsvd = 0x4a40 * vs;
|
||||
+ rsvd += 16 * 1024;
|
||||
+ rsvd *= dev_priv->engine.fifo.channels;
|
||||
+
|
||||
+ /* pciegart table */
|
||||
+ if (drm_device_is_pcie(dev))
|
||||
+ rsvd += 512 * 1024;
|
||||
+
|
||||
+ /* object storage */
|
||||
+ rsvd += 512 * 1024;
|
||||
+
|
||||
+ dev_priv->ramin_rsvd_vram = round_up(rsvd, 4096);
|
||||
+ } else {
|
||||
+ dev_priv->ramin_rsvd_vram = 512 * 1024;
|
||||
+ }
|
||||
|
||||
ret = dev_priv->engine.vram.init(dev);
|
||||
if (ret)
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
|
||||
index 30b6544..3c12461 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
|
||||
|
|
@ -538,7 +607,7 @@ index 30b6544..3c12461 100644
|
|||
}
|
||||
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
|
||||
index 9a250eb..bdbaa54 100644
|
||||
index 9a250eb..a26383b 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
|
||||
@@ -74,8 +74,24 @@ nouveau_sgdma_clear(struct ttm_backend *be)
|
||||
|
|
@ -833,7 +902,7 @@ index 9a250eb..bdbaa54 100644
|
|||
return &nvbe->backend;
|
||||
}
|
||||
|
||||
@@ -210,21 +414,71 @@ nouveau_sgdma_init(struct drm_device *dev)
|
||||
@@ -210,21 +414,70 @@ nouveau_sgdma_init(struct drm_device *dev)
|
||||
{
|
||||
struct drm_nouveau_private *dev_priv = dev->dev_private;
|
||||
struct nouveau_gpuobj *gpuobj = NULL;
|
||||
|
|
@ -842,8 +911,7 @@ index 9a250eb..bdbaa54 100644
|
|||
+ u32 aper_size, align;
|
||||
+ int ret;
|
||||
+
|
||||
+ if (dev_priv->card_type >= NV_50 ||
|
||||
+ dev_priv->ramin_rsvd_vram >= 2 * 1024 * 1024)
|
||||
+ if (dev_priv->card_type >= NV_50 || drm_device_is_pcie(dev))
|
||||
+ aper_size = 512 * 1024 * 1024;
|
||||
+ else
|
||||
+ aper_size = 64 * 1024 * 1024;
|
||||
|
|
@ -883,7 +951,7 @@ index 9a250eb..bdbaa54 100644
|
|||
+ dev_priv->gart_info.type = NOUVEAU_GART_HW;
|
||||
+ dev_priv->gart_info.func = &nv50_sgdma_backend;
|
||||
+ } else
|
||||
+ if (drm_device_is_pcie(dev) &&
|
||||
+ if (0 && drm_device_is_pcie(dev) &&
|
||||
+ dev_priv->chipset != 0x40 && dev_priv->chipset != 0x45) {
|
||||
+ if (nv44_graph_class(dev)) {
|
||||
+ dev_priv->gart_info.func = &nv44_sgdma_backend;
|
||||
|
|
@ -917,7 +985,7 @@ index 9a250eb..bdbaa54 100644
|
|||
if (ret) {
|
||||
NV_ERROR(dev, "Error creating sgdma object: %d\n", ret);
|
||||
return ret;
|
||||
@@ -236,25 +490,14 @@ nouveau_sgdma_init(struct drm_device *dev)
|
||||
@@ -236,25 +489,14 @@ nouveau_sgdma_init(struct drm_device *dev)
|
||||
(0 << 14) /* RW */ |
|
||||
(2 << 16) /* PCI */);
|
||||
nv_wo32(gpuobj, 4, aper_size - 1);
|
||||
|
|
@ -945,7 +1013,7 @@ index 9a250eb..bdbaa54 100644
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -265,6 +508,13 @@ nouveau_sgdma_takedown(struct drm_device *dev)
|
||||
@@ -265,6 +507,13 @@ nouveau_sgdma_takedown(struct drm_device *dev)
|
||||
|
||||
nouveau_gpuobj_ref(NULL, &dev_priv->gart_info.sg_ctxdma);
|
||||
nouveau_vm_put(&dev_priv->gart_info.vma);
|
||||
|
|
@ -1011,8 +1079,90 @@ index 8d9968e..649b041 100644
|
|||
|
||||
client = i2c_new_device(&i2c->adapter, info);
|
||||
if (!client)
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_util.c b/drivers/gpu/drm/nouveau/nouveau_util.c
|
||||
index fbe0fb1..e51b515 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_util.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nouveau_util.c
|
||||
@@ -47,18 +47,27 @@ nouveau_bitfield_print(const struct nouveau_bitfield *bf, u32 value)
|
||||
printk(" (unknown bits 0x%08x)", value);
|
||||
}
|
||||
|
||||
-void
|
||||
-nouveau_enum_print(const struct nouveau_enum *en, u32 value)
|
||||
+const struct nouveau_enum *
|
||||
+nouveau_enum_find(const struct nouveau_enum *en, u32 value)
|
||||
{
|
||||
while (en->name) {
|
||||
- if (value == en->value) {
|
||||
- printk("%s", en->name);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
+ if (en->value == value)
|
||||
+ return en;
|
||||
en++;
|
||||
}
|
||||
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+nouveau_enum_print(const struct nouveau_enum *en, u32 value)
|
||||
+{
|
||||
+ en = nouveau_enum_find(en, value);
|
||||
+ if (en) {
|
||||
+ printk("%s", en->name);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
printk("(unknown enum 0x%08x)", value);
|
||||
}
|
||||
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_util.h b/drivers/gpu/drm/nouveau/nouveau_util.h
|
||||
index d9ceaea..b97719f 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_util.h
|
||||
+++ b/drivers/gpu/drm/nouveau/nouveau_util.h
|
||||
@@ -36,10 +36,14 @@ struct nouveau_bitfield {
|
||||
struct nouveau_enum {
|
||||
u32 value;
|
||||
const char *name;
|
||||
+ void *data;
|
||||
};
|
||||
|
||||
void nouveau_bitfield_print(const struct nouveau_bitfield *, u32 value);
|
||||
void nouveau_enum_print(const struct nouveau_enum *, u32 value);
|
||||
+const struct nouveau_enum *
|
||||
+nouveau_enum_find(const struct nouveau_enum *, u32 value);
|
||||
+
|
||||
int nouveau_ratelimit(void);
|
||||
|
||||
#endif
|
||||
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c
|
||||
index 97d82ae..b4658f7 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nouveau_vm.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nouveau_vm.c
|
||||
@@ -311,18 +311,7 @@ nouveau_vm_new(struct drm_device *dev, u64 offset, u64 length, u64 mm_offset,
|
||||
vm->spg_shift = 12;
|
||||
vm->lpg_shift = 17;
|
||||
pgt_bits = 27;
|
||||
-
|
||||
- /* Should be 4096 everywhere, this is a hack that's
|
||||
- * currently necessary to avoid an elusive bug that
|
||||
- * causes corruption when mixing small/large pages
|
||||
- */
|
||||
- if (length < (1ULL << 40))
|
||||
- block = 4096;
|
||||
- else {
|
||||
- block = (1 << pgt_bits);
|
||||
- if (length < block)
|
||||
- block = length;
|
||||
- }
|
||||
+ block = 4096;
|
||||
} else {
|
||||
kfree(vm);
|
||||
return -ENOSYS;
|
||||
diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c
|
||||
index f89d104..dfa600c 100644
|
||||
index f89d104..db465a3 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nv04_fifo.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nv04_fifo.c
|
||||
@@ -379,6 +379,15 @@ out:
|
||||
|
|
@ -1055,6 +1205,15 @@ index f89d104..dfa600c 100644
|
|||
|
||||
if (dma_get != dma_put)
|
||||
nv_wr32(dev, 0x003244, dma_put);
|
||||
@@ -505,7 +516,7 @@ nv04_fifo_isr(struct drm_device *dev)
|
||||
|
||||
if (dev_priv->card_type == NV_50) {
|
||||
if (status & 0x00000010) {
|
||||
- nv50_fb_vm_trap(dev, 1, "PFIFO_BAR_FAULT");
|
||||
+ nv50_fb_vm_trap(dev, nouveau_ratelimit());
|
||||
status &= ~0x00000010;
|
||||
nv_wr32(dev, 0x002100, 0x00000010);
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/nouveau/nv40_fb.c b/drivers/gpu/drm/nouveau/nv40_fb.c
|
||||
index f3d9c05..f0ac2a7 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nv40_fb.c
|
||||
|
|
@ -1170,6 +1329,185 @@ index 7cc94ed..a804a35 100644
|
|||
delayed |= clock;
|
||||
intr1 &= ~clock;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/nv50_fb.c
|
||||
index 50290de..efc8cd4 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nv50_fb.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nv50_fb.c
|
||||
@@ -95,12 +95,109 @@ nv50_fb_takedown(struct drm_device *dev)
|
||||
kfree(priv);
|
||||
}
|
||||
|
||||
+static struct nouveau_enum vm_dispatch_subclients[] = {
|
||||
+ { 0x00000000, "GRCTX", NULL },
|
||||
+ { 0x00000001, "NOTIFY", NULL },
|
||||
+ { 0x00000002, "QUERY", NULL },
|
||||
+ { 0x00000003, "COND", NULL },
|
||||
+ { 0x00000004, "M2M_IN", NULL },
|
||||
+ { 0x00000005, "M2M_OUT", NULL },
|
||||
+ { 0x00000006, "M2M_NOTIFY", NULL },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static struct nouveau_enum vm_ccache_subclients[] = {
|
||||
+ { 0x00000000, "CB", NULL },
|
||||
+ { 0x00000001, "TIC", NULL },
|
||||
+ { 0x00000002, "TSC", NULL },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static struct nouveau_enum vm_prop_subclients[] = {
|
||||
+ { 0x00000000, "RT0", NULL },
|
||||
+ { 0x00000001, "RT1", NULL },
|
||||
+ { 0x00000002, "RT2", NULL },
|
||||
+ { 0x00000003, "RT3", NULL },
|
||||
+ { 0x00000004, "RT4", NULL },
|
||||
+ { 0x00000005, "RT5", NULL },
|
||||
+ { 0x00000006, "RT6", NULL },
|
||||
+ { 0x00000007, "RT7", NULL },
|
||||
+ { 0x00000008, "ZETA", NULL },
|
||||
+ { 0x00000009, "LOCAL", NULL },
|
||||
+ { 0x0000000a, "GLOBAL", NULL },
|
||||
+ { 0x0000000b, "STACK", NULL },
|
||||
+ { 0x0000000c, "DST2D", NULL },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static struct nouveau_enum vm_pfifo_subclients[] = {
|
||||
+ { 0x00000000, "PUSHBUF", NULL },
|
||||
+ { 0x00000001, "SEMAPHORE", NULL },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static struct nouveau_enum vm_bar_subclients[] = {
|
||||
+ { 0x00000000, "FB", NULL },
|
||||
+ { 0x00000001, "IN", NULL },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static struct nouveau_enum vm_client[] = {
|
||||
+ { 0x00000000, "STRMOUT", NULL },
|
||||
+ { 0x00000003, "DISPATCH", vm_dispatch_subclients },
|
||||
+ { 0x00000004, "PFIFO_WRITE", NULL },
|
||||
+ { 0x00000005, "CCACHE", vm_ccache_subclients },
|
||||
+ { 0x00000006, "PPPP", NULL },
|
||||
+ { 0x00000007, "CLIPID", NULL },
|
||||
+ { 0x00000008, "PFIFO_READ", NULL },
|
||||
+ { 0x00000009, "VFETCH", NULL },
|
||||
+ { 0x0000000a, "TEXTURE", NULL },
|
||||
+ { 0x0000000b, "PROP", vm_prop_subclients },
|
||||
+ { 0x0000000c, "PVP", NULL },
|
||||
+ { 0x0000000d, "PBSP", NULL },
|
||||
+ { 0x0000000e, "PCRYPT", NULL },
|
||||
+ { 0x0000000f, "PCOUNTER", NULL },
|
||||
+ { 0x00000011, "PDAEMON", NULL },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static struct nouveau_enum vm_engine[] = {
|
||||
+ { 0x00000000, "PGRAPH", NULL },
|
||||
+ { 0x00000001, "PVP", NULL },
|
||||
+ { 0x00000004, "PEEPHOLE", NULL },
|
||||
+ { 0x00000005, "PFIFO", vm_pfifo_subclients },
|
||||
+ { 0x00000006, "BAR", vm_bar_subclients },
|
||||
+ { 0x00000008, "PPPP", NULL },
|
||||
+ { 0x00000009, "PBSP", NULL },
|
||||
+ { 0x0000000a, "PCRYPT", NULL },
|
||||
+ { 0x0000000b, "PCOUNTER", NULL },
|
||||
+ { 0x0000000c, "SEMAPHORE_BG", NULL },
|
||||
+ { 0x0000000d, "PCOPY", NULL },
|
||||
+ { 0x0000000e, "PDAEMON", NULL },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static struct nouveau_enum vm_fault[] = {
|
||||
+ { 0x00000000, "PT_NOT_PRESENT", NULL },
|
||||
+ { 0x00000001, "PT_TOO_SHORT", NULL },
|
||||
+ { 0x00000002, "PAGE_NOT_PRESENT", NULL },
|
||||
+ { 0x00000003, "PAGE_SYSTEM_ONLY", NULL },
|
||||
+ { 0x00000004, "PAGE_READ_ONLY", NULL },
|
||||
+ { 0x00000006, "NULL_DMAOBJ", NULL },
|
||||
+ { 0x00000007, "WRONG_MEMTYPE", NULL },
|
||||
+ { 0x0000000b, "VRAM_LIMIT", NULL },
|
||||
+ { 0x0000000f, "DMAOBJ_LIMIT", NULL },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
void
|
||||
-nv50_fb_vm_trap(struct drm_device *dev, int display, const char *name)
|
||||
+nv50_fb_vm_trap(struct drm_device *dev, int display)
|
||||
{
|
||||
struct drm_nouveau_private *dev_priv = dev->dev_private;
|
||||
+ const struct nouveau_enum *en, *cl;
|
||||
unsigned long flags;
|
||||
u32 trap[6], idx, chinst;
|
||||
+ u8 st0, st1, st2, st3;
|
||||
int i, ch;
|
||||
|
||||
idx = nv_rd32(dev, 0x100c90);
|
||||
@@ -117,8 +214,8 @@ nv50_fb_vm_trap(struct drm_device *dev, int display, const char *name)
|
||||
if (!display)
|
||||
return;
|
||||
|
||||
+ /* lookup channel id */
|
||||
chinst = (trap[2] << 16) | trap[1];
|
||||
-
|
||||
spin_lock_irqsave(&dev_priv->channels.lock, flags);
|
||||
for (ch = 0; ch < dev_priv->engine.fifo.channels; ch++) {
|
||||
struct nouveau_channel *chan = dev_priv->channels.ptr[ch];
|
||||
@@ -131,9 +228,48 @@ nv50_fb_vm_trap(struct drm_device *dev, int display, const char *name)
|
||||
}
|
||||
spin_unlock_irqrestore(&dev_priv->channels.lock, flags);
|
||||
|
||||
- NV_INFO(dev, "%s - VM: Trapped %s at %02x%04x%04x status %08x "
|
||||
- "channel %d (0x%08x)\n",
|
||||
- name, (trap[5] & 0x100 ? "read" : "write"),
|
||||
- trap[5] & 0xff, trap[4] & 0xffff, trap[3] & 0xffff,
|
||||
- trap[0], ch, chinst);
|
||||
+ /* decode status bits into something more useful */
|
||||
+ if (dev_priv->chipset < 0xa3 ||
|
||||
+ dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac) {
|
||||
+ st0 = (trap[0] & 0x0000000f) >> 0;
|
||||
+ st1 = (trap[0] & 0x000000f0) >> 4;
|
||||
+ st2 = (trap[0] & 0x00000f00) >> 8;
|
||||
+ st3 = (trap[0] & 0x0000f000) >> 12;
|
||||
+ } else {
|
||||
+ st0 = (trap[0] & 0x000000ff) >> 0;
|
||||
+ st1 = (trap[0] & 0x0000ff00) >> 8;
|
||||
+ st2 = (trap[0] & 0x00ff0000) >> 16;
|
||||
+ st3 = (trap[0] & 0xff000000) >> 24;
|
||||
+ }
|
||||
+
|
||||
+ NV_INFO(dev, "VM: trapped %s at 0x%02x%04x%04x on ch %d [0x%08x] ",
|
||||
+ (trap[5] & 0x00000100) ? "read" : "write",
|
||||
+ trap[5] & 0xff, trap[4] & 0xffff, trap[3] & 0xffff, ch, chinst);
|
||||
+
|
||||
+ en = nouveau_enum_find(vm_engine, st0);
|
||||
+ if (en)
|
||||
+ printk("%s/", en->name);
|
||||
+ else
|
||||
+ printk("%02x/", st0);
|
||||
+
|
||||
+ cl = nouveau_enum_find(vm_client, st2);
|
||||
+ if (cl)
|
||||
+ printk("%s/", cl->name);
|
||||
+ else
|
||||
+ printk("%02x/", st2);
|
||||
+
|
||||
+ if (cl && cl->data) cl = nouveau_enum_find(cl->data, st3);
|
||||
+ else if (en && en->data) cl = nouveau_enum_find(en->data, st3);
|
||||
+ else cl = NULL;
|
||||
+ if (cl)
|
||||
+ printk("%s", cl->name);
|
||||
+ else
|
||||
+ printk("%02x", st3);
|
||||
+
|
||||
+ printk(" reason: ");
|
||||
+ en = nouveau_enum_find(vm_fault, st1);
|
||||
+ if (en)
|
||||
+ printk("%s\n", en->name);
|
||||
+ else
|
||||
+ printk("0x%08x\n", st1);
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
|
||||
index 8dd04c5..c34a074 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nv50_fifo.c
|
||||
|
|
@ -1246,10 +1584,195 @@ index 6b149c0..d4f4206 100644
|
|||
spin_unlock(&priv->lock);
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
|
||||
index 37e21d2..c75cff1 100644
|
||||
index 37e21d2..a32b301 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
|
||||
@@ -912,10 +912,10 @@ nv50_pgraph_trap_handler(struct drm_device *dev, u32 display, u64 inst, u32 chid
|
||||
@@ -95,13 +95,41 @@ nv50_graph_init_regs__nv(struct drm_device *dev)
|
||||
}
|
||||
|
||||
static void
|
||||
-nv50_graph_init_regs(struct drm_device *dev)
|
||||
+nv50_graph_init_zcull(struct drm_device *dev)
|
||||
{
|
||||
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
|
||||
+ int i;
|
||||
+
|
||||
NV_DEBUG(dev, "\n");
|
||||
|
||||
- nv_wr32(dev, NV04_PGRAPH_DEBUG_3,
|
||||
- (1 << 2) /* HW_CONTEXT_SWITCH_ENABLED */);
|
||||
- nv_wr32(dev, 0x402ca8, 0x800);
|
||||
+ switch (dev_priv->chipset & 0xf0) {
|
||||
+ case 0x50:
|
||||
+ case 0x80:
|
||||
+ case 0x90:
|
||||
+ nv_wr32(dev, 0x402ca8, 0x00000800);
|
||||
+ break;
|
||||
+ case 0xa0:
|
||||
+ default:
|
||||
+ nv_wr32(dev, 0x402cc0, 0x00000000);
|
||||
+ if (dev_priv->chipset == 0xa0 ||
|
||||
+ dev_priv->chipset == 0xaa ||
|
||||
+ dev_priv->chipset == 0xac) {
|
||||
+ nv_wr32(dev, 0x402ca8, 0x00000802);
|
||||
+ } else {
|
||||
+ nv_wr32(dev, 0x402cc0, 0x00000000);
|
||||
+ nv_wr32(dev, 0x402ca8, 0x00000002);
|
||||
+ }
|
||||
+
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ /* zero out zcull regions */
|
||||
+ for (i = 0; i < 8; i++) {
|
||||
+ nv_wr32(dev, 0x402c20 + (i * 8), 0x00000000);
|
||||
+ nv_wr32(dev, 0x402c24 + (i * 8), 0x00000000);
|
||||
+ nv_wr32(dev, 0x402c28 + (i * 8), 0x00000000);
|
||||
+ nv_wr32(dev, 0x402c2c + (i * 8), 0x00000000);
|
||||
+ }
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -136,6 +164,7 @@ nv50_graph_init_ctxctl(struct drm_device *dev)
|
||||
}
|
||||
kfree(cp);
|
||||
|
||||
+ nv_wr32(dev, 0x40008c, 0x00000004); /* HW_CTX_SWITCH_ENABLED */
|
||||
nv_wr32(dev, 0x400320, 4);
|
||||
nv_wr32(dev, NV40_PGRAPH_CTXCTL_CUR, 0);
|
||||
nv_wr32(dev, NV20_PGRAPH_CHANNEL_CTX_POINTER, 0);
|
||||
@@ -151,7 +180,7 @@ nv50_graph_init(struct drm_device *dev)
|
||||
|
||||
nv50_graph_init_reset(dev);
|
||||
nv50_graph_init_regs__nv(dev);
|
||||
- nv50_graph_init_regs(dev);
|
||||
+ nv50_graph_init_zcull(dev);
|
||||
|
||||
ret = nv50_graph_init_ctxctl(dev);
|
||||
if (ret)
|
||||
@@ -526,11 +555,11 @@ nv86_graph_tlb_flush(struct drm_device *dev)
|
||||
|
||||
static struct nouveau_enum nv50_mp_exec_error_names[] =
|
||||
{
|
||||
- { 3, "STACK_UNDERFLOW" },
|
||||
- { 4, "QUADON_ACTIVE" },
|
||||
- { 8, "TIMEOUT" },
|
||||
- { 0x10, "INVALID_OPCODE" },
|
||||
- { 0x40, "BREAKPOINT" },
|
||||
+ { 3, "STACK_UNDERFLOW", NULL },
|
||||
+ { 4, "QUADON_ACTIVE", NULL },
|
||||
+ { 8, "TIMEOUT", NULL },
|
||||
+ { 0x10, "INVALID_OPCODE", NULL },
|
||||
+ { 0x40, "BREAKPOINT", NULL },
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -558,47 +587,47 @@ static struct nouveau_bitfield nv50_graph_trap_ccache[] = {
|
||||
|
||||
/* There must be a *lot* of these. Will take some time to gather them up. */
|
||||
struct nouveau_enum nv50_data_error_names[] = {
|
||||
- { 0x00000003, "INVALID_QUERY_OR_TEXTURE" },
|
||||
- { 0x00000004, "INVALID_VALUE" },
|
||||
- { 0x00000005, "INVALID_ENUM" },
|
||||
- { 0x00000008, "INVALID_OBJECT" },
|
||||
- { 0x00000009, "READ_ONLY_OBJECT" },
|
||||
- { 0x0000000a, "SUPERVISOR_OBJECT" },
|
||||
- { 0x0000000b, "INVALID_ADDRESS_ALIGNMENT" },
|
||||
- { 0x0000000c, "INVALID_BITFIELD" },
|
||||
- { 0x0000000d, "BEGIN_END_ACTIVE" },
|
||||
- { 0x0000000e, "SEMANTIC_COLOR_BACK_OVER_LIMIT" },
|
||||
- { 0x0000000f, "VIEWPORT_ID_NEEDS_GP" },
|
||||
- { 0x00000010, "RT_DOUBLE_BIND" },
|
||||
- { 0x00000011, "RT_TYPES_MISMATCH" },
|
||||
- { 0x00000012, "RT_LINEAR_WITH_ZETA" },
|
||||
- { 0x00000015, "FP_TOO_FEW_REGS" },
|
||||
- { 0x00000016, "ZETA_FORMAT_CSAA_MISMATCH" },
|
||||
- { 0x00000017, "RT_LINEAR_WITH_MSAA" },
|
||||
- { 0x00000018, "FP_INTERPOLANT_START_OVER_LIMIT" },
|
||||
- { 0x00000019, "SEMANTIC_LAYER_OVER_LIMIT" },
|
||||
- { 0x0000001a, "RT_INVALID_ALIGNMENT" },
|
||||
- { 0x0000001b, "SAMPLER_OVER_LIMIT" },
|
||||
- { 0x0000001c, "TEXTURE_OVER_LIMIT" },
|
||||
- { 0x0000001e, "GP_TOO_MANY_OUTPUTS" },
|
||||
- { 0x0000001f, "RT_BPP128_WITH_MS8" },
|
||||
- { 0x00000021, "Z_OUT_OF_BOUNDS" },
|
||||
- { 0x00000023, "XY_OUT_OF_BOUNDS" },
|
||||
- { 0x00000027, "CP_MORE_PARAMS_THAN_SHARED" },
|
||||
- { 0x00000028, "CP_NO_REG_SPACE_STRIPED" },
|
||||
- { 0x00000029, "CP_NO_REG_SPACE_PACKED" },
|
||||
- { 0x0000002a, "CP_NOT_ENOUGH_WARPS" },
|
||||
- { 0x0000002b, "CP_BLOCK_SIZE_MISMATCH" },
|
||||
- { 0x0000002c, "CP_NOT_ENOUGH_LOCAL_WARPS" },
|
||||
- { 0x0000002d, "CP_NOT_ENOUGH_STACK_WARPS" },
|
||||
- { 0x0000002e, "CP_NO_BLOCKDIM_LATCH" },
|
||||
- { 0x00000031, "ENG2D_FORMAT_MISMATCH" },
|
||||
- { 0x0000003f, "PRIMITIVE_ID_NEEDS_GP" },
|
||||
- { 0x00000044, "SEMANTIC_VIEWPORT_OVER_LIMIT" },
|
||||
- { 0x00000045, "SEMANTIC_COLOR_FRONT_OVER_LIMIT" },
|
||||
- { 0x00000046, "LAYER_ID_NEEDS_GP" },
|
||||
- { 0x00000047, "SEMANTIC_CLIP_OVER_LIMIT" },
|
||||
- { 0x00000048, "SEMANTIC_PTSZ_OVER_LIMIT" },
|
||||
+ { 0x00000003, "INVALID_QUERY_OR_TEXTURE", NULL },
|
||||
+ { 0x00000004, "INVALID_VALUE", NULL },
|
||||
+ { 0x00000005, "INVALID_ENUM", NULL },
|
||||
+ { 0x00000008, "INVALID_OBJECT", NULL },
|
||||
+ { 0x00000009, "READ_ONLY_OBJECT", NULL },
|
||||
+ { 0x0000000a, "SUPERVISOR_OBJECT", NULL },
|
||||
+ { 0x0000000b, "INVALID_ADDRESS_ALIGNMENT", NULL },
|
||||
+ { 0x0000000c, "INVALID_BITFIELD", NULL },
|
||||
+ { 0x0000000d, "BEGIN_END_ACTIVE", NULL },
|
||||
+ { 0x0000000e, "SEMANTIC_COLOR_BACK_OVER_LIMIT", NULL },
|
||||
+ { 0x0000000f, "VIEWPORT_ID_NEEDS_GP", NULL },
|
||||
+ { 0x00000010, "RT_DOUBLE_BIND", NULL },
|
||||
+ { 0x00000011, "RT_TYPES_MISMATCH", NULL },
|
||||
+ { 0x00000012, "RT_LINEAR_WITH_ZETA", NULL },
|
||||
+ { 0x00000015, "FP_TOO_FEW_REGS", NULL },
|
||||
+ { 0x00000016, "ZETA_FORMAT_CSAA_MISMATCH", NULL },
|
||||
+ { 0x00000017, "RT_LINEAR_WITH_MSAA", NULL },
|
||||
+ { 0x00000018, "FP_INTERPOLANT_START_OVER_LIMIT", NULL },
|
||||
+ { 0x00000019, "SEMANTIC_LAYER_OVER_LIMIT", NULL },
|
||||
+ { 0x0000001a, "RT_INVALID_ALIGNMENT", NULL },
|
||||
+ { 0x0000001b, "SAMPLER_OVER_LIMIT", NULL },
|
||||
+ { 0x0000001c, "TEXTURE_OVER_LIMIT", NULL },
|
||||
+ { 0x0000001e, "GP_TOO_MANY_OUTPUTS", NULL },
|
||||
+ { 0x0000001f, "RT_BPP128_WITH_MS8", NULL },
|
||||
+ { 0x00000021, "Z_OUT_OF_BOUNDS", NULL },
|
||||
+ { 0x00000023, "XY_OUT_OF_BOUNDS", NULL },
|
||||
+ { 0x00000027, "CP_MORE_PARAMS_THAN_SHARED", NULL },
|
||||
+ { 0x00000028, "CP_NO_REG_SPACE_STRIPED", NULL },
|
||||
+ { 0x00000029, "CP_NO_REG_SPACE_PACKED", NULL },
|
||||
+ { 0x0000002a, "CP_NOT_ENOUGH_WARPS", NULL },
|
||||
+ { 0x0000002b, "CP_BLOCK_SIZE_MISMATCH", NULL },
|
||||
+ { 0x0000002c, "CP_NOT_ENOUGH_LOCAL_WARPS", NULL },
|
||||
+ { 0x0000002d, "CP_NOT_ENOUGH_STACK_WARPS", NULL },
|
||||
+ { 0x0000002e, "CP_NO_BLOCKDIM_LATCH", NULL },
|
||||
+ { 0x00000031, "ENG2D_FORMAT_MISMATCH", NULL },
|
||||
+ { 0x0000003f, "PRIMITIVE_ID_NEEDS_GP", NULL },
|
||||
+ { 0x00000044, "SEMANTIC_VIEWPORT_OVER_LIMIT", NULL },
|
||||
+ { 0x00000045, "SEMANTIC_COLOR_FRONT_OVER_LIMIT", NULL },
|
||||
+ { 0x00000046, "LAYER_ID_NEEDS_GP", NULL },
|
||||
+ { 0x00000047, "SEMANTIC_CLIP_OVER_LIMIT", NULL },
|
||||
+ { 0x00000048, "SEMANTIC_PTSZ_OVER_LIMIT", NULL },
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -678,7 +707,6 @@ nv50_pgraph_tp_trap(struct drm_device *dev, int type, uint32_t ustatus_old,
|
||||
tps++;
|
||||
switch (type) {
|
||||
case 6: /* texture error... unknown for now */
|
||||
- nv50_fb_vm_trap(dev, display, name);
|
||||
if (display) {
|
||||
NV_ERROR(dev, "magic set %d:\n", i);
|
||||
for (r = ustatus_addr + 4; r <= ustatus_addr + 0x10; r += 4)
|
||||
@@ -701,7 +729,6 @@ nv50_pgraph_tp_trap(struct drm_device *dev, int type, uint32_t ustatus_old,
|
||||
uint32_t e1c = nv_rd32(dev, ustatus_addr + 0x14);
|
||||
uint32_t e20 = nv_rd32(dev, ustatus_addr + 0x18);
|
||||
uint32_t e24 = nv_rd32(dev, ustatus_addr + 0x1c);
|
||||
- nv50_fb_vm_trap(dev, display, name);
|
||||
/* 2d engine destination */
|
||||
if (ustatus & 0x00000010) {
|
||||
if (display) {
|
||||
@@ -912,10 +939,10 @@ nv50_pgraph_trap_handler(struct drm_device *dev, u32 display, u64 inst, u32 chid
|
||||
printk("\n");
|
||||
NV_INFO(dev, "PGRAPH - TRAP_CCACHE %08x %08x %08x %08x"
|
||||
" %08x %08x %08x\n",
|
||||
|
|
@ -1264,8 +1787,16 @@ index 37e21d2..c75cff1 100644
|
|||
|
||||
}
|
||||
|
||||
@@ -1044,6 +1071,7 @@ nv50_graph_isr(struct drm_device *dev)
|
||||
NV_INFO(dev, "PGRAPH - ch %d (0x%010llx) subc %d "
|
||||
"class 0x%04x mthd 0x%04x data 0x%08x\n",
|
||||
chid, inst, subc, class, mthd, data);
|
||||
+ nv50_fb_vm_trap(dev, 1);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c
|
||||
index 459ff08..03c1a63 100644
|
||||
index 6144156..1f47c75 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nv50_vm.c
|
||||
@@ -31,7 +31,6 @@ void
|
||||
|
|
@ -1276,6 +1807,17 @@ index 459ff08..03c1a63 100644
|
|||
u64 phys = 0xdeadcafe00000000ULL;
|
||||
u32 coverage = 0;
|
||||
|
||||
diff --git a/drivers/gpu/drm/nouveau/nv84_crypt.c b/drivers/gpu/drm/nouveau/nv84_crypt.c
|
||||
index ec18ae1..fabc7fd 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nv84_crypt.c
|
||||
+++ b/drivers/gpu/drm/nouveau/nv84_crypt.c
|
||||
@@ -136,5 +136,5 @@ nv84_crypt_isr(struct drm_device *dev)
|
||||
nv_wr32(dev, 0x102130, stat);
|
||||
nv_wr32(dev, 0x10200c, 0x10);
|
||||
|
||||
- nv50_fb_vm_trap(dev, show, "PCRYPT");
|
||||
+ nv50_fb_vm_trap(dev, show);
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/nouveau/nvc0_fifo.c b/drivers/gpu/drm/nouveau/nvc0_fifo.c
|
||||
index e6f92c5..e9f8643 100644
|
||||
--- a/drivers/gpu/drm/nouveau/nvc0_fifo.c
|
||||
|
|
|
|||
91
kernel.spec
91
kernel.spec
|
|
@ -6,7 +6,7 @@ Summary: The Linux kernel
|
|||
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
||||
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
||||
# be 0.
|
||||
%global released_kernel 0
|
||||
%global released_kernel 1
|
||||
|
||||
# Save original buildid for later if it's defined
|
||||
%if 0%{?buildid:1}
|
||||
|
|
@ -58,7 +58,7 @@ Summary: The Linux kernel
|
|||
# base_sublevel is the kernel version we're starting with and patching
|
||||
# on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
|
||||
# which yields a base_sublevel of 21.
|
||||
%define base_sublevel 37
|
||||
%define base_sublevel 38
|
||||
|
||||
## If this is a released kernel ##
|
||||
%if 0%{?released_kernel}
|
||||
|
|
@ -83,9 +83,9 @@ Summary: The Linux kernel
|
|||
# The next upstream release sublevel (base_sublevel+1)
|
||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
# The rc snapshot level
|
||||
%define rcrev 6
|
||||
%define rcrev 8
|
||||
# The git snapshot level
|
||||
%define gitrev 6
|
||||
%define gitrev 4
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 2.6.%{upstream_sublevel}
|
||||
%endif
|
||||
|
|
@ -620,12 +620,13 @@ Patch09: linux-2.6-upstream-reverts.patch
|
|||
# Standalone patches
|
||||
Patch20: linux-2.6-hotfixes.patch
|
||||
|
||||
|
||||
Patch29: linux-2.6-utrace-revert-make-ptrace-functions-static.patch
|
||||
Patch30: linux-2.6-tracehook.patch
|
||||
Patch31: linux-2.6-utrace.patch
|
||||
Patch32: linux-2.6-utrace-ptrace.patch
|
||||
|
||||
Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
|
||||
Patch151: sparc64_fix_build_errors_with_gcc460.patch
|
||||
|
||||
Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
|
||||
Patch161: linux-2.6-i386-nx-emulation.patch
|
||||
|
|
@ -646,7 +647,6 @@ Patch390: linux-2.6-defaults-acpi-video.patch
|
|||
Patch391: linux-2.6-acpi-video-dos.patch
|
||||
Patch393: acpi-ec-add-delay-before-write.patch
|
||||
Patch394: linux-2.6-acpi-debug-infinite-loop.patch
|
||||
Patch395: linux-2.6-acpi-fix-implicit-notify.patch
|
||||
|
||||
Patch450: linux-2.6-input-kill-stupid-messages.patch
|
||||
Patch452: linux-2.6.30-no-pcspkr-modalias.patch
|
||||
|
|
@ -676,12 +676,12 @@ Patch1555: fix_xen_guest_on_old_EC2.patch
|
|||
|
||||
# nouveau + drm fixes
|
||||
Patch1810: drm-nouveau-updates.patch
|
||||
Patch1819: drm-intel-big-hammer.patch
|
||||
# intel drm is all merged upstream
|
||||
Patch1824: drm-intel-next.patch
|
||||
# make sure the lvds comes back on lid open
|
||||
Patch1825: drm-intel-make-lvds-work.patch
|
||||
Patch1826: drm-intel-edp-fixes.patch
|
||||
Patch1827: drm-i915-gen4-has-non-power-of-two-strides.patch
|
||||
|
||||
Patch1900: linux-2.6-intel-iommu-igfx.patch
|
||||
|
||||
|
|
@ -818,6 +818,20 @@ Group: Development/System
|
|||
License: GPLv2
|
||||
%description -n perf
|
||||
This package provides the perf tool and the supporting documentation.
|
||||
|
||||
%package -n perf-debuginfo
|
||||
Summary: Debug information for package perf
|
||||
Group: Development/Debug
|
||||
Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
|
||||
AutoReqProv: no
|
||||
%description -n perf-debuginfo
|
||||
This package provides debug information for package perf.
|
||||
|
||||
# Note that this pattern only works right to match the .build-id
|
||||
# symlinks because of the trailing nonmatching alternation and
|
||||
# the leading .*, because of find-debuginfo.sh's buggy handling
|
||||
# of matching the pattern against the symlinks file.
|
||||
%{expand:%%global debuginfo_args %{?debuginfo_args} -p '.*%%{_bindir}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|XXX' -o perf-debuginfo.list}
|
||||
%endif
|
||||
|
||||
|
||||
|
|
@ -1174,6 +1188,7 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
|
|||
ApplyPatch linux-2.6-hotfixes.patch
|
||||
|
||||
# Roland's utrace ptrace replacement.
|
||||
ApplyPatch linux-2.6-utrace-revert-make-ptrace-functions-static.patch
|
||||
ApplyPatch linux-2.6-tracehook.patch
|
||||
ApplyPatch linux-2.6-utrace.patch
|
||||
ApplyPatch linux-2.6-utrace-ptrace.patch
|
||||
|
|
@ -1193,6 +1208,7 @@ ApplyPatch linux-2.6-utrace-ptrace.patch
|
|||
# SPARC64
|
||||
#
|
||||
ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
|
||||
ApplyPatch sparc64_fix_build_errors_with_gcc460.patch
|
||||
|
||||
#
|
||||
# Exec shield
|
||||
|
|
@ -1224,7 +1240,6 @@ ApplyPatch linux-2.6-defaults-acpi-video.patch
|
|||
ApplyPatch linux-2.6-acpi-video-dos.patch
|
||||
ApplyPatch acpi-ec-add-delay-before-write.patch
|
||||
ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch
|
||||
ApplyPatch linux-2.6-acpi-fix-implicit-notify.patch
|
||||
|
||||
# Various low-impact patches to aid debugging.
|
||||
ApplyPatch linux-2.6-debug-sizeof-structs.patch
|
||||
|
|
@ -1303,10 +1318,12 @@ ApplyOptionalPatch drm-nouveau-updates.patch
|
|||
|
||||
# Intel DRM
|
||||
ApplyOptionalPatch drm-intel-next.patch
|
||||
ApplyPatch drm-intel-big-hammer.patch
|
||||
ApplyPatch drm-intel-make-lvds-work.patch
|
||||
ApplyPatch linux-2.6-intel-iommu-igfx.patch
|
||||
ApplyPatch drm-intel-edp-fixes.patch
|
||||
# rhbz#681285 (i965: crash in brw_wm_surface_state.c::prepare_wm_surfaces()
|
||||
# where intelObj->mt == NULL)
|
||||
#ApplyPatch drm-i915-gen4-has-non-power-of-two-strides.patch
|
||||
|
||||
# linux1394 git patches
|
||||
#ApplyPatch linux-2.6-firewire-git-update.patch
|
||||
|
|
@ -1686,7 +1703,7 @@ BuildKernel %make_target %kernel_image smp
|
|||
|
||||
%if %{with_doc}
|
||||
# Make the HTML and man pages.
|
||||
make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
|
||||
make htmldocs mandocs || %{doc_build_fail}
|
||||
|
||||
# sometimes non-world-readable files sneak into the kernel source tree
|
||||
chmod -R a=rX Documentation
|
||||
|
|
@ -1907,6 +1924,11 @@ fi
|
|||
%dir %{_libexecdir}/perf-core
|
||||
%{_libexecdir}/perf-core/*
|
||||
%{_mandir}/man[1-8]/*
|
||||
|
||||
%if %{with_debuginfo}
|
||||
%files -f perf-debuginfo.list -n perf-debuginfo
|
||||
%defattr(-,root,root)
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# This is %%{image_install_path} on an arch where that includes ELF files,
|
||||
|
|
@ -1971,6 +1993,55 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Tue Mar 15 2011 Adam Jackson <ajax@redhat.com>
|
||||
- drm-intel-big-hammer.patch: Drop.
|
||||
|
||||
* Tue Mar 15 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-1
|
||||
- Linux 2.6.38
|
||||
|
||||
* Mon Mar 14 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc8.git4.1
|
||||
- Linux 2.6.38-rc8-git4
|
||||
|
||||
* Thu Mar 10 2011 Chuck Ebbert <cebbert@redhat.com>
|
||||
- Linux 2.6.38-rc8-git3
|
||||
|
||||
* Thu Mar 10 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc8.git2.1
|
||||
- Linux 2.6.38-rc8-git2
|
||||
|
||||
* Wed Mar 09 2011 Chuck Ebbert <cebbert@redhat.com>
|
||||
- Linux 2.6.38-rc8-git1
|
||||
|
||||
* Wed Mar 09 2011 Dennis Gilmore <dennis@ausil.us>
|
||||
- apply sparc64 gcc-4.6.0 buildfix patch
|
||||
|
||||
* Wed Mar 09 2011 Ben Skeggs <bskeggs@redhat.com> 2.6.38-0.rc8.git0.2
|
||||
- nouveau: allow max clients on nv4x (679629), better error reporting
|
||||
|
||||
* Tue Mar 08 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc8.git0.1
|
||||
- Linux 2.6.38-rc8
|
||||
|
||||
* Sat Mar 05 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc7.git4.1
|
||||
- Linux 2.6.38-rc7-git4
|
||||
- Revert upstream commit e3e89cc535223433a619d0969db3fa05cdd946b8
|
||||
for now to fix utrace build.
|
||||
|
||||
* Fri Mar 04 2011 Roland McGrath <roland@redhat.com> - 2.6.38-0.rc7.git2.3
|
||||
- Split out perf-debuginfo subpackage.
|
||||
|
||||
* Fri Mar 04 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc7.git2.2
|
||||
- Disable drm-i915-gen4-has-non-power-of-two-strides.patch for now, breaks
|
||||
my mutter.
|
||||
|
||||
* Fri Mar 04 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc7.git2.1
|
||||
- Linux 2.6.38-rc7-git2
|
||||
- drm-i915-gen4-has-non-power-of-two-strides.patch (#681285)
|
||||
|
||||
* Thu Mar 03 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc7.git1.1
|
||||
- Linux 2.6.38-rc7-git1
|
||||
|
||||
* Tue Mar 01 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc7.git0.1
|
||||
- Linux 2.6.38-rc7
|
||||
|
||||
* Mon Feb 28 2011 Michael Young <m.a.young@durham.ac.uk>
|
||||
- get updated devel/next-2.6.38
|
||||
|
||||
|
|
|
|||
|
|
@ -1,129 +0,0 @@
|
|||
Index: linux-2.6/drivers/acpi/acpica/aclocal.h
|
||||
===================================================================
|
||||
--- linux-2.6.orig/drivers/acpi/acpica/aclocal.h
|
||||
+++ linux-2.6/drivers/acpi/acpica/aclocal.h
|
||||
@@ -416,10 +416,15 @@ struct acpi_gpe_handler_info {
|
||||
u8 originally_enabled; /* True if GPE was originally enabled */
|
||||
};
|
||||
|
||||
+struct acpi_gpe_notify_object {
|
||||
+ struct acpi_namespace_node *node;
|
||||
+ struct acpi_gpe_notify_object *next;
|
||||
+};
|
||||
+
|
||||
union acpi_gpe_dispatch_info {
|
||||
struct acpi_namespace_node *method_node; /* Method node for this GPE level */
|
||||
struct acpi_gpe_handler_info *handler; /* Installed GPE handler */
|
||||
- struct acpi_namespace_node *device_node; /* Parent _PRW device for implicit notify */
|
||||
+ struct acpi_gpe_notify_object device; /* List of _PRW devices for implicit notify */
|
||||
};
|
||||
|
||||
/*
|
||||
Index: linux-2.6/drivers/acpi/acpica/evxfgpe.c
|
||||
===================================================================
|
||||
--- linux-2.6.orig/drivers/acpi/acpica/evxfgpe.c
|
||||
+++ linux-2.6/drivers/acpi/acpica/evxfgpe.c
|
||||
@@ -198,7 +198,9 @@ acpi_setup_gpe_for_wake(acpi_handle wake
|
||||
acpi_status status = AE_BAD_PARAMETER;
|
||||
struct acpi_gpe_event_info *gpe_event_info;
|
||||
struct acpi_namespace_node *device_node;
|
||||
+ struct acpi_gpe_notify_object *notify_object;
|
||||
acpi_cpu_flags flags;
|
||||
+ u8 gpe_dispatch_mask;
|
||||
|
||||
ACPI_FUNCTION_TRACE(acpi_setup_gpe_for_wake);
|
||||
|
||||
@@ -221,27 +223,49 @@ acpi_setup_gpe_for_wake(acpi_handle wake
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
+ if (wake_device == ACPI_ROOT_OBJECT) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* If there is no method or handler for this GPE, then the
|
||||
* wake_device will be notified whenever this GPE fires (aka
|
||||
* "implicit notify") Note: The GPE is assumed to be
|
||||
* level-triggered (for windows compatibility).
|
||||
*/
|
||||
- if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
|
||||
- ACPI_GPE_DISPATCH_NONE) && (wake_device != ACPI_ROOT_OBJECT)) {
|
||||
+ gpe_dispatch_mask = gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK;
|
||||
+ if (gpe_dispatch_mask != ACPI_GPE_DISPATCH_NONE
|
||||
+ && gpe_dispatch_mask != ACPI_GPE_DISPATCH_NOTIFY) {
|
||||
+ goto out;
|
||||
+ }
|
||||
|
||||
- /* Validate wake_device is of type Device */
|
||||
+ /* Validate wake_device is of type Device */
|
||||
|
||||
- device_node = ACPI_CAST_PTR(struct acpi_namespace_node,
|
||||
- wake_device);
|
||||
- if (device_node->type != ACPI_TYPE_DEVICE) {
|
||||
- goto unlock_and_exit;
|
||||
- }
|
||||
+ device_node = ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
|
||||
+ if (device_node->type != ACPI_TYPE_DEVICE) {
|
||||
+ goto unlock_and_exit;
|
||||
+ }
|
||||
+
|
||||
+ if (gpe_dispatch_mask == ACPI_GPE_DISPATCH_NONE) {
|
||||
gpe_event_info->flags = (ACPI_GPE_DISPATCH_NOTIFY |
|
||||
ACPI_GPE_LEVEL_TRIGGERED);
|
||||
- gpe_event_info->dispatch.device_node = device_node;
|
||||
+ gpe_event_info->dispatch.device.node = device_node;
|
||||
+ gpe_event_info->dispatch.device.next = NULL;
|
||||
+ } else {
|
||||
+ /* There are multiple devices to notify implicitly. */
|
||||
+
|
||||
+ notify_object = ACPI_ALLOCATE_ZEROED(sizeof(*notify_object));
|
||||
+ if (!notify_object) {
|
||||
+ status = AE_NO_MEMORY;
|
||||
+ goto unlock_and_exit;
|
||||
+ }
|
||||
+
|
||||
+ notify_object->node = device_node;
|
||||
+ notify_object->next = gpe_event_info->dispatch.device.next;
|
||||
+ gpe_event_info->dispatch.device.next = notify_object;
|
||||
}
|
||||
|
||||
+ out:
|
||||
gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
|
||||
status = AE_OK;
|
||||
|
||||
Index: linux-2.6/drivers/acpi/acpica/evgpe.c
|
||||
===================================================================
|
||||
--- linux-2.6.orig/drivers/acpi/acpica/evgpe.c
|
||||
+++ linux-2.6/drivers/acpi/acpica/evgpe.c
|
||||
@@ -457,6 +457,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
|
||||
acpi_status status;
|
||||
struct acpi_gpe_event_info *local_gpe_event_info;
|
||||
struct acpi_evaluate_info *info;
|
||||
+ struct acpi_gpe_notify_object *notify_object;
|
||||
|
||||
ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);
|
||||
|
||||
@@ -508,10 +509,18 @@ static void ACPI_SYSTEM_XFACE acpi_ev_as
|
||||
* from this thread -- because handlers may in turn run other
|
||||
* control methods.
|
||||
*/
|
||||
- status =
|
||||
- acpi_ev_queue_notify_request(local_gpe_event_info->dispatch.
|
||||
- device_node,
|
||||
- ACPI_NOTIFY_DEVICE_WAKE);
|
||||
+ status = acpi_ev_queue_notify_request(
|
||||
+ local_gpe_event_info->dispatch.device.node,
|
||||
+ ACPI_NOTIFY_DEVICE_WAKE);
|
||||
+
|
||||
+ notify_object = local_gpe_event_info->dispatch.device.next;
|
||||
+ while (ACPI_SUCCESS(status) && notify_object) {
|
||||
+ status = acpi_ev_queue_notify_request(
|
||||
+ notify_object->node,
|
||||
+ ACPI_NOTIFY_DEVICE_WAKE);
|
||||
+ notify_object = notify_object->next;
|
||||
+ }
|
||||
+
|
||||
break;
|
||||
|
||||
case ACPI_GPE_DISPATCH_METHOD:
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
Revert:
|
||||
commit e3e89cc535223433a619d0969db3fa05cdd946b8
|
||||
("Mark ptrace_{traceme,attach,detach} static")
|
||||
|
||||
--- b/include/linux/ptrace.h
|
||||
+++ a/include/linux/ptrace.h
|
||||
@@ -102,8 +102,11 @@
|
||||
|
||||
extern long arch_ptrace(struct task_struct *child, long request,
|
||||
unsigned long addr, unsigned long data);
|
||||
+extern int ptrace_traceme(void);
|
||||
extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
|
||||
extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len);
|
||||
+extern int ptrace_attach(struct task_struct *tsk);
|
||||
+extern int ptrace_detach(struct task_struct *, unsigned int);
|
||||
extern void ptrace_disable(struct task_struct *);
|
||||
extern int ptrace_check_attach(struct task_struct *task, int kill);
|
||||
extern int ptrace_request(struct task_struct *child, long request,
|
||||
--- b/kernel/ptrace.c
|
||||
+++ a/kernel/ptrace.c
|
||||
@@ -163,7 +163,7 @@
|
||||
return !err;
|
||||
}
|
||||
|
||||
+int ptrace_attach(struct task_struct *task)
|
||||
-static int ptrace_attach(struct task_struct *task)
|
||||
{
|
||||
int retval;
|
||||
|
||||
@@ -219,7 +219,7 @@
|
||||
* Performs checks and sets PT_PTRACED.
|
||||
* Should be used by all ptrace implementations for PTRACE_TRACEME.
|
||||
*/
|
||||
+int ptrace_traceme(void)
|
||||
-static int ptrace_traceme(void)
|
||||
{
|
||||
int ret = -EPERM;
|
||||
|
||||
@@ -293,7 +293,7 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
+int ptrace_detach(struct task_struct *child, unsigned int data)
|
||||
-static int ptrace_detach(struct task_struct *child, unsigned int data)
|
||||
{
|
||||
bool dead = false;
|
||||
|
||||
|
|
@ -1,15 +1,19 @@
|
|||
#!/bin/bash
|
||||
|
||||
KORG26="http://ftp.kernel.org/pub/linux/kernel/v2.6"
|
||||
KORG26SNAPS="${KORG26}/snapshots"
|
||||
KORG26TESTING="${KORG26}/testing"
|
||||
|
||||
if [ ! -f /usr/bin/curl ]; then
|
||||
echo yum install curl
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Current kernel bits
|
||||
if [ `grep -c ^patch upstream` -ge 1 ]; then
|
||||
export OLD=`grep ^patch upstream | tail -n1 | sed s/patch-// | sed s/\.bz2//`
|
||||
if [ `grep -c patch-2.6 sources` -ge 1 ]; then
|
||||
export OLD=`grep patch-2.6 sources | awk '{print $2}' | tail -n1 | sed s/patch-// | sed s/\.bz2//`
|
||||
else
|
||||
export OLD=`grep linux-2.6 upstream | tail -n1 | sed s/linux-// | sed s/\.tar\.bz2//`
|
||||
export OLD=`grep linux-2.6 sources | awk '{print $2}' | tail -n1 | sed s/linux-// | sed s/\.tar\.bz2//`
|
||||
fi
|
||||
export OLDBASE=`echo $OLD | sed s/-/\ /g | sed s/2\.6\.// | awk '{ print $1 }'`
|
||||
if [ `echo $OLD | grep -c rc` -ge 1 ]; then
|
||||
|
|
@ -97,58 +101,39 @@ if [ "$NEWRC" -eq 0 -a "$NEWGIT" -eq 0 ]; then
|
|||
perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec
|
||||
perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
|
||||
|
||||
grep -v kernel-2.6.$OLD_TARBALL_BASE .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
|
||||
echo kernel-2.6.$NEWBASE >> .cvsignore
|
||||
grep -v kernel-2.6.$OLD_TARBALL_BASE .gitignore >.gitignore.tmp ; mv .gitignore.tmp .gitignore
|
||||
echo kernel-2.6.$NEWBASE >> .gitignore
|
||||
|
||||
for i in upstream sources .cvsignore
|
||||
for i in sources .gitignore
|
||||
do
|
||||
grep -v linux-2.6.$OLD_TARBALL_BASE.tar.bz2 $i > .$i.tmp; mv .$i.tmp $i
|
||||
grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 $i > .$i.tmp; mv .$i.tmp $i
|
||||
grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 $i > .$i.tmp; mv .$i.tmp $i
|
||||
done
|
||||
|
||||
echo linux-2.6.$NEWBASE.tar.bz2 >> upstream
|
||||
|
||||
rm -f linux-2.6.$OLD_TARBALL_BASE.tar.bz2
|
||||
rm -f linux-2.6.$OLD_TARBALL_BASE.tar.bz2.sign
|
||||
rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2
|
||||
rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
|
||||
rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2
|
||||
rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign
|
||||
|
||||
cvs remove linux-2.6.$OLD_TARBALL_BASE.tar.bz2.sign
|
||||
cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
|
||||
cvs remove patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign
|
||||
curl -O $KORG26/linux-$NEW.tar.bz2
|
||||
fedpkg upload linux-$NEW.tar.bz2
|
||||
|
||||
make download
|
||||
make upload FILES=linux-$NEW.tar.bz2
|
||||
|
||||
cvs add linux-$NEW.tar.bz2.sign
|
||||
|
||||
bumpspecfile.py kernel.spec "- $NEW"
|
||||
make clog
|
||||
echo FIXME! Fix up fedora_cvs_origin
|
||||
make verrel
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$OLDRC" != "$NEWRC" ]; then
|
||||
echo "Different rc. Rebasing from $OLDRC to $NEWRC"
|
||||
perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ $ENV{"NEWRC"}/' kernel.spec
|
||||
perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' .cvsignore
|
||||
perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' upstream
|
||||
perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' .gitignore
|
||||
grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 sources > .sources.tmp; mv .sources.tmp sources
|
||||
grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
|
||||
if [ `grep -c patch-2.6.$NEWBASE-rc$NEWRC.bz2 upstream` -eq 0 ]; then
|
||||
echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> .cvsignore
|
||||
echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> upstream
|
||||
grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 .gitignore >.gitignore.tmp ; mv .gitignore.tmp .gitignore
|
||||
if [ `grep -c patch-2.6.$NEWBASE-rc$NEWRC.bz2 sources` -eq 0 ]; then
|
||||
echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> .gitignore
|
||||
fi
|
||||
rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2
|
||||
rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
|
||||
cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
|
||||
make download
|
||||
make upload FILES=patch-2.6.$NEWBASE-rc$NEWRC.bz2
|
||||
cvs add patch-2.6.$NEWBASE-rc$NEWRC.bz2.sign
|
||||
|
||||
curl -O $KORG26TESTING/patch-2.6.$NEWBASE-rc$NEWRC.bz2
|
||||
fedpkg upload FILES=patch-2.6.$NEWBASE-rc$NEWRC.bz2
|
||||
|
||||
# Another awkward (albeit unlikely) corner case.
|
||||
# Moving from say 26-rc3-git1 to 26-rc4-git1
|
||||
|
|
@ -167,32 +152,27 @@ if [ "$OLDGIT" != "$NEWGIT" ]; then
|
|||
perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ $ENV{"NEWGIT"}/' kernel.spec
|
||||
if [ "$OLDGIT" -ne 0 ]; then
|
||||
if [ "$NEWGIT" -ne 0 ]; then
|
||||
perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' .cvsignore
|
||||
perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' upstream
|
||||
perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' .gitignore
|
||||
fi
|
||||
grep -v patch-$OLD.bz2 sources > .sources.tmp; mv .sources.tmp sources
|
||||
grep -v patch-$OLD.bz2 upstream > .upstream.tmp; mv .upstream.tmp upstream
|
||||
else
|
||||
echo patch-$NEW.bz2 >> .cvsignore
|
||||
echo patch-$NEW.bz2 >> upstream
|
||||
echo patch-$NEW.bz2 >> .gitignore
|
||||
fi
|
||||
|
||||
make download
|
||||
make upload FILES=patch-$NEW.bz2
|
||||
if [ "$NEWGIT" -ne 0 ]; then
|
||||
curl -O $KORG26SNAPS/patch-$NEW.bz2
|
||||
fi
|
||||
fedpkg upload patch-$NEW.bz2
|
||||
|
||||
cvs add patch-$NEW.bz2.sign
|
||||
if [ "$OLDGIT" -ne 0 ]; then
|
||||
rm -f patch-$OLD.bz2
|
||||
rm -f patch-$OLD.bz2.sign
|
||||
cvs remove patch-$OLD.bz2.sign
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$OLDRC" != "$NEWRC" -o "$OLDGIT" != "$NEWGIT" ]; then
|
||||
perl -p -i -e 's|^ApplyPatch\ git-linus.diff|#ApplyPatch\ git-linus.diff|' kernel.spec
|
||||
> git-linus.diff
|
||||
bumpspecfile.py kernel.spec "- $NEW"
|
||||
make clog
|
||||
fedpkg clog
|
||||
exit 1
|
||||
else
|
||||
exit 0
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,3 +1 @@
|
|||
c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2
|
||||
7f88891e35d060b8f1f436cf05125c36 patch-2.6.38-rc6.bz2
|
||||
417c362da85e0b7221b9f624aa569a71 patch-2.6.38-rc6-git6.bz2
|
||||
7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,305 @@
|
|||
From dbb988cf34a62e69c8863f212be212c6841004ba Mon Sep 17 00:00:00 2001
|
||||
From: David S. Miller <davem@davemloft.net>
|
||||
Date: Sat, 26 Feb 2011 23:40:02 -0800
|
||||
Subject: [PATCH] sparc64: Fix build errors with gcc-4.6.0
|
||||
|
||||
Most of the warnings emitted (we fail arch/sparc file
|
||||
builds with -Werror) were legitimate but harmless, however
|
||||
one case (n2_pcr_write) was a genuine bug.
|
||||
|
||||
Based almost entirely upon a patch by Sam Ravnborg.
|
||||
|
||||
Reported-by: Dennis Gilmore <dennis@ausil.us>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
arch/sparc/kernel/iommu.c | 3 ---
|
||||
arch/sparc/kernel/ldc.c | 28 ++++++++++++++++++----------
|
||||
arch/sparc/kernel/pci.c | 1 +
|
||||
arch/sparc/kernel/pci_common.c | 11 +++++++----
|
||||
arch/sparc/kernel/pci_fire.c | 2 --
|
||||
arch/sparc/kernel/pci_schizo.c | 4 +---
|
||||
arch/sparc/kernel/pci_sun4v.c | 3 +--
|
||||
arch/sparc/kernel/pcr.c | 2 +-
|
||||
arch/sparc/kernel/ptrace_64.c | 3 ++-
|
||||
arch/sparc/kernel/smp_64.c | 11 ++++-------
|
||||
arch/sparc/kernel/traps_64.c | 3 +--
|
||||
11 files changed, 36 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
|
||||
index 72509d0..6f01e8c 100644
|
||||
--- a/arch/sparc/kernel/iommu.c
|
||||
+++ b/arch/sparc/kernel/iommu.c
|
||||
@@ -333,13 +333,10 @@ static void dma_4u_free_coherent(struct device *dev, size_t size,
|
||||
void *cpu, dma_addr_t dvma)
|
||||
{
|
||||
struct iommu *iommu;
|
||||
- iopte_t *iopte;
|
||||
unsigned long flags, order, npages;
|
||||
|
||||
npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;
|
||||
iommu = dev->archdata.iommu;
|
||||
- iopte = iommu->page_table +
|
||||
- ((dvma - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
|
||||
|
||||
spin_lock_irqsave(&iommu->lock, flags);
|
||||
|
||||
diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
|
||||
index df39a0f..732b0bc 100644
|
||||
--- a/arch/sparc/kernel/ldc.c
|
||||
+++ b/arch/sparc/kernel/ldc.c
|
||||
@@ -790,16 +790,20 @@ static void send_events(struct ldc_channel *lp, unsigned int event_mask)
|
||||
static irqreturn_t ldc_rx(int irq, void *dev_id)
|
||||
{
|
||||
struct ldc_channel *lp = dev_id;
|
||||
- unsigned long orig_state, hv_err, flags;
|
||||
+ unsigned long orig_state, flags;
|
||||
unsigned int event_mask;
|
||||
|
||||
spin_lock_irqsave(&lp->lock, flags);
|
||||
|
||||
orig_state = lp->chan_state;
|
||||
- hv_err = sun4v_ldc_rx_get_state(lp->id,
|
||||
- &lp->rx_head,
|
||||
- &lp->rx_tail,
|
||||
- &lp->chan_state);
|
||||
+
|
||||
+ /* We should probably check for hypervisor errors here and
|
||||
+ * reset the LDC channel if we get one.
|
||||
+ */
|
||||
+ sun4v_ldc_rx_get_state(lp->id,
|
||||
+ &lp->rx_head,
|
||||
+ &lp->rx_tail,
|
||||
+ &lp->chan_state);
|
||||
|
||||
ldcdbg(RX, "RX state[0x%02lx:0x%02lx] head[0x%04lx] tail[0x%04lx]\n",
|
||||
orig_state, lp->chan_state, lp->rx_head, lp->rx_tail);
|
||||
@@ -904,16 +908,20 @@ out:
|
||||
static irqreturn_t ldc_tx(int irq, void *dev_id)
|
||||
{
|
||||
struct ldc_channel *lp = dev_id;
|
||||
- unsigned long flags, hv_err, orig_state;
|
||||
+ unsigned long flags, orig_state;
|
||||
unsigned int event_mask = 0;
|
||||
|
||||
spin_lock_irqsave(&lp->lock, flags);
|
||||
|
||||
orig_state = lp->chan_state;
|
||||
- hv_err = sun4v_ldc_tx_get_state(lp->id,
|
||||
- &lp->tx_head,
|
||||
- &lp->tx_tail,
|
||||
- &lp->chan_state);
|
||||
+
|
||||
+ /* We should probably check for hypervisor errors here and
|
||||
+ * reset the LDC channel if we get one.
|
||||
+ */
|
||||
+ sun4v_ldc_tx_get_state(lp->id,
|
||||
+ &lp->tx_head,
|
||||
+ &lp->tx_tail,
|
||||
+ &lp->chan_state);
|
||||
|
||||
ldcdbg(TX, " TX state[0x%02lx:0x%02lx] head[0x%04lx] tail[0x%04lx]\n",
|
||||
orig_state, lp->chan_state, lp->tx_head, lp->tx_tail);
|
||||
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
|
||||
index 4137579..f255382 100644
|
||||
--- a/arch/sparc/kernel/pci.c
|
||||
+++ b/arch/sparc/kernel/pci.c
|
||||
@@ -675,6 +675,7 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)
|
||||
* humanoid.
|
||||
*/
|
||||
err = sysfs_create_file(&dev->dev.kobj, &dev_attr_obppath.attr);
|
||||
+ (void) err;
|
||||
}
|
||||
list_for_each_entry(child_bus, &bus->children, node)
|
||||
pci_bus_register_of_sysfs(child_bus);
|
||||
diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
|
||||
index 6c7a33a..6e3874b 100644
|
||||
--- a/arch/sparc/kernel/pci_common.c
|
||||
+++ b/arch/sparc/kernel/pci_common.c
|
||||
@@ -295,14 +295,17 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
|
||||
unsigned int bus = bus_dev->number;
|
||||
unsigned int device = PCI_SLOT(devfn);
|
||||
unsigned int func = PCI_FUNC(devfn);
|
||||
- unsigned long ret;
|
||||
|
||||
if (config_out_of_range(pbm, bus, devfn, where)) {
|
||||
/* Do nothing. */
|
||||
} else {
|
||||
- ret = pci_sun4v_config_put(devhandle,
|
||||
- HV_PCI_DEVICE_BUILD(bus, device, func),
|
||||
- where, size, value);
|
||||
+ /* We don't check for hypervisor errors here, but perhaps
|
||||
+ * we should and influence our return value depending upon
|
||||
+ * what kind of error is thrown.
|
||||
+ */
|
||||
+ pci_sun4v_config_put(devhandle,
|
||||
+ HV_PCI_DEVICE_BUILD(bus, device, func),
|
||||
+ where, size, value);
|
||||
}
|
||||
return PCIBIOS_SUCCESSFUL;
|
||||
}
|
||||
diff --git a/arch/sparc/kernel/pci_fire.c b/arch/sparc/kernel/pci_fire.c
|
||||
index efb896d..75dfeb6 100644
|
||||
--- a/arch/sparc/kernel/pci_fire.c
|
||||
+++ b/arch/sparc/kernel/pci_fire.c
|
||||
@@ -214,11 +214,9 @@ static int pci_fire_msi_setup(struct pci_pbm_info *pbm, unsigned long msiqid,
|
||||
|
||||
static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi)
|
||||
{
|
||||
- unsigned long msiqid;
|
||||
u64 val;
|
||||
|
||||
val = upa_readq(pbm->pbm_regs + MSI_MAP(msi));
|
||||
- msiqid = (val & MSI_MAP_EQNUM);
|
||||
|
||||
val &= ~MSI_MAP_VALID;
|
||||
|
||||
diff --git a/arch/sparc/kernel/pci_schizo.c b/arch/sparc/kernel/pci_schizo.c
|
||||
index 445a47a..4620eb7 100644
|
||||
--- a/arch/sparc/kernel/pci_schizo.c
|
||||
+++ b/arch/sparc/kernel/pci_schizo.c
|
||||
@@ -1313,7 +1313,7 @@ static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm,
|
||||
const struct linux_prom64_registers *regs;
|
||||
struct device_node *dp = op->dev.of_node;
|
||||
const char *chipset_name;
|
||||
- int is_pbm_a, err;
|
||||
+ int err;
|
||||
|
||||
switch (chip_type) {
|
||||
case PBM_CHIP_TYPE_TOMATILLO:
|
||||
@@ -1343,8 +1343,6 @@ static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm,
|
||||
*/
|
||||
regs = of_get_property(dp, "reg", NULL);
|
||||
|
||||
- is_pbm_a = ((regs[0].phys_addr & 0x00700000) == 0x00600000);
|
||||
-
|
||||
pbm->next = pci_pbm_root;
|
||||
pci_pbm_root = pbm;
|
||||
|
||||
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
|
||||
index 743344a..859abfd 100644
|
||||
--- a/arch/sparc/kernel/pci_sun4v.c
|
||||
+++ b/arch/sparc/kernel/pci_sun4v.c
|
||||
@@ -580,7 +580,7 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
|
||||
{
|
||||
static const u32 vdma_default[] = { 0x80000000, 0x80000000 };
|
||||
struct iommu *iommu = pbm->iommu;
|
||||
- unsigned long num_tsb_entries, sz, tsbsize;
|
||||
+ unsigned long num_tsb_entries, sz;
|
||||
u32 dma_mask, dma_offset;
|
||||
const u32 *vdma;
|
||||
|
||||
@@ -596,7 +596,6 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
|
||||
|
||||
dma_mask = (roundup_pow_of_two(vdma[1]) - 1UL);
|
||||
num_tsb_entries = vdma[1] / IO_PAGE_SIZE;
|
||||
- tsbsize = num_tsb_entries * sizeof(iopte_t);
|
||||
|
||||
dma_offset = vdma[0];
|
||||
|
||||
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c
|
||||
index 7c2ced6..8ac23e6 100644
|
||||
--- a/arch/sparc/kernel/pcr.c
|
||||
+++ b/arch/sparc/kernel/pcr.c
|
||||
@@ -81,7 +81,7 @@ static void n2_pcr_write(u64 val)
|
||||
unsigned long ret;
|
||||
|
||||
ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
|
||||
- if (val != HV_EOK)
|
||||
+ if (ret != HV_EOK)
|
||||
write_pcr(val);
|
||||
}
|
||||
|
||||
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
|
||||
index 9ccc812..96ee50a 100644
|
||||
--- a/arch/sparc/kernel/ptrace_64.c
|
||||
+++ b/arch/sparc/kernel/ptrace_64.c
|
||||
@@ -1086,6 +1086,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
|
||||
|
||||
asmlinkage void syscall_trace_leave(struct pt_regs *regs)
|
||||
{
|
||||
+#ifdef CONFIG_AUDITSYSCALL
|
||||
if (unlikely(current->audit_context)) {
|
||||
unsigned long tstate = regs->tstate;
|
||||
int result = AUDITSC_SUCCESS;
|
||||
@@ -1095,7 +1096,7 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
|
||||
|
||||
audit_syscall_exit(result, regs->u_regs[UREG_I0]);
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
|
||||
trace_sys_exit(regs, regs->u_regs[UREG_G1]);
|
||||
|
||||
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
|
||||
index 555a76d..3e94a8c 100644
|
||||
--- a/arch/sparc/kernel/smp_64.c
|
||||
+++ b/arch/sparc/kernel/smp_64.c
|
||||
@@ -189,7 +189,7 @@ static inline long get_delta (long *rt, long *master)
|
||||
void smp_synchronize_tick_client(void)
|
||||
{
|
||||
long i, delta, adj, adjust_latency = 0, done = 0;
|
||||
- unsigned long flags, rt, master_time_stamp, bound;
|
||||
+ unsigned long flags, rt, master_time_stamp;
|
||||
#if DEBUG_TICK_SYNC
|
||||
struct {
|
||||
long rt; /* roundtrip time */
|
||||
@@ -208,10 +208,8 @@ void smp_synchronize_tick_client(void)
|
||||
{
|
||||
for (i = 0; i < NUM_ROUNDS; i++) {
|
||||
delta = get_delta(&rt, &master_time_stamp);
|
||||
- if (delta == 0) {
|
||||
+ if (delta == 0)
|
||||
done = 1; /* let's lock on to this... */
|
||||
- bound = rt;
|
||||
- }
|
||||
|
||||
if (!done) {
|
||||
if (i > 0) {
|
||||
@@ -933,13 +931,12 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
|
||||
void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
|
||||
{
|
||||
void *pg_addr;
|
||||
- int this_cpu;
|
||||
u64 data0;
|
||||
|
||||
if (tlb_type == hypervisor)
|
||||
return;
|
||||
|
||||
- this_cpu = get_cpu();
|
||||
+ preempt_disable();
|
||||
|
||||
#ifdef CONFIG_DEBUG_DCFLUSH
|
||||
atomic_inc(&dcpage_flushes);
|
||||
@@ -964,7 +961,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
|
||||
}
|
||||
__local_flush_dcache_page(page);
|
||||
|
||||
- put_cpu();
|
||||
+ preempt_enable();
|
||||
}
|
||||
|
||||
void __irq_entry smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
|
||||
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
|
||||
index 42ad2ba..9456472 100644
|
||||
--- a/arch/sparc/kernel/traps_64.c
|
||||
+++ b/arch/sparc/kernel/traps_64.c
|
||||
@@ -2152,7 +2152,7 @@ static void user_instruction_dump(unsigned int __user *pc)
|
||||
|
||||
void show_stack(struct task_struct *tsk, unsigned long *_ksp)
|
||||
{
|
||||
- unsigned long fp, thread_base, ksp;
|
||||
+ unsigned long fp, ksp;
|
||||
struct thread_info *tp;
|
||||
int count = 0;
|
||||
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
||||
@@ -2173,7 +2173,6 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
|
||||
flushw_all();
|
||||
|
||||
fp = ksp + STACK_BIAS;
|
||||
- thread_base = (unsigned long) tp;
|
||||
|
||||
printk("Call Trace:\n");
|
||||
do {
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
Loading…
Reference in New Issue