xf86-video-intel: Branch 'modesetting' - 3 commits - src/i830_driver.c

[Keith Packard]

 src/i830_driver.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 182d2f503a7a1be90d93a4a15059585a564fd3ce (from parents)
Merge: 677c454469a6223460778033758e384e989cea47 6777d8044d5cc063698e05afb7a93a58a7a3b64a
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Wed Dec 6 17:18:58 2006 -0800

    Merge branch 'modesetting-origin' into modesetting

diff --cc src/i830_driver.c
index e04a44c,2f515ed..915107f
@@@ -707,8 -729,46 +729,46 @@@
     } else {
        i830_dvo_init(pScrn);
     }
 -   if (IS_I915GM(pI830) || IS_I945GM(pI830))
 +   if (IS_I9XX(pI830) && !IS_I915G(pI830))
        i830_tv_init(pScrn);
+    
+    for (o = 0; o < config->num_output; o++)
+    {
+       xf86OutputPtr	   output = config->output[o];
+       I830OutputPrivatePtr intel_output = output->driver_private;
+       int		   crtc_mask = 0, clone_mask = 0;
+       
+       /*
+        * Valid crtcs
+        */
+       switch (intel_output->type) {
+       case I830_OUTPUT_DVO:
+       case I830_OUTPUT_SDVO:
+ 	 crtc_mask = ((1 << 0)|
+ 		      (1 << 1));
+ 	 clone_mask = ((1 << I830_OUTPUT_ANALOG) |
+ 		       (1 << I830_OUTPUT_DVO) |
+ 		       (1 << I830_OUTPUT_SDVO));
+ 	 break;
+       case I830_OUTPUT_ANALOG:
+ 	 crtc_mask = ((1 << 0));
+ 	 clone_mask = ((1 << I830_OUTPUT_ANALOG) |
+ 		       (1 << I830_OUTPUT_DVO) |
+ 		       (1 << I830_OUTPUT_SDVO));
+ 	 break;
+       case I830_OUTPUT_LVDS:
+ 	 crtc_mask = (1 << 1);
+ 	 clone_mask = (1 << I830_OUTPUT_LVDS);
+ 	 break;
+       case I830_OUTPUT_TVOUT:
+ 	 crtc_mask = ((1 << 0) |
+ 		      (1 << 1));
+ 	 clone_mask = (1 << I830_OUTPUT_TVOUT);
+ 	 break;
+       }
+       output->possible_crtcs = crtc_mask;
+       output->possible_clones = i830_output_clones (pScrn, clone_mask);
+    }
  }
  
  /**
diff-tree 677c454469a6223460778033758e384e989cea47 (from parents)
Merge: 16f9a56070a01c7ada8e566d9b73fcf7900136e0 8fcf9a81179ee8577ddab5e904c58fbfd14cf59c
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Sat Dec 2 23:28:38 2006 -0800

    Merge branch 'modesetting-origin' into modesetting

diff-tree 16f9a56070a01c7ada8e566d9b73fcf7900136e0 (from e603cd0c73344ef137d3276b5cfcbcf4df340778)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Fri Dec 1 10:50:27 2006 -0800

    TV output exists on all 9xx chips except for 915G

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 3aafe3a..e04a44c 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -707,7 +707,7 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
    } else {
       i830_dvo_init(pScrn);
    }
-   if (IS_I915GM(pI830) || IS_I945GM(pI830))
+   if (IS_I9XX(pI830) && !IS_I915G(pI830))
       i830_tv_init(pScrn);
 }