rpms/kernel/F-11 drm-nouveau.patch, 1.32, 1.33 kernel.spec, 1.1512, 1.1513
Ben Skeggs
bskeggs at fedoraproject.org
Sun Apr 5 13:46:59 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26825
Modified Files:
drm-nouveau.patch kernel.spec
Log Message:
* Sun Apr 05 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: big update. mostly cleanups, few functional changes
Big code cleanup (the scary looking, but hopefully harmless part)
Now using "full-featured" VBIOS parser from DDX
Remove custom i2c code in favour of i2c_algo_bit
Refuse to suspend, we can't possibly resume just yet
Fix ramht insertions when a collision happens (rh#492427)
No kms warning on pre-nv50 when kms not acutally enabled (rh#493222)
drm-nouveau.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.32 -r 1.33 drm-nouveau.patch
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- drm-nouveau.patch 31 Mar 2009 06:30:02 -0000 1.32
+++ drm-nouveau.patch 5 Apr 2009 13:46:53 -0000 1.33
@@ -236,7 +236,7 @@
drm_put_minor(&dev->control);
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
new file mode 100644
-index 0000000..12af41b
+index 0000000..06483d0
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -0,0 +1,24 @@
@@ -249,8 +249,8 @@
+ nouveau_object.o nouveau_irq.o nouveau_notifier.o \
+ nouveau_swmthd.o nouveau_sgdma.o nouveau_dma.o \
+ nouveau_bo.o nouveau_fence.o nouveau_gem.o \
-+ nouveau_bios.o nouveau_display.o nouveau_fbcon.o \
-+ nouveau_backlight.o \
++ nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
++ nouveau_display.o nouveau_fbcon.o nouveau_backlight.o \
+ nv04_timer.o \
+ nv04_mc.o nv40_mc.o nv50_mc.o \
+ nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -259,17 +259,17 @@
+ nv40_graph.o nv50_graph.o \
+ nv04_instmem.o nv50_instmem.o \
+ nv50_crtc.o nv50_dac.o nv50_sor.o nv50_connector.o \
-+ nv50_cursor.o nv50_i2c.o nv50_display.o nv50_fbcon.o
++ nv50_cursor.o nv50_display.o nv50_fbcon.o
+
+nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
+
+obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
new file mode 100644
-index 0000000..3fc521e
+index 0000000..e3d354f
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2009 Red Hat <mjg at redhat.com>
+ *
@@ -312,7 +312,6 @@
+static int nv40_get_intensity(struct backlight_device *bd)
+{
+ struct drm_device *dev = bl_get_data(bd);
-+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ int val = (nv_rd32(NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK) >> 16;
+
+ return val;
@@ -321,7 +320,6 @@
+static int nv40_set_intensity(struct backlight_device *bd)
+{
+ struct drm_device *dev = bl_get_data(bd);
-+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ int val = bd->props.brightness;
+ int reg = nv_rd32(NV40_PMC_BACKLIGHT);
+
@@ -340,7 +338,6 @@
+static int nv50_get_intensity(struct backlight_device *bd)
+{
+ struct drm_device *dev = bl_get_data(bd);
-+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+
+ return nv_rd32(NV50_PDISPLAY_BACKLIGHT);
+}
@@ -348,7 +345,6 @@
+static int nv50_set_intensity(struct backlight_device *bd)
+{
+ struct drm_device *dev = bl_get_data(bd);
-+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ int val = bd->props.brightness;
+
+ nv_wr32(NV50_PDISPLAY_BACKLIGHT, val | NV50_PDISPLAY_BACKLIGHT_ENABLE);
@@ -428,45 +424,65 @@
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
new file mode 100644
-index 0000000..ef33b39
+index 0000000..7165a60
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,898 @@
+@@ -0,0 +1,4570 @@
+/*
-+ * Copyright (C) 2005-2006 Erik Waling
-+ * Copyright (C) 2006 Stephane Marchesin
-+ * Copyright (C) 2007-2008 Stuart Bennett
-+ * Copyright (C) 2008 Maarten Maathuis.
-+ * 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, sublicense, 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:
++ * Copyright 2005-2006 Erik Waling
++ * Copyright 2006 Stephane Marchesin
++ * Copyright 2007-2009 Stuart Bennett
+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial
-+ * portions of the Software.
++ * 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, sublicense,
++ * 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 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 NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) 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.
++ * The above copyright notice and this permission notice 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 NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE AUTHORS 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 <asm/byteorder.h>
-+#include "nouveau_bios.h"
++#include "drmP.h"
+#include "nouveau_drv.h"
++#include "nouveau_hw.h"
++
++/* these defines are made up */
++#define NV_CIO_CRE_44_HEADA 0x0
++#define NV_CIO_CRE_44_HEADB 0x3
++#define FEATURE_MOBILE 0x10 /* also FEATURE_QUADRO for BMP */
++#define LEGACY_I2C_CRT 0x80
++
++#define EDID1_LEN 128
++
++#define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip, fmt, ##arg)
++#define LOG_OLD_VALUE(x) //x
++
++#define BIOS_USLEEP(n) msleep((n)/1000)
++
++#define ROM16(x) le16_to_cpu(*(uint16_t *)&(x))
++#define ROM32(x) le32_to_cpu(*(uint32_t *)&(x))
+
-+/* returns true if it mismatches */
-+static bool nv_checksum(const uint8_t *data, unsigned int length)
++static int crtchead = 0;
++
++/* this will need remembering across a suspend */
++static uint32_t saved_nv_pfb_cfg0;
++
++typedef struct {
++ bool execute;
++ bool repeat;
++} init_exec_t;
++
++static bool nv_cksum(const uint8_t *data, unsigned int length)
+{
+ /* there's a few checksums in the BIOS, so here's a generic checking function */
+ int i;
@@ -481,51 +497,67 @@
+ return false;
+}
+
-+static int nv_valid_bios(struct drm_device *dev, uint8_t *data)
++static int
++score_vbios(struct drm_device *dev, const uint8_t *data, const bool writeable)
+{
-+ /* check for BIOS signature */
+ if (!(data[0] == 0x55 && data[1] == 0xAA)) {
-+ DRM_ERROR("BIOS signature not found.\n");
++ NV_TRACEWARN(dev, "... BIOS signature not found\n");
+ return 0;
+ }
+
-+ if (nv_checksum(data, data[2] * 512)) {
-+ DRM_ERROR("BIOS checksum invalid.\n");
-+ return 1;
-+ }
++ if (nv_cksum(data, data[2] * 512)) {
++ NV_TRACEWARN(dev, "... BIOS checksum invalid\n");
++ /* if a ro image is somewhat bad, it's probably all rubbish */
++ return writeable ? 2 : 1;
++ } else
[...20907 lines suppressed...]
++# define NV_CIO_CRE_85 0x85
++# define NV_CIO_CRE_86 0x86
++#define NV_PRMCIO_INP0__COLOR 0x006013da
++
++#define NV_PRAMDAC_CU_START_POS 0x00680300
++# define NV_PRAMDAC_CU_START_POS_X 15:0
++# define NV_PRAMDAC_CU_START_POS_Y 31:16
++#define NV_RAMDAC_NV10_CURSYNC 0x00680404
++
++#define NV_PRAMDAC_NVPLL_COEFF 0x00680500
++#define NV_PRAMDAC_MPLL_COEFF 0x00680504
++#define NV_PRAMDAC_VPLL_COEFF 0x00680508
++# define NV30_RAMDAC_ENABLE_VCO2 (8 << 4)
++
++#define NV_PRAMDAC_PLL_COEFF_SELECT 0x0068050c
++# define NV_RAMDAC_PLL_SELECT_USE_VPLL2_TRUE (4 << 0)
++# define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_MPLL (1 << 8)
++# define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_VPLL (2 << 8)
++# define NV_PRAMDAC_PLL_COEFF_SELECT_SOURCE_PROG_NVPLL (4 << 8)
++# define NV_RAMDAC_PLL_SELECT_PLL_SOURCE_VPLL2 (8 << 8)
++# define NV_PRAMDAC_PLL_COEFF_SELECT_VCLK_RATIO_DB2 (1 << 28)
++# define NV_RAMDAC_PLL_SELECT_VCLK2_RATIO_DB2 (2 << 28)
++
++#define NV_PRAMDAC_PLL_SETUP_CONTROL 0x00680510
++#define NV_RAMDAC_VPLL2 0x00680520
++#define NV_PRAMDAC_SEL_CLK 0x00680524
++#define NV_RAMDAC_DITHER_NV11 0x00680528
++#define NV_PRAMDAC_DACCLK 0x0068052c
++# define NV_PRAMDAC_DACCLK_SEL_DACCLK (1 << 0)
++
++#define NV_RAMDAC_NVPLL_B 0x00680570
++#define NV_RAMDAC_MPLL_B 0x00680574
++#define NV_RAMDAC_VPLL_B 0x00680578
++#define NV_RAMDAC_VPLL2_B 0x0068057c
++# define NV31_RAMDAC_ENABLE_VCO2 (8 << 28)
++#define NV_PRAMDAC_580 0x00680580
++# define NV_RAMDAC_580_VPLL1_ACTIVE (1 << 8)
++# define NV_RAMDAC_580_VPLL2_ACTIVE (1 << 28)
++
++#define NV_PRAMDAC_GENERAL_CONTROL 0x00680600
++#define NV_PRAMDAC_TEST_CONTROL 0x00680608
++# define NV_PRAMDAC_TEST_CONTROL_TP_INS_EN_ASSERTED (1 << 12)
++# define NV_PRAMDAC_TEST_CONTROL_PWRDWN_DAC_OFF (1 << 16)
++# define NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI (1 << 28)
++#define NV_PRAMDAC_TESTPOINT_DATA 0x00680610
++# define NV_PRAMDAC_TESTPOINT_DATA_NOTBLANK (8 << 28)
++#define NV_PRAMDAC_630 0x00680630
++#define NV_PRAMDAC_634 0x00680634
++
++#define NV_PRAMDAC_FP_VDISPLAY_END 0x00680800
++#define NV_PRAMDAC_FP_VTOTAL 0x00680804
++#define NV_PRAMDAC_FP_VCRTC 0x00680808
++#define NV_PRAMDAC_FP_VSYNC_START 0x0068080c
++#define NV_PRAMDAC_FP_VSYNC_END 0x00680810
++#define NV_PRAMDAC_FP_VVALID_START 0x00680814
++#define NV_PRAMDAC_FP_VVALID_END 0x00680818
++#define NV_PRAMDAC_FP_HDISPLAY_END 0x00680820
++#define NV_PRAMDAC_FP_HTOTAL 0x00680824
++#define NV_PRAMDAC_FP_HCRTC 0x00680828
++#define NV_PRAMDAC_FP_HSYNC_START 0x0068082c
++#define NV_PRAMDAC_FP_HSYNC_END 0x00680830
++#define NV_PRAMDAC_FP_HVALID_START 0x00680834
++#define NV_PRAMDAC_FP_HVALID_END 0x00680838
++
++#define NV_RAMDAC_FP_DITHER 0x0068083c
++#define NV_PRAMDAC_FP_TG_CONTROL 0x00680848
++# define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_POS (1 << 0)
++# define NV_PRAMDAC_FP_TG_CONTROL_VSYNC_DISABLE (2 << 0)
++# define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS (1 << 4)
++# define NV_PRAMDAC_FP_TG_CONTROL_HSYNC_DISABLE (2 << 4)
++# define NV_PRAMDAC_FP_TG_CONTROL_MODE_SCALE (0 << 8)
++# define NV_PRAMDAC_FP_TG_CONTROL_MODE_CENTER (1 << 8)
++# define NV_PRAMDAC_FP_TG_CONTROL_MODE_NATIVE (2 << 8)
++# define NV_PRAMDAC_FP_TG_CONTROL_READ_PROG (1 << 20)
++# define NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12 (1 << 24)
++# define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS (1 << 28)
++# define NV_PRAMDAC_FP_TG_CONTROL_DISPEN_DISABLE (2 << 28)
++#define NV_PRAMDAC_850 0x00680850
++#define NV_PRAMDAC_85C 0x0068085c
++#define NV_PRAMDAC_FP_DEBUG_0 0x00680880
++# define NV_PRAMDAC_FP_DEBUG_0_XSCALE_ENABLE (1 << 0)
++# define NV_PRAMDAC_FP_DEBUG_0_YSCALE_ENABLE (1 << 4)
++/* This doesn't seem to be essential for tmds, but still often set */
++# define NV_RAMDAC_FP_DEBUG_0_TMDS_ENABLED (8 << 4)
++# define NV_PRAMDAC_FP_DEBUG_0_XINTERP_BILINEAR (1 << 8)
++# define NV_PRAMDAC_FP_DEBUG_0_YINTERP_BILINEAR (1 << 12)
++# define NV_PRAMDAC_FP_DEBUG_0_XWEIGHT_ROUND (1 << 20)
++# define NV_PRAMDAC_FP_DEBUG_0_YWEIGHT_ROUND (1 << 24)
++#define NV_PRAMDAC_FP_DEBUG_1 0x00680884
++# define NV_PRAMDAC_FP_DEBUG_1_XSCALE_VALUE 11:0
++# define NV_PRAMDAC_FP_DEBUG_1_XSCALE_TESTMODE_ENABLE (1 << 12)
++# define NV_PRAMDAC_FP_DEBUG_1_YSCALE_VALUE 27:16
++# define NV_PRAMDAC_FP_DEBUG_1_YSCALE_TESTMODE_ENABLE (1 << 28)
++#define NV_PRAMDAC_FP_DEBUG_2 0x00680888
++#define NV_PRAMDAC_FP_DEBUG_3 0x0068088C
++
++/* Some unknown regs, purely for NV30 it seems. */
++#define NV_PRAMDAC_890 0x00680890
++#define NV_PRAMDAC_89C 0x0068089C
++
++/* see NV_PRAMDAC_INDIR_TMDS in rules.xml */
++#define NV_PRAMDAC_FP_TMDS_CONTROL 0x006808b0
++# define NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE (1 << 16)
++#define NV_PRAMDAC_FP_TMDS_DATA 0x006808b4
++
++/* Some kind of switch */
++#define NV_PRAMDAC_900 0x00680900
++#define NV_PRAMDAC_A20 0x00680A20
++#define NV_PRAMDAC_A24 0x00680A24
++#define NV_PRAMDAC_A34 0x00680A34
++
++/* names fabricated from NV_USER_DAC info */
++#define NV_PRMDIO_PIXEL_MASK 0x006813c6
++# define NV_PRMDIO_PIXEL_MASK_MASK 0xff
++#define NV_PRMDIO_READ_MODE_ADDRESS 0x006813c7
++#define NV_PRMDIO_WRITE_MODE_ADDRESS 0x006813c8
++#define NV_PRMDIO_PALETTE_DATA 0x006813c9
++
++#define NV_PGRAPH_DEBUG_0 0x00400080
++#define NV_PGRAPH_DEBUG_1 0x00400084
++#define NV_PGRAPH_DEBUG_2_NV04 0x00400088
++#define NV_PGRAPH_DEBUG_2 0x00400620
++#define NV_PGRAPH_DEBUG_3 0x0040008c
++#define NV_PGRAPH_DEBUG_4 0x00400090
++#define NV_PGRAPH_INTR 0x00400100
++#define NV_PGRAPH_INTR_EN 0x00400140
++#define NV_PGRAPH_CTX_CONTROL 0x00400144
++#define NV_PGRAPH_CTX_CONTROL_NV04 0x00400170
++#define NV_PGRAPH_ABS_UCLIP_XMIN 0x0040053C
++#define NV_PGRAPH_ABS_UCLIP_YMIN 0x00400540
++#define NV_PGRAPH_ABS_UCLIP_XMAX 0x00400544
++#define NV_PGRAPH_ABS_UCLIP_YMAX 0x00400548
++#define NV_PGRAPH_BETA_AND 0x00400608
++#define NV_PGRAPH_LIMIT_VIOL_PIX 0x00400610
++#define NV_PGRAPH_BOFFSET0 0x00400640
++#define NV_PGRAPH_BOFFSET1 0x00400644
++#define NV_PGRAPH_BOFFSET2 0x00400648
++#define NV_PGRAPH_BLIMIT0 0x00400684
++#define NV_PGRAPH_BLIMIT1 0x00400688
++#define NV_PGRAPH_BLIMIT2 0x0040068c
++#define NV_PGRAPH_STATUS 0x00400700
++#define NV_PGRAPH_SURFACE 0x00400710
++#define NV_PGRAPH_STATE 0x00400714
++#define NV_PGRAPH_FIFO 0x00400720
++#define NV_PGRAPH_PATTERN_SHAPE 0x00400810
++#define NV_PGRAPH_TILE 0x00400b00
++
++#define NV_PVIDEO_INTR_EN 0x00008140
++#define NV_PVIDEO_BUFFER 0x00008700
++#define NV_PVIDEO_STOP 0x00008704
++#define NV_PVIDEO_UVPLANE_BASE(buff) (0x00008800+(buff)*4)
++#define NV_PVIDEO_UVPLANE_LIMIT(buff) (0x00008808+(buff)*4)
++#define NV_PVIDEO_UVPLANE_OFFSET_BUFF(buff) (0x00008820+(buff)*4)
++#define NV_PVIDEO_BASE(buff) (0x00008900+(buff)*4)
++#define NV_PVIDEO_LIMIT(buff) (0x00008908+(buff)*4)
++#define NV_PVIDEO_LUMINANCE(buff) (0x00008910+(buff)*4)
++#define NV_PVIDEO_CHROMINANCE(buff) (0x00008918+(buff)*4)
++#define NV_PVIDEO_OFFSET_BUFF(buff) (0x00008920+(buff)*4)
++#define NV_PVIDEO_SIZE_IN(buff) (0x00008928+(buff)*4)
++#define NV_PVIDEO_POINT_IN(buff) (0x00008930+(buff)*4)
++#define NV_PVIDEO_DS_DX(buff) (0x00008938+(buff)*4)
++#define NV_PVIDEO_DT_DY(buff) (0x00008940+(buff)*4)
++#define NV_PVIDEO_POINT_OUT(buff) (0x00008948+(buff)*4)
++#define NV_PVIDEO_SIZE_OUT(buff) (0x00008950+(buff)*4)
++#define NV_PVIDEO_FORMAT(buff) (0x00008958+(buff)*4)
++# define NV_PVIDEO_FORMAT_PLANAR (1 << 0)
++# define NV_PVIDEO_FORMAT_COLOR_LE_CR8YB8CB8YA8 (1 << 16)
++# define NV_PVIDEO_FORMAT_DISPLAY_COLOR_KEY (1 << 20)
++# define NV_PVIDEO_FORMAT_MATRIX_ITURBT709 (1 << 24)
++#define NV_PVIDEO_COLOR_KEY 0x00008B00
++
++/* NV04 overlay defines from VIDIX & Haiku */
++#define NV_PVIDEO_INTR_EN_0 0x00680140
++#define NV_PVIDEO_STEP_SIZE 0x00680200
++#define NV_PVIDEO_CONTROL_Y 0x00680204
++#define NV_PVIDEO_CONTROL_X 0x00680208
++#define NV_PVIDEO_BUFF0_START_ADDRESS 0x0068020c
++#define NV_PVIDEO_BUFF0_PITCH_LENGTH 0x00680214
++#define NV_PVIDEO_BUFF0_OFFSET 0x0068021c
++#define NV_PVIDEO_BUFF1_START_ADDRESS 0x00680210
++#define NV_PVIDEO_BUFF1_PITCH_LENGTH 0x00680218
++#define NV_PVIDEO_BUFF1_OFFSET 0x00680220
++#define NV_PVIDEO_OE_STATE 0x00680224
++#define NV_PVIDEO_SU_STATE 0x00680228
++#define NV_PVIDEO_RM_STATE 0x0068022c
++#define NV_PVIDEO_WINDOW_START 0x00680230
++#define NV_PVIDEO_WINDOW_SIZE 0x00680234
++#define NV_PVIDEO_FIFO_THRES_SIZE 0x00680238
++#define NV_PVIDEO_FIFO_BURST_LENGTH 0x0068023c
++#define NV_PVIDEO_KEY 0x00680240
++#define NV_PVIDEO_OVERLAY 0x00680244
++#define NV_PVIDEO_RED_CSC_OFFSET 0x00680280
++#define NV_PVIDEO_GREEN_CSC_OFFSET 0x00680284
++#define NV_PVIDEO_BLUE_CSC_OFFSET 0x00680288
++#define NV_PVIDEO_CSC_ADJUST 0x0068028c
++
++#endif
diff --git a/include/drm/Kbuild b/include/drm/Kbuild
index b940fdf..cfa6af4 100644
--- a/include/drm/Kbuild
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1512
retrieving revision 1.1513
diff -u -r1.1512 -r1.1513
--- kernel.spec 4 Apr 2009 17:35:42 -0000 1.1512
+++ kernel.spec 5 Apr 2009 13:46:56 -0000 1.1513
@@ -1905,6 +1905,15 @@
# and build.
%changelog
+* Sun Apr 05 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: big update. mostly cleanups, few functional changes
+ Big code cleanup (the scary looking, but hopefully harmless part)
+ Now using "full-featured" VBIOS parser from DDX
+ Remove custom i2c code in favour of i2c_algo_bit
+ Refuse to suspend, we can't possibly resume just yet
+ Fix ramht insertions when a collision happens (rh#492427)
+ No kms warning on pre-nv50 when kms not acutally enabled (rh#493222)
+
* Sat Apr 04 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-add-qcserial.patch: Add the qcserial driver for Qualcomm modems
More information about the fedora-extras-commits
mailing list