[haiku-commits] haiku: hrev48278 - src/add-ons/accelerants/radeon_hd
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 11 Nov 2014 05:01:47 +0100 (CET)
hrev48278 adds 1 changeset to branch 'master'
old head: 747c2e925322071d1d0dbbb29c8ac5b1ba9343bc
new head: 3de924d06c8e6c3ff264bd638457bf4f8086b3ac
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=3de924d+%5E747c2e9
----------------------------------------------------------------------------
3de924d: radeon_hd: Implement initial DP encoder service
* Used on older chipsets. Untested.
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48278
Commit: 3de924d06c8e6c3ff264bd638457bf4f8086b3ac
URL: http://cgit.haiku-os.org/haiku/commit/?id=3de924d
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Nov 11 04:01:07 2014 UTC
----------------------------------------------------------------------------
4 files changed, 49 insertions(+), 18 deletions(-)
src/add-ons/accelerants/radeon_hd/connector.cpp | 2 -
.../accelerants/radeon_hd/displayport.cpp | 59 +++++++++++++++-----
src/add-ons/accelerants/radeon_hd/gpu.cpp | 2 +-
src/add-ons/accelerants/radeon_hd/mode.cpp | 4 +-
----------------------------------------------------------------------------
diff --git a/src/add-ons/accelerants/radeon_hd/connector.cpp
b/src/add-ons/accelerants/radeon_hd/connector.cpp
index c3d82f9..2657b82 100644
--- a/src/add-ons/accelerants/radeon_hd/connector.cpp
+++ b/src/add-ons/accelerants/radeon_hd/connector.cpp
@@ -815,8 +815,6 @@ connector_probe()
}
}
- // TODO: aux chan transactions
-
connector->valid = true;
connector->flags = connectorFlags;
connector->type = connectorType;
diff --git a/src/add-ons/accelerants/radeon_hd/displayport.cpp
b/src/add-ons/accelerants/radeon_hd/displayport.cpp
index e3c1673..7b7c42a 100644
--- a/src/add-ons/accelerants/radeon_hd/displayport.cpp
+++ b/src/add-ons/accelerants/radeon_hd/displayport.cpp
@@ -16,6 +16,7 @@
#include "connector.h"
#include "mode.h"
#include "edid.h"
+#include "encoder.h"
#undef TRACE
@@ -662,6 +663,41 @@ dp_get_adjust_train(dp_info* dp)
}
+static uint8
+dp_encoder_service(uint32 connectorIndex, int action, int linkRate,
+ uint8 lane)
+{
+ DP_ENCODER_SERVICE_PARAMETERS args;
+ int index = GetIndexIntoMasterTable(COMMAND, DPEncoderService);
+
+ memset(&args, 0, sizeof(args));
+ args.ucLinkClock = linkRate;
+ args.ucAction = action;
+ args.ucLaneNum = lane;
+ args.ucConfig = 0;
+ args.ucStatus = 0;
+
+ // We really can't do ATOM_DP_ACTION_GET_SINK_TYPE with the
+ // way I designed this below. Not used though.
+
+ // Calculate encoder_id config
+ if (encoder_pick_dig(connectorIndex))
+ args.ucConfig |= ATOM_DP_CONFIG_DIG2_ENCODER;
+ else
+ args.ucConfig |= ATOM_DP_CONFIG_DIG1_ENCODER;
+
+ if (gConnector[connectorIndex]->encoder.linkEnumeration
+ == GRAPH_OBJECT_ENUM_ID2) {
+ args.ucConfig |= ATOM_DP_CONFIG_LINK_B;
+ } else
+ args.ucConfig |= ATOM_DP_CONFIG_LINK_A;
+
+ atom_execute_table(gAtomContext, index, (uint32*)&args);
+
+ return args.ucStatus;
+}
+
+
static void
dp_set_tp(uint32 connectorIndex, int trainingPattern)
{
@@ -675,6 +711,7 @@ dp_set_tp(uint32 connectorIndex, int trainingPattern)
/* set training pattern on the source */
if (info.dceMajor >= 4 || !dp->trainingUseEncoder) {
+ TRACE("%s: Training with encoder...", __func__);
switch (trainingPattern) {
case DP_TRAIN_PATTERN_1:
rawTrainingPattern =
ATOM_ENCODER_CMD_DP_LINK_TRAINING_PATTERN1;
@@ -688,21 +725,17 @@ dp_set_tp(uint32 connectorIndex, int trainingPattern)
}
encoder_dig_setup(connectorIndex, pll->pixelClock,
rawTrainingPattern);
} else {
- ERROR("%s: TODO: dp_encoder_service\n", __func__);
- return;
- #if 0
+ TRACE("%s: Training with encoder service...", __func__);
switch (trainingPattern) {
- case DP_TRAINING_PATTERN_1:
+ case DP_TRAIN_PATTERN_1:
rawTrainingPattern = 0;
break;
- case DP_TRAINING_PATTERN_2:
+ case DP_TRAIN_PATTERN_2:
rawTrainingPattern = 1;
break;
}
- radeon_dp_encoder_service(dp_info->rdev,
- ATOM_DP_ACTION_TRAINING_PATTERN_SEL, dp_info->dp_clock,
- dp_info->enc_id, rawTrainingPattern);
- #endif
+ dp_encoder_service(connectorIndex,
ATOM_DP_ACTION_TRAINING_PATTERN_SEL,
+ dp->linkRate, rawTrainingPattern);
}
// Enable training pattern on the sink
@@ -923,8 +956,8 @@ dp_link_train(uint8 crtcID)
encoder_dig_setup(connectorIndex, mode->timing.pixel_clock,
ATOM_ENCODER_CMD_DP_LINK_TRAINING_START);
} else {
- ERROR("%s: TODO: cannot use AtomBIOS DPEncoderService on
card!\n",
- __func__);
+ dp_encoder_service(connectorIndex,
ATOM_DP_ACTION_TRAINING_START,
+ dp->linkRate, 0);
}
// Disable the training pattern on the sink
@@ -944,8 +977,8 @@ dp_link_train(uint8 crtcID)
encoder_dig_setup(connectorIndex, mode->timing.pixel_clock,
ATOM_ENCODER_CMD_DP_LINK_TRAINING_COMPLETE);
} else {
- ERROR("%s: TODO: cannot use AtomBIOS DPEncoderService on
card!\n",
- __func__);
+ dp_encoder_service(connectorIndex, ATOM_DP_ACTION_TRAINING_COMPLETE,
+ dp->linkRate, 0);
}
return B_OK;
diff --git a/src/add-ons/accelerants/radeon_hd/gpu.cpp
b/src/add-ons/accelerants/radeon_hd/gpu.cpp
index 93f7f49..3cd4e3b 100644
--- a/src/add-ons/accelerants/radeon_hd/gpu.cpp
+++ b/src/add-ons/accelerants/radeon_hd/gpu.cpp
@@ -70,7 +70,7 @@ radeon_gpu_probe()
firmwareInfo->info_21.ulDefaultDispEngineClkFreq);
gInfo->displayClockFrequency *= 10;
if (gInfo->displayClockFrequency == 0) {
- if (info.dceMajor >= 5)
+ if (info.dceMajor == 5)
gInfo->displayClockFrequency = 540000;
else
gInfo->displayClockFrequency = 600000;
diff --git a/src/add-ons/accelerants/radeon_hd/mode.cpp
b/src/add-ons/accelerants/radeon_hd/mode.cpp
index 75c33e9..ec4fb04 100644
--- a/src/add-ons/accelerants/radeon_hd/mode.cpp
+++ b/src/add-ons/accelerants/radeon_hd/mode.cpp
@@ -51,8 +51,8 @@ create_mode_list(void)
gInfo->mode_list_area = create_display_modes("radeon HD modes",
&gDisplay[crtcID]->edidData, NULL, 0, kRadeonHDSpaces,
- sizeof(kRadeonHDSpaces) / sizeof(kRadeonHDSpaces[0]),
- is_mode_supported, &gInfo->mode_list,
&gInfo->shared_info->mode_count);
+ B_COUNT_OF(kRadeonHDSpaces), is_mode_supported,
&gInfo->mode_list,
+ &gInfo->shared_info->mode_count);
if (gInfo->mode_list_area < B_OK)
return gInfo->mode_list_area;
Other related posts:
- » [haiku-commits] haiku: hrev48278 - src/add-ons/accelerants/radeon_hd - kallisti5
