[haiku-commits] haiku: hrev43371 - in src/add-ons: accelerants/radeon_hd kernel/drivers/graphics/radeon_hd
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 30 Nov 2011 16:48:44 +0100 (CET)
hrev43371 adds 1 changeset to branch 'master'
old head: c5382e2ca4dc2a9202f8a56894d05f9f47908477
new head: dda3bb3bd87a60bb0eb10c56e90f57a6d6240aa5
----------------------------------------------------------------------------
2 files changed, 11 insertions(+), 5 deletions(-)
src/add-ons/accelerants/radeon_hd/encoder.cpp | 10 ++++++++--
.../kernel/drivers/graphics/radeon_hd/driver.cpp | 6 +++---
############################################################################
Revision: hrev43371
Commit: dda3bb3bd87a60bb0eb10c56e90f57a6d6240aa5
URL: http://cgit.haiku-os.org/haiku/commit/?id=dda3bb3
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Nov 30 15:42:24 2011 UTC
Add some notes and warnings on Nutmeg and Travis based on AMD engineer comments
* give user condolences (for now)
* no real change
----------------------------------------------------------------------------
diff --git a/src/add-ons/accelerants/radeon_hd/encoder.cpp
b/src/add-ons/accelerants/radeon_hd/encoder.cpp
index 4eb33d5..9160d66 100644
--- a/src/add-ons/accelerants/radeon_hd/encoder.cpp
+++ b/src/add-ons/accelerants/radeon_hd/encoder.cpp
@@ -259,6 +259,14 @@ encoder_mode_set(uint8 id, uint32 pixelClock)
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
TRACE("%s: TODO for DVO encoder setup\n", __func__);
break;
+ case ENCODER_OBJECT_ID_TRAVIS: // external DP -> LVDS encoder
+ case ENCODER_OBJECT_ID_NUTMEG: // external DP -> VGA encoder
+ ERROR("%s: Oh, you have a TRAVIS or NUTMEG DP external
encoder..."
+ " what a pitty.\n", __func__);
+ // * PALM can have native LVDS / VGA, or have them
wired via DP
+ // This is an OEM choice on PALM chipsets
+ // * SUMO or SUMO2 *always* have LVDS or VGA connected
through DP
+ // fallthrough
case ENCODER_OBJECT_ID_SI170B:
case ENCODER_OBJECT_ID_CH7303:
case ENCODER_OBJECT_ID_EXTERNAL_SDVOA:
@@ -266,8 +274,6 @@ encoder_mode_set(uint8 id, uint32 pixelClock)
case ENCODER_OBJECT_ID_TITFP513:
case ENCODER_OBJECT_ID_VT1623:
case ENCODER_OBJECT_ID_HDMI_SI1930:
- case ENCODER_OBJECT_ID_TRAVIS:
- case ENCODER_OBJECT_ID_NUTMEG:
if (info.dceMajor >= 4 && info.dceMinor >= 1) {
encoder_external_setup(id, pixelClock,
EXTERNAL_ENCODER_ACTION_V3_ENCODER_SETUP);
diff --git a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
index 51fc596..97c8a18 100644
--- a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
@@ -176,12 +176,12 @@ const struct supported_device {
// Hemlock
{0x689c, 4, 0, RADEON_HEMLOCK, CHIP_STD, "Radeon HD 5900"},
// Fusion APUS
- // Palms
+ // Palm
{0x9804, 4, 1, RADEON_PALM, CHIP_APU, "Radeon HD 6250"},
{0x9805, 4, 1, RADEON_PALM, CHIP_APU, "Radeon HD 6290"},
{0x9802, 4, 1, RADEON_PALM, CHIP_APU, "Radeon HD 6310"},
{0x9803, 4, 1, RADEON_PALM, CHIP_APU, "Radeon HD 6310"},
- // Sumo
+ // Sumo (no VGA / LVDS!, only DP)
{0x9640, 4, 1, RADEON_SUMO, CHIP_APU, "Radeon HD 6550D"},
{0x9641, 4, 1, RADEON_SUMO, CHIP_APU, "Radeon HD SUMO M"},
{0x9647, 4, 1, RADEON_SUMO, CHIP_APU, "Radeon HD 6520G (M)"},
@@ -189,7 +189,7 @@ const struct supported_device {
{0x964a, 4, 1, RADEON_SUMO, CHIP_APU, "Radeon HD 6530D"},
{0x964e, 4, 1, RADEON_SUMO, CHIP_APU, "Radeon HD SUMO M"},
{0x964f, 4, 1, RADEON_SUMO, CHIP_APU, "Radeon HD SUMO M"},
- // Sumo2
+ // Sumo2 (no VGA / LVDS!, only DP)
{0x9642, 4, 1, RADEON_SUMO2, CHIP_APU, "Radeon HD 6370D"},
{0x9643, 4, 1, RADEON_SUMO2, CHIP_APU, "Radeon HD SUMO2 M"},
{0x9644, 4, 1, RADEON_SUMO2, CHIP_APU, "Radeon HD 6410D"},
Other related posts:
- » [haiku-commits] haiku: hrev43371 - in src/add-ons: accelerants/radeon_hd kernel/drivers/graphics/radeon_hd - kallisti5
