Attachment 12558 Details for Bug 12865 – FBC register debug patch

FBC register debug patch

i830-fbc-debug.patch (text/x-diff), 2.88 KB, created by Jesse Barnes on 2007-11-14 13:40:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2007-11-14 13:40:45 UTC

Size: 2.88 KB

patch

obsolete

>diff --git a/src/i830_debug.c b/src/i830_debug.c
>index 0237182..6963c89 100644
>--- a/src/i830_debug.c
>+++ b/src/i830_debug.c
>@@ -36,6 +36,7 @@
> 
> #include "xf86.h"
> #include "i830.h"
>+#include "i830_reg.h"
> #include "i830_debug.h"
> #include <strings.h>
> 
>@@ -403,6 +404,15 @@ static struct i830SnapshotRec {
>     DEFINEREG2(PIPEACONF, i830_debug_pipeconf),
>     DEFINEREG2(PIPEASRC, i830_debug_yxminus1),
> 
>+    DEFINEREG(FBC_CFB_BASE),
>+    DEFINEREG(FBC_LL_BASE),
>+    DEFINEREG(FBC_CONTROL),
>+    DEFINEREG(FBC_COMMAND),
>+    DEFINEREG(FBC_STATUS),
>+    DEFINEREG(FBC_CONTROL2),
>+    DEFINEREG(FBC_FENCE_OFF),
>+    DEFINEREG(FBC_MOD_NUM),
>+
>     DEFINEREG2(FPA0, i830_debug_fp),
>     DEFINEREG2(FPA1, i830_debug_fp),
>     DEFINEREG2(DPLL_A, i830_debug_dpll),
>diff --git a/src/i830_driver.c b/src/i830_driver.c
>index abe6932..9c46c13 100644
>--- a/src/i830_driver.c
>+++ b/src/i830_driver.c
>@@ -902,6 +902,26 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
>    }
> }
> 
>+static void
>+i830_init_clock_gating(ScrnInfoPtr pScrn)
>+{
>+   I830Ptr pI830 = I830PTR(pScrn);
>+
>+   /* Disable clock gating reported to work incorrectly according to the specs.
>+    */
>+   if (IS_I965G(pI830)) {
>+      OUTREG(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |
>+	     I965_RCC_CLOCK_GATE_DISABLE |
>+	     I965_RCPB_CLOCK_GATE_DISABLE |
>+	     I965_ISC_CLOCK_GATE_DISABLE |
>+	     I965_FBC_CLOCK_GATE_DISABLE);
>+   } else if (IS_I855(pI830) || IS_I865G(pI830)) {
>+      OUTREG(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
>+   } else if (IS_I830(pI830)) {
>+      OUTREG(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
>+   }
>+}
>+
> static int
> I830LVDSPresent(ScrnInfoPtr pScrn)
> {
>@@ -1398,6 +1418,8 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
> 
>    i830TakeRegSnapshot(pScrn);
> 
>+   i830_init_clock_gating(pScrn);
>+
> #if 1
>    pI830->saveSWF0 = INREG(SWF0);
>    pI830->saveSWF4 = INREG(SWF4);
>@@ -1829,19 +1851,7 @@ SetHWOperatingState(ScrnInfoPtr pScrn)
> 
>    DPRINTF(PFX, "SetHWOperatingState\n");
> 
>-   /* Disable clock gating reported to work incorrectly according to the specs.
>-    */
>-   if (IS_I965GM(pI830)) {
>-      OUTREG(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
>-   } else if (IS_I965G(pI830)) {
>-      OUTREG(RENCLK_GATE_D1,
>-	     I965_RCC_CLOCK_GATE_DISABLE | I965_ISC_CLOCK_GATE_DISABLE);
>-   } else if (IS_I855(pI830) || IS_I865G(pI830)) {
>-      OUTREG(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
>-   } else if (IS_I830(pI830)) {
>-      OUTREG(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);
>-   }
>-
>+   i830_init_clock_gating(pScrn);
>    i830_start_ring(pScrn);
>    if (!pI830->SWCursor)
>       I830InitHWCursor(pScrn);
>diff --git a/src/i830_reg.h b/src/i830_reg.h
>index df22ed4..4d7736a 100644
>--- a/src/i830_reg.h
>+++ b/src/i830_reg.h
>@@ -56,6 +56,8 @@
> #define   FBC_CTL_PLANEA	(0<<0)
> #define   FBC_CTL_PLANEB	(1<<0)
> #define FBC_FENCE_OFF		0x0321b
>+#define FBC_MOD_NUM		0x03220
>+#define FBC_TAG_DEBUG		0x03300
> 
> #define FBC_LL_SIZE		(1536)
> #define FBC_LL_PAD		(32)

Actions: View

Attachments on bug 12865: 12540 | 12546 | 12552 | 12553 | 12554 | 12555 | 12556 | 12557 | 12558 | 12560 | 16637 | 16644 | 16720 | 16721

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.