rpms/kernel/F-12 drm-nouveau.patch, 1.57, 1.58 kernel.spec, 1.1821, 1.1822
Ben Skeggs
bskeggs at fedoraproject.org
Mon Sep 21 05:38:43 UTC 2009
- Previous message (by thread): rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.45, 1.46 sources, 1.46, 1.47
- Next message (by thread): rpms/coreutils/devel coreutils-7.6-lzipcolor.patch, NONE, 1.1 coreutils-DIR_COLORS, 1.7, 1.8 coreutils-DIR_COLORS.256color, 1.7, 1.8 coreutils-DIR_COLORS.lightbgcolor, 1.2, 1.3 coreutils.spec, 1.276, 1.277
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bskeggs
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6317
Modified Files:
drm-nouveau.patch kernel.spec
Log Message:
* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: more on rh#522649, added some useful info to debugfs
- lots of coding style cleanups, which is the reason for the huge commit
drm-nouveau.patch:
drivers/gpu/drm/Kconfig | 45
drivers/gpu/drm/Makefile | 2
drivers/gpu/drm/i2c/Makefile | 4
drivers/gpu/drm/i2c/ch7006_drv.c | 531
drivers/gpu/drm/i2c/ch7006_mode.c | 473
drivers/gpu/drm/i2c/ch7006_priv.h | 344
drivers/gpu/drm/nouveau/Makefile | 29
drivers/gpu/drm/nouveau/nouveau_acpi.c | 127
drivers/gpu/drm/nouveau/nouveau_backlight.c | 155
drivers/gpu/drm/nouveau/nouveau_bios.c | 5476 ++++++
drivers/gpu/drm/nouveau/nouveau_bios.h | 235
drivers/gpu/drm/nouveau/nouveau_bo.c | 620
drivers/gpu/drm/nouveau/nouveau_calc.c | 626
drivers/gpu/drm/nouveau/nouveau_channel.c | 540
drivers/gpu/drm/nouveau/nouveau_connector.c | 754
drivers/gpu/drm/nouveau/nouveau_connector.h | 55
drivers/gpu/drm/nouveau/nouveau_crtc.h | 95
drivers/gpu/drm/nouveau/nouveau_debugfs.c | 157
drivers/gpu/drm/nouveau/nouveau_display.c | 115
drivers/gpu/drm/nouveau/nouveau_dma.c | 206
drivers/gpu/drm/nouveau/nouveau_dma.h | 148
drivers/gpu/drm/nouveau/nouveau_drv.c | 437
drivers/gpu/drm/nouveau/nouveau_drv.h | 1262 +
drivers/gpu/drm/nouveau/nouveau_encoder.h | 66
drivers/gpu/drm/nouveau/nouveau_fb.h | 47
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 357
drivers/gpu/drm/nouveau/nouveau_fbcon.h | 48
drivers/gpu/drm/nouveau/nouveau_fence.c | 262
drivers/gpu/drm/nouveau/nouveau_gem.c | 954 +
drivers/gpu/drm/nouveau/nouveau_hw.c | 1078 +
drivers/gpu/drm/nouveau/nouveau_hw.h | 448
drivers/gpu/drm/nouveau/nouveau_i2c.c | 256
drivers/gpu/drm/nouveau/nouveau_i2c.h | 45
drivers/gpu/drm/nouveau/nouveau_ioc32.c | 72
drivers/gpu/drm/nouveau/nouveau_irq.c | 688
drivers/gpu/drm/nouveau/nouveau_mem.c | 572
drivers/gpu/drm/nouveau/nouveau_notifier.c | 194
drivers/gpu/drm/nouveau/nouveau_object.c | 1294 +
drivers/gpu/drm/nouveau/nouveau_reg.h | 833 +
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 318
drivers/gpu/drm/nouveau/nouveau_state.c | 848 +
drivers/gpu/drm/nouveau/nouveau_swmthd.h | 33
drivers/gpu/drm/nouveau/nouveau_ttm.c | 131
drivers/gpu/drm/nouveau/nv04_crtc.c | 1019 +
drivers/gpu/drm/nouveau/nv04_cursor.c | 70
drivers/gpu/drm/nouveau/nv04_dac.c | 529
drivers/gpu/drm/nouveau/nv04_dfp.c | 621
drivers/gpu/drm/nouveau/nv04_display.c | 293
drivers/gpu/drm/nouveau/nv04_fb.c | 21
drivers/gpu/drm/nouveau/nv04_fbcon.c | 295
drivers/gpu/drm/nouveau/nv04_fifo.c | 296
drivers/gpu/drm/nouveau/nv04_graph.c | 585
drivers/gpu/drm/nouveau/nv04_instmem.c | 210
drivers/gpu/drm/nouveau/nv04_mc.c | 20
drivers/gpu/drm/nouveau/nv04_timer.c | 51
drivers/gpu/drm/nouveau/nv04_tv.c | 305
drivers/gpu/drm/nouveau/nv10_fb.c | 24
drivers/gpu/drm/nouveau/nv10_fifo.c | 178
drivers/gpu/drm/nouveau/nv10_graph.c | 950 +
drivers/gpu/drm/nouveau/nv17_tv.c | 688
drivers/gpu/drm/nouveau/nv17_tv.h | 156
drivers/gpu/drm/nouveau/nv17_tv_modes.c | 583
drivers/gpu/drm/nouveau/nv20_graph.c | 789
drivers/gpu/drm/nouveau/nv40_fb.c | 62
drivers/gpu/drm/nouveau/nv40_fifo.c | 224
drivers/gpu/drm/nouveau/nv40_graph.c | 2238 ++
drivers/gpu/drm/nouveau/nv40_mc.c | 38
drivers/gpu/drm/nouveau/nv50_crtc.c | 809 +
drivers/gpu/drm/nouveau/nv50_cursor.c | 151
drivers/gpu/drm/nouveau/nv50_dac.c | 295
drivers/gpu/drm/nouveau/nv50_display.c | 902 +
drivers/gpu/drm/nouveau/nv50_display.h | 46
drivers/gpu/drm/nouveau/nv50_evo.h | 113
drivers/gpu/drm/nouveau/nv50_fbcon.c | 256
drivers/gpu/drm/nouveau/nv50_fifo.c | 479
drivers/gpu/drm/nouveau/nv50_graph.c | 450
drivers/gpu/drm/nouveau/nv50_grctx.h |22284 ++++++++++++++++++++++++++++
drivers/gpu/drm/nouveau/nv50_instmem.c | 508
drivers/gpu/drm/nouveau/nv50_mc.c | 40
drivers/gpu/drm/nouveau/nv50_sor.c | 250
drivers/gpu/drm/nouveau/nvreg.h | 535
drivers/gpu/drm/ttm/ttm_bo.c | 4
include/drm/Kbuild | 1
include/drm/i2c/ch7006.h | 86
include/drm/nouveau_drm.h | 216
85 files changed, 58650 insertions(+)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.57 -r 1.58 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- drm-nouveau.patch 16 Sep 2009 04:41:24 -0000 1.57
+++ drm-nouveau.patch 21 Sep 2009 05:38:42 -0000 1.58
@@ -61,64 +61,6 @@ index 3c8827a..d22e64b 100644
obj-$(CONFIG_DRM_VIA) +=via/
+obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
+obj-y += i2c/
-diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index 6246e3f..436e2fe 100644
---- a/drivers/gpu/drm/drm_bufs.c
-+++ b/drivers/gpu/drm/drm_bufs.c
-@@ -51,38 +51,24 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour
-
- EXPORT_SYMBOL(drm_get_resource_len);
-
--static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-- struct drm_local_map *map)
-+struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-+ struct drm_local_map *map)
- {
- struct drm_map_list *entry;
- list_for_each_entry(entry, &dev->maplist, head) {
-- /*
-- * Because the kernel-userspace ABI is fixed at a 32-bit offset
-- * while PCI resources may live above that, we ignore the map
-- * offset for maps of type _DRM_FRAMEBUFFER or _DRM_REGISTERS.
-- * It is assumed that each driver will have only one resource of
-- * each type.
-- */
- if (!entry->map ||
- map->type != entry->map->type ||
- entry->master != dev->primary->master)
- continue;
-- switch (map->type) {
-- case _DRM_SHM:
-- if (map->flags != _DRM_CONTAINS_LOCK)
-- break;
-- case _DRM_REGISTERS:
-- case _DRM_FRAME_BUFFER:
-- return entry;
-- default: /* Make gcc happy */
-- ;
-- }
-- if (entry->map->offset == map->offset)
-+
-+ if (entry->map->offset == map->offset ||
-+ (map->type == _DRM_SHM && map->flags & _DRM_CONTAINS_LOCK))
- return entry;
- }
-
- return NULL;
- }
-+EXPORT_SYMBOL(drm_find_matching_map);
-
- static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
- unsigned long user_token, int hashed_handle, int shm)
-@@ -357,7 +343,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
- /* We do it here so that dev->struct_mutex protects the increment */
- user_token = (map->type == _DRM_SHM) ? (unsigned long)map->handle :
- map->offset;
-- ret = drm_map_handle(dev, &list->hash, user_token, 0,
-+ ret = drm_map_handle(dev, &list->hash, user_token, 1,
- (map->type == _DRM_SHM));
- if (ret) {
- if (map->type == _DRM_REGISTERS)
diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
new file mode 100644
index 0000000..6d2abaf
@@ -131,10 +73,10 @@ index 0000000..6d2abaf
+obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
new file mode 100644
-index 0000000..0a3f7a0
+index 0000000..9422a74
--- /dev/null
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
-@@ -0,0 +1,532 @@
+@@ -0,0 +1,531 @@
+/*
+ * Copyright (C) 2009 Francisco Jerez.
+ * All Rights Reserved.
@@ -350,12 +292,11 @@ index 0000000..0a3f7a0
+ priv->subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
+
+ drm_connector_property_set_value(connector,
-+ encoder->dev->mode_config.tv_subconnector_property,
-+ priv->subconnector);
++ encoder->dev->mode_config.tv_subconnector_property,
++ priv->subconnector);
+
-+ return priv->subconnector?
-+ connector_status_connected
-+ : connector_status_disconnected;
++ return priv->subconnector ? connector_status_connected :
++ connector_status_disconnected;
+}
+
+static int ch7006_encoder_get_modes(struct drm_encoder *encoder,
@@ -371,7 +312,7 @@ index 0000000..0a3f7a0
+ continue;
+
+ drm_mode_probed_add(connector,
-+ drm_mode_duplicate(encoder->dev, &mode->mode));
++ drm_mode_duplicate(encoder->dev, &mode->mode));
+
+ n++;
+ }
@@ -644,11 +585,11 @@ index 0000000..0a3f7a0
+ drm_i2c_encoder_unregister(&ch7006_driver);
+}
+
-+int ch7006_debug = 0;
++int ch7006_debug;
+module_param_named(debug, ch7006_debug, int, 0600);
+MODULE_PARM_DESC(debug, "Enable debug output.");
+
-+char *ch7006_tv_norm = NULL;
++char *ch7006_tv_norm;
+module_param_named(tv_norm, ch7006_tv_norm, charp, 0600);
+MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
+ "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, PAL-60, NTSC-M, NTSC-J.\n"
@@ -669,7 +610,7 @@ index 0000000..0a3f7a0
+module_exit(ch7006_exit);
diff --git a/drivers/gpu/drm/i2c/ch7006_mode.c b/drivers/gpu/drm/i2c/ch7006_mode.c
new file mode 100644
-index 0000000..7ffe0bd
+index 0000000..87f5445
--- /dev/null
+++ b/drivers/gpu/drm/i2c/ch7006_mode.c
@@ -0,0 +1,473 @@
@@ -971,8 +912,8 @@ index 0000000..7ffe0bd
+ uint8_t *power = &priv->state.regs[CH7006_POWER];
+ int subconnector;
+
-+ subconnector = priv->select_subconnector?
-+ priv->select_subconnector : priv->subconnector;
++ subconnector = priv->select_subconnector ? priv->select_subconnector :
++ priv->subconnector;
+
+ *power = CH7006_POWER_RESET;
+
@@ -1148,10 +1089,10 @@ index 0000000..7ffe0bd
+}
diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/i2c/ch7006_priv.h
new file mode 100644
-index 0000000..576bbea
+index 0000000..b06d3d9
--- /dev/null
+++ b/drivers/gpu/drm/i2c/ch7006_priv.h
-@@ -0,0 +1,340 @@
+@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2009 Francisco Jerez.
+ * All Rights Reserved.
@@ -1252,7 +1193,8 @@ index 0000000..576bbea
+ int last_dpms;
+};
+
-+#define to_ch7006_priv(x) ((struct ch7006_priv *)to_encoder_slave(x)->slave_priv)
++#define to_ch7006_priv(x) \
++ ((struct ch7006_priv *)to_encoder_slave(x)->slave_priv)
+
+extern int ch7006_debug;
+extern char *ch7006_tv_norm;
@@ -1286,22 +1228,25 @@ index 0000000..576bbea
+ dev_printk(KERN_DEBUG, &client->dev, \
+ "%s: " format, __func__, ## __VA_ARGS__); \
+ } while (0)
-+#define ch7006_info(client, format, ...) dev_info(&client->dev, format, __VA_ARGS__)
-+#define ch7006_err(client, format, ...) dev_err(&client->dev, format, __VA_ARGS__)
++#define ch7006_info(client, format, ...) \
++ dev_info(&client->dev, format, __VA_ARGS__)
++#define ch7006_err(client, format, ...) \
++ dev_err(&client->dev, format, __VA_ARGS__)
+
-+#define __mask(src, bitfield) (((2 << (1?bitfield)) - 1) & ~((1 << (0?bitfield)) - 1))
++#define __mask(src, bitfield) \
++ (((2 << (1 ? bitfield)) - 1) & ~((1 << (0 ? bitfield)) - 1))
+#define mask(bitfield) __mask(bitfield)
+
-+#define __bitf(src, bitfield, x) (((x) >> (src) << (0?bitfield)) & \
-+ __mask(src, bitfield))
++#define __bitf(src, bitfield, x) \
++ (((x) >> (src) << (0 ? bitfield)) & __mask(src, bitfield))
+#define bitf(bitfield, x) __bitf(bitfield, x)
+#define bitfs(bitfield, s) __bitf(bitfield, bitfield##_##s)
+#define setbitf(state, reg, bitfield, x) \
+ state->regs[reg] = (state->regs[reg] & ~mask(reg##_##bitfield)) \
+ | bitf(reg##_##bitfield, x)
+
-+#define __unbitf(src, bitfield, x) ((x & __mask(src, bitfield)) \
-+ >> (0?bitfield) << (src))
++#define __unbitf(src, bitfield, x) \
++ ((x & __mask(src, bitfield)) >> (0 ? bitfield) << (src))
+#define unbitf(bitfield, x) __unbitf(bitfield, x)
[...7623 lines suppressed...]
new file mode 100644
-index 0000000..062d085
+index 0000000..225f301
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
-@@ -0,0 +1,499 @@
+@@ -0,0 +1,508 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
+ *
@@ -56970,7 +57527,7 @@ index 0000000..062d085
+
+/*NOTE: - Assumes 0x1700 already covers the correct MiB of PRAMIN
+ */
-+#define BAR0_WI32(g,o,v) do { \
++#define BAR0_WI32(g, o, v) do { \
+ uint32_t offset; \
+ if ((g)->im_backing) { \
+ offset = (g)->im_backing_start; \
@@ -56980,7 +57537,7 @@ index 0000000..062d085
+ } \
+ offset += (o); \
+ nv_wr32(dev, NV_RAMIN + (offset & 0xfffff), (v)); \
-+} while(0)
++} while (0)
+
+int
+nv50_instmem_init(struct drm_device *dev)
@@ -56998,7 +57555,7 @@ index 0000000..062d085
+ dev_priv->engine.instmem.priv = priv;
+
+ /* Save state, will restore at takedown. */
-+ for (i = 0x1700; i <= 0x1710; i+=4)
++ for (i = 0x1700; i <= 0x1710; i += 4)
+ priv->save1700[(i-0x1700)/4] = nv_rd32(dev, i);
+
+ /* Reserve the last MiB of VRAM, we should probably try to avoid
@@ -57066,24 +57623,27 @@ index 0000000..062d085
+ dev_priv->fifos[0] = dev_priv->fifos[127] = chan;
+
+ /* Channel's PRAMIN object + heap */
-+ if ((ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,
-+ NULL, &chan->ramin)))
++ ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,
++ NULL, &chan->ramin);
++ if (ret)
+ return ret;
+
+ if (nouveau_mem_init_heap(&chan->ramin_heap, c_base, c_size - c_base))
+ return -ENOMEM;
+
+ /* RAMFC + zero channel's PRAMIN up to start of VM pagedir */
-+ if ((ret = nouveau_gpuobj_new_fake(dev, c_ramfc, c_offset + c_ramfc,
-+ 0x4000, 0, NULL, &chan->ramfc)))
++ ret = nouveau_gpuobj_new_fake(dev, c_ramfc, c_offset + c_ramfc,
++ 0x4000, 0, NULL, &chan->ramfc);
++ if (ret)
+ return ret;
+
+ for (i = 0; i < c_vmpd; i += 4)
+ BAR0_WI32(chan->ramin->gpuobj, i, 0);
+
+ /* VM page directory */
-+ if ((ret = nouveau_gpuobj_new_fake(dev, c_vmpd, c_offset + c_vmpd,
-+ 0x4000, 0, &chan->vm_pd, NULL)))
++ ret = nouveau_gpuobj_new_fake(dev, c_vmpd, c_offset + c_vmpd,
++ 0x4000, 0, &chan->vm_pd, NULL);
++ if (ret)
+ return ret;
+ for (i = 0; i < 0x4000; i += 8) {
+ BAR0_WI32(chan->vm_pd, i + 0x00, 0x00000000);
@@ -57093,11 +57653,12 @@ index 0000000..062d085
+ /* PRAMIN page table, cheat and map into VM at 0x0000000000.
+ * We map the entire fake channel into the start of the PRAMIN BAR
+ */
-+ if ((ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pt_size, 0x1000,
-+ 0, &priv->pramin_pt)))
++ ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pt_size, 0x1000,
++ 0, &priv->pramin_pt);
++ if (ret)
+ return ret;
+
-+ for (i = 0, v = c_offset; i < pt_size; i+=8, v+=0x1000) {
++ for (i = 0, v = c_offset; i < pt_size; i += 8, v += 0x1000) {
+ if (v < (c_offset + c_size))
+ BAR0_WI32(priv->pramin_pt->gpuobj, i + 0, v | 1);
+ else
@@ -57114,13 +57675,15 @@ index 0000000..062d085
+ NV50_VM_BLOCK/65536*8, 0, 0,
+ &chan->vm_vram_pt[i]);
+ if (ret) {
-+ NV_ERROR(dev, "Error creating VRAM page tables: %d\n", ret);
++ NV_ERROR(dev, "Error creating VRAM page tables: %d\n",
++ ret);
+ dev_priv->vm_vram_pt_nr = i;
+ return ret;
+ }
+ dev_priv->vm_vram_pt[i] = chan->vm_vram_pt[i]->gpuobj;
+
-+ for (v = 0; v < dev_priv->vm_vram_pt[i]->im_pramin->size; v+=4)
++ for (v = 0; v < dev_priv->vm_vram_pt[i]->im_pramin->size;
++ v += 4)
+ BAR0_WI32(dev_priv->vm_vram_pt[i], v, 0);
+
+ BAR0_WI32(chan->vm_pd, 0x10 + (i*8),
@@ -57129,8 +57692,9 @@ index 0000000..062d085
+ }
+
+ /* DMA object for PRAMIN BAR */
-+ if ((ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
-+ &priv->pramin_bar)))
++ ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
++ &priv->pramin_bar);
++ if (ret)
+ return ret;
+ BAR0_WI32(priv->pramin_bar->gpuobj, 0x00, 0x7fc00000);
+ BAR0_WI32(priv->pramin_bar->gpuobj, 0x04, dev_priv->ramin_size - 1);
@@ -57140,8 +57704,9 @@ index 0000000..062d085
+ BAR0_WI32(priv->pramin_bar->gpuobj, 0x14, 0x00000000);
+
+ /* DMA object for FB BAR */
-+ if ((ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
-+ &priv->fb_bar)))
++ ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0, 6*4, 16, 0,
++ &priv->fb_bar);
++ if (ret)
+ return ret;
+ BAR0_WI32(priv->fb_bar->gpuobj, 0x00, 0x7fc00000);
+ BAR0_WI32(priv->fb_bar->gpuobj, 0x04, 0x40000000 +
@@ -57167,9 +57732,10 @@ index 0000000..062d085
+ /* Assume that praying isn't enough, check that we can re-read the
+ * entire fake channel back from the PRAMIN BAR */
+ dev_priv->engine.instmem.prepare_access(dev, false);
-+ for (i = 0; i < c_size; i+=4) {
++ for (i = 0; i < c_size; i += 4) {
+ if (nv_rd32(dev, NV_RAMIN + i) != nv_ri32(dev, i)) {
-+ NV_ERROR(dev, "Error reading back PRAMIN at 0x%08x\n", i);
++ NV_ERROR(dev, "Error reading back PRAMIN at 0x%08x\n",
++ i);
+ dev_priv->engine.instmem.finish_access(dev);
+ return -EINVAL;
+ }
@@ -57206,8 +57772,8 @@ index 0000000..062d085
+ return;
+
+ /* Restore state from before init */
-+ for (i = 0x1700; i <= 0x1710; i+=4)
-+ nv_wr32(dev, i, priv->save1700[(i-0x1700)/4]);
++ for (i = 0x1700; i <= 0x1710; i += 4)
++ nv_wr32(dev, i, priv->save1700[(i - 0x1700) / 4]);
+
+ nouveau_gpuobj_ref_del(dev, &priv->fb_bar);
+ nouveau_gpuobj_ref_del(dev, &priv->pramin_bar);
@@ -57470,7 +58036,7 @@ index 0000000..e0a9c3f
+}
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
new file mode 100644
-index 0000000..45b0ff7
+index 0000000..a2dee96
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -0,0 +1,250 @@
@@ -57526,7 +58092,7 @@ index 0000000..45b0ff7
+ return;
+ }
+ BEGIN_RING(evo, 0, NV50_EVO_SOR(encoder->or, MODE_CTRL), 1);
-+ OUT_RING (evo, 0);
++ OUT_RING(evo, 0);
+}
+
+static void nv50_sor_dpms(struct drm_encoder *drm_encoder, int mode)
@@ -57645,7 +58211,7 @@ index 0000000..45b0ff7
+ return;
+ }
+ BEGIN_RING(evo, 0, NV50_EVO_SOR(encoder->or, MODE_CTRL), 1);
-+ OUT_RING (evo, mode_ctl);
++ OUT_RING(evo, mode_ctl);
+}
+
+static const struct drm_encoder_helper_funcs nv50_sor_helper_funcs = {
@@ -58309,19 +58875,6 @@ index b940fdf..cfa6af4 100644
unifdef-y += savage_drm.h
unifdef-y += via_drm.h
+unifdef-y += nouveau_drm.h
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index eeefb63..1345c39 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -1240,6 +1240,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
- extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv);
-
- /* Buffer management support (drm_bufs.h) */
-+extern struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-+ drm_local_map_t *map);
- extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
- extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
- extern int drm_addmap(struct drm_device *dev, resource_size_t offset,
diff --git a/include/drm/i2c/ch7006.h b/include/drm/i2c/ch7006.h
new file mode 100644
index 0000000..8390b43
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1821
retrieving revision 1.1822
diff -u -p -r1.1821 -r1.1822
--- kernel.spec 18 Sep 2009 15:38:49 -0000 1.1821
+++ kernel.spec 21 Sep 2009 05:38:43 -0000 1.1822
@@ -2070,6 +2070,10 @@ fi
# and build.
%changelog
+* Mon Sep 21 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: more on rh#522649, added some useful info to debugfs
+- lots of coding style cleanups, which is the reason for the huge commit
+
* Fri Sep 18 2009 Dave Jones <davej at redhat.com>
- %ghost the dracut initramfs file.
- Previous message (by thread): rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.45, 1.46 sources, 1.46, 1.47
- Next message (by thread): rpms/coreutils/devel coreutils-7.6-lzipcolor.patch, NONE, 1.1 coreutils-DIR_COLORS, 1.7, 1.8 coreutils-DIR_COLORS.256color, 1.7, 1.8 coreutils-DIR_COLORS.lightbgcolor, 1.2, 1.3 coreutils.spec, 1.276, 1.277
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list