From ced3b516ea3052f78134f3c461226e311cc02b89 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 15 Mar 2012 13:40:07 -0500 Subject: [PATCH] radeon_hd: Remove isHDMI, isTV. Unused. --- .../accelerants/radeon_hd/accelerant.h | 2 -- .../accelerants/radeon_hd/connector.cpp | 23 ------------------- src/add-ons/accelerants/radeon_hd/encoder.cpp | 7 +++++- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/accelerant.h b/src/add-ons/accelerants/radeon_hd/accelerant.h index b3bacb7479..6812da2139 100644 --- a/src/add-ons/accelerants/radeon_hd/accelerant.h +++ b/src/add-ons/accelerants/radeon_hd/accelerant.h @@ -155,8 +155,6 @@ struct encoder_info { uint32 linkEnumeration; // ex. linkb == GRAPH_OBJECT_ENUM_ID2 bool isExternal; bool isDPBridge; - bool isHDMI; - bool isTV; struct pll_info pll; }; diff --git a/src/add-ons/accelerants/radeon_hd/connector.cpp b/src/add-ons/accelerants/radeon_hd/connector.cpp index 57e6b3811d..0473acfe06 100644 --- a/src/add-ons/accelerants/radeon_hd/connector.cpp +++ b/src/add-ons/accelerants/radeon_hd/connector.cpp @@ -701,21 +701,6 @@ connector_probe() connector->type = connectorType; connector->objectID = connectorObjectID; - connector->encoder.isTV = false; - connector->encoder.isHDMI = false; - - switch (connectorType) { - case VIDEO_CONNECTOR_COMPOSITE: - case VIDEO_CONNECTOR_SVIDEO: - case VIDEO_CONNECTOR_9DIN: - connector->encoder.isTV = true; - break; - case VIDEO_CONNECTOR_HDMIA: - case VIDEO_CONNECTOR_HDMIB: - connector->encoder.isHDMI = true; - break; - } - connectorIndex++; } // END for each valid connector } // end for each display path @@ -768,14 +753,6 @@ debug_connectors() attribute = true; ERROR(" * is external\n"); } - if (gConnector[id]->encoder.isHDMI == true) { - attribute = true; - ERROR(" * is HDMI\n"); - } - if (gConnector[id]->encoder.isTV == true) { - attribute = true; - ERROR(" * is TV\n"); - } if (gConnector[id]->encoder.isDPBridge == true) { attribute = true; ERROR(" * is DisplayPort bridge\n"); diff --git a/src/add-ons/accelerants/radeon_hd/encoder.cpp b/src/add-ons/accelerants/radeon_hd/encoder.cpp index 4ec09919cc..69d9c6f735 100644 --- a/src/add-ons/accelerants/radeon_hd/encoder.cpp +++ b/src/add-ons/accelerants/radeon_hd/encoder.cpp @@ -427,7 +427,12 @@ encoder_digital_setup(uint32 connectorIndex, uint32 pixelClock, int command) } uint32 lvdsFlags = gConnector[connectorIndex]->lvdsFlags; - bool isHdmi = gConnector[connectorIndex]->encoder.isHDMI; + + bool isHdmi = false; + if (gConnector[connectorIndex]->type == VIDEO_CONNECTOR_HDMIA + || gConnector[connectorIndex]->type == VIDEO_CONNECTOR_HDMIB) { + isHdmi = true; + } // Prepare AtomBIOS command arguments union lvdsEncoderControl {