xf86-video-nv: src/g80_output.c

Aaron Plattner aplattner at kemper.freedesktop.org
Tue Mar 2 13:11:00 PST 2010


 src/g80_output.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 49349f6e47b7315088a80789f134895677f57287
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Mar 2 12:53:54 2010 -0800

    G80: Log unrecognized outputs
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Andy Ritger <aritger at nvidia.com>

diff --git a/src/g80_output.c b/src/g80_output.c
index b2d8b07..887208b 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -106,9 +106,13 @@ static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
         port = (b >> 4) & 0xf;
         or = ffs((b >> 24) & 0xf) - 1;
 
-        if(b & 0x300000)
+        if(b & 0x300000) {
             /* Can't handle this type of output yet */
+            xf86DrvMsg(scrnIndex, X_INFO,
+                       "Ignoring unsupported external output type %d at output "
+                       "%d\n", type, or);
             continue;
+        }
 
         if(type == 0xe) break;
 
@@ -140,7 +144,8 @@ static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
                 pNv->i2cMap[port].dac = or;
                 break;
             case 1: /* TV */
-                /* Ignore TVs */
+                xf86DrvMsg(scrnIndex, X_INFO,
+                           "Ignoring unsupported TV output %d\n", or);
                 break;
 
             case 2: /* TMDS */
@@ -200,7 +205,15 @@ static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
 
                 break;
 
+            case 6: /* DisplayPort */
+                xf86DrvMsg(scrnIndex, X_INFO,
+                           "Ignoring unsupported DisplayPort output %d\n", or);
+                break;
+
             default:
+                xf86DrvMsg(scrnIndex, X_INFO,
+                           "Ignoring unsupported output type %d at port %d\n",
+                           type, or);
                 break;
         }
     }


More information about the xorg-commit mailing list