From: Alex Deucher <alexdeucher@gmail.com>
To: airlied@gmail.com, dri-devel@lists.freedesktop.org
Subject: [PATCH 07/25] drm/radeon/kms: DCE5 atom transmitter control updates
Date: Thu, 6 Jan 2011 21:19:17 -0500 [thread overview]
Message-ID: <1294366775-1605-8-git-send-email-alexdeucher@gmail.com> (raw)
In-Reply-To: <1294366775-1605-1-git-send-email-alexdeucher@gmail.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
drivers/gpu/drm/radeon/radeon_encoders.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index c83ad89..76835b0 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -712,7 +712,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
* - 2 DIG encoder blocks.
* DIG1/2 can drive UNIPHY0/1/2 link A or link B
*
- * DCE 4.0
+ * DCE 4.0/5.0
* - 3 DIG transmitter blocks UNIPHY0/1/2 (links A and B).
* Supports up to 6 digital outputs
* - 6 DIG encoder blocks.
@@ -829,6 +829,7 @@ union dig_transmitter_control {
DIG_TRANSMITTER_CONTROL_PS_ALLOCATION v1;
DIG_TRANSMITTER_CONTROL_PARAMETERS_V2 v2;
DIG_TRANSMITTER_CONTROL_PARAMETERS_V3 v3;
+ DIG_TRANSMITTER_CONTROL_PARAMETERS_V4 v4;
};
void
@@ -923,10 +924,18 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
pll_id = radeon_crtc->pll_id;
}
- if (is_dp && rdev->clock.dp_extclk)
- args.v3.acConfig.ucRefClkSource = 2; /* external src */
- else
- args.v3.acConfig.ucRefClkSource = pll_id;
+
+ if (ASIC_IS_DCE5(rdev)) {
+ if (is_dp && rdev->clock.dp_extclk)
+ args.v4.acConfig.ucRefClkSource = 3; /* external src */
+ else
+ args.v4.acConfig.ucRefClkSource = pll_id;
+ } else {
+ if (is_dp && rdev->clock.dp_extclk)
+ args.v3.acConfig.ucRefClkSource = 2; /* external src */
+ else
+ args.v3.acConfig.ucRefClkSource = pll_id;
+ }
switch (radeon_encoder->encoder_id) {
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
--
1.7.1.1
next prev parent reply other threads:[~2011-01-07 2:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-07 2:19 [PATCH 0/25] drm/radeon/kms: Add support for NI (Northern Islands) Alex Deucher
2011-01-07 2:19 ` [PATCH 01/25] drm/radeon/kms: clean up ASIC_IS_DCE41() macro Alex Deucher
2011-01-07 2:19 ` [PATCH 02/25] drm/radeon/kms: add NI chip families Alex Deucher
2011-01-07 2:19 ` [PATCH 03/25] drm/radeon/kms: update display watermark calculations for DCE5 Alex Deucher
2011-01-07 2:19 ` [PATCH 04/25] drm/radeon/kms: DCE5 supports 16k display surfaces Alex Deucher
2011-01-07 2:19 ` [PATCH 05/25] drm/radeon/kms: DCE5 atom SetPixelClock updates Alex Deucher
2011-01-07 2:19 ` [PATCH 06/25] drm/radeon/kms: DCE5 atom spread spectrum updates Alex Deucher
2011-01-07 2:19 ` Alex Deucher [this message]
2011-01-07 2:19 ` [PATCH 08/25] drm/radeon/kms: DCE5 atom dig encoder updates Alex Deucher
2011-01-07 2:19 ` [PATCH 09/25] drm/radeon/kms: dac dpms updates for DCE5 Alex Deucher
2011-01-07 2:19 ` [PATCH 10/25] drm/radeon/kms: dvo " Alex Deucher
2011-01-07 2:19 ` [PATCH 11/25] drm/radeon/kms: parse DCE5 encoder caps when setting up encoders Alex Deucher
2011-01-07 2:19 ` [PATCH 12/25] drm/radeon/kms: handle NI thermal controller Alex Deucher
2011-01-07 2:19 ` [PATCH 13/25] drm/radeon/kms: add disabled vbios accessor for NI asics Alex Deucher
2011-01-07 2:19 ` [PATCH 14/25] drm/radeon/kms: fill gpu init " Alex Deucher
2011-01-07 2:19 ` [PATCH 15/25] drm/radeon/kms: add backend map workaround for barts Alex Deucher
2011-01-07 2:19 ` [PATCH 16/25] drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5 Alex Deucher
2011-01-07 2:19 ` [PATCH 17/25] drm/radeon/kms: always use writeback/events for fences on NI Alex Deucher
2011-01-07 2:19 ` [PATCH 18/25] drm/radeon/kms: add bo blit support for NI Alex Deucher
2011-01-07 2:19 ` [PATCH 19/25] drm/radeon/kms: add ni_reg.h Alex Deucher
2011-01-07 2:19 ` [PATCH 20/25] drm/radeon/kms: add support for DCE5 display LUTs Alex Deucher
2011-01-07 2:19 ` [PATCH 21/25] drm/radeon/kms: add ucode loader for NI Alex Deucher
2011-01-07 2:19 ` [PATCH 22/25] drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init Alex Deucher
2011-01-07 2:19 ` [PATCH 23/25] drm/radeon/kms: add radeon_asic struct for NI asics Alex Deucher
2011-01-07 2:19 ` [PATCH 24/25] drm/radeon/kms: don't enable pcie gen2 on NI yet Alex Deucher
2011-01-07 2:19 ` [PATCH 25/25] drm/radeon/kms: add NI pci ids Alex Deucher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294366775-1605-8-git-send-email-alexdeucher@gmail.com \
--to=alexdeucher@gmail.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).