rpms/kernel/devel drm-fix-pll-computation-precedence.patch, NONE, 1.1 kernel.spec, 1.955, 1.956
Kristian Høgsberg
krh at fedoraproject.org
Thu Sep 18 19:01:51 UTC 2008
- Previous message: rpms/koffice/devel koffice-1.6.3-gcc43.patch, 1.2, 1.3 koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff, 1.2, 1.3 koffice-xpdf-CVE-2007-3387.diff, 1.2, 1.3 .cvsignore, 1.19, 1.20 koffice.spec, 1.76, 1.77 sources, 1.19, 1.20
- Next message: rpms/libacpi/F-9 libacpi-0.2-sysfs.patch, NONE, 1.1 libacpi-0.2.patch, NONE, 1.1 libacpi.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: krh
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23416
Modified Files:
kernel.spec
Added Files:
drm-fix-pll-computation-precedence.patch
Log Message:
* Thu Sep 18 2008 Kristian Høgsberg <krh at redhat.com>
- Fix precedence in PLL value computation.
drm-fix-pll-computation-precedence.patch:
--- NEW FILE drm-fix-pll-computation-precedence.patch ---
commit ced5841f9f1858d83551714717d905a6a1ea28c1
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 14:53:46 2008 -0400
radeon kms: Get precedence right when computing PLL values.
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 4d98cba..a1631fe 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -326,11 +326,11 @@ void radeon_atombios_get_tmds_info(struct radeon_encoder *encoder)
for (i = 0; i < 4; i++) {
encoder->tmds_pll[i].freq = le16_to_cpu(tmds_info->asMiscInfo[i].usFrequency);
encoder->tmds_pll[i].value = tmds_info->asMiscInfo[i].ucPLL_ChargePump & 0x3f;
- encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f << 6);
- encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf << 12);
- encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf << 16);
+ encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VCO_Gain & 0x3f) << 6;
+ encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_DutyCycle & 0xf) << 12;
+ encoder->tmds_pll[i].value |= (tmds_info->asMiscInfo[i].ucPLL_VoltageSwing & 0xf) << 16;
- DRM_DEBUG("TMDS PLL From BIOS %u %x\n",
+ DRM_DEBUG("TMDS PLL From ATOMBIOS %u %x\n",
encoder->tmds_pll[i].freq,
encoder->tmds_pll[i].value);
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 3219b99..c5332fd 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -744,6 +744,9 @@ bool radeon_combios_get_tmds_info(struct radeon_encoder *encoder)
for (i = 0; i < n; i++) {
encoder->tmds_pll[i].value = radeon_bios32(dev_priv, tmds_info + i * 10 + 0x08);
encoder->tmds_pll[i].freq = radeon_bios16(dev_priv, tmds_info + i * 10 + 0x10);
+ DRM_DEBUG("TMDS PLL From COMBIOS %u %x\n",
+ encoder->tmds_pll[i].freq,
+ encoder->tmds_pll[i].value);
}
return true;
} else if (ver == 4) {
@@ -758,6 +761,9 @@ bool radeon_combios_get_tmds_info(struct radeon_encoder *encoder)
stride += 10;
else
stride += 6;
+ DRM_DEBUG("TMDS PLL From COMBIOS %u %x\n",
+ encoder->tmds_pll[i].freq,
+ encoder->tmds_pll[i].value);
}
return true;
}
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.955
retrieving revision 1.956
diff -u -r1.955 -r1.956
--- kernel.spec 18 Sep 2008 00:36:25 -0000 1.955
+++ kernel.spec 18 Sep 2008 19:01:21 -0000 1.956
@@ -609,6 +609,7 @@
Patch1811: drm-modesetting-radeon.patch
Patch1812: drm-modesetting-i915.patch
Patch1813: drm-nouveau.patch
+Patch1814: drm-fix-pll-computation-precedence.patch
# kludge to make ich9 e1000 work
Patch2000: linux-2.6-e1000-ich9.patch
@@ -1167,6 +1168,7 @@
ApplyPatch drm-modesetting-radeon.patch
ApplyPatch drm-modesetting-i915.patch
ApplyPatch drm-nouveau.patch
+ApplyPatch drm-fix-pll-computation-precedence.patch
# linux1394 git patches
ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1758,6 +1760,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Thu Sep 18 2008 Kristian Høgsberg <krh at redhat.com>
+- Fix precedence in PLL value computation.
+
* Thu Sep 18 2008 Dave Airlie <airlied at redhat.com>
- update radeon LVDS bits from AMD
- Previous message: rpms/koffice/devel koffice-1.6.3-gcc43.patch, 1.2, 1.3 koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff, 1.2, 1.3 koffice-xpdf-CVE-2007-3387.diff, 1.2, 1.3 .cvsignore, 1.19, 1.20 koffice.spec, 1.76, 1.77 sources, 1.19, 1.20
- Next message: rpms/libacpi/F-9 libacpi-0.2-sysfs.patch, NONE, 1.1 libacpi-0.2.patch, NONE, 1.1 libacpi.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list