On or about Tuesday 16 June 2009 at approximately 10:47:13 Rafał Miłecki
composed:
git checkout src/rhd_pm.c
Now what? I did that and I'm in vi looking at:
commit f0f2ae49762f2e9b78486bedf998281130156604
Merge: 0de8b48 8a3fa92
Author: David C. Rankin
Date: Tue Jun 16 01:14:00 2009 -0500
Merge branch 'master' of
git://anongit.freedesktop.org/xorg/driver/xf86-video-radeonhd into
downclocking
Conflicts:
src/rhd_pm.c
diff --cc src/rhd_pm.c
index ff8063e,370760c..ae13a73
--- a/src/rhd_pm.c
+++ b/src/rhd_pm.c
@@@ -105,9 -105,24 +105,30 @@@ RHDPmSetClock(RHDPtr rhdPtr
RHDFUNC(Pm);
++<<<<<<< HEAD:src/rhd_pm.c
++ if (Pm->ForcedEngineClock) {
++ RHDSetEngineClock(rhdPtr, Pm->ForcedEngineClock);
++
++=======
+ /* ATM unconditionally enable power management features
+ * if low power mode requested */
+ if (rhdPtr->atomBIOS) {
+ union AtomBiosArg data;
+
+ data.val = 1;
+ RHDAtomBiosFunc(rhdPtr->scrnIndex, rhdPtr->atomBIOS,
+ ATOM_PM_SETUP, &data);
+ if (rhdPtr->ChipSet < RHD_R600) {
+ data.val = 1;
+ RHDAtomBiosFunc(rhdPtr->scrnIndex, rhdPtr->atomBIOS,
+ ATOM_PM_CLOCKGATING_SETUP, &data);
+ }
+ }
+
if (Pm->ForcedEngineClock) {
RHDSetEngineClock(rhdPtr, Pm->ForcedEngineClock);
++>>>>>>> 8a3fa92b6fdcd86b502973c947e5aed1bd3e1ada:src/rhd_pm.c
/* Induce logging of new engine clock */
RHDGetEngineClock(rhdPtr);
}
@@@ -166,6 -181,20 +187,23 @@@ RHDPmRestore(RHDPtr rhdPtr
/* Induce logging of new memory clock */
RHDGetMemoryClock(rhdPtr);
#endif
++<<<<<<< HEAD:src/rhd_pm.c
++=======
+
What do I need to delete?
--
David C. Rankin, J.D.,P.E.
Rankin Law Firm, PLLC
510 Ochiltree Street
Nacogdoches, Texas 75961
Telephone: (936) 715-9333
Facsimile: (936) 715-9339
www.rankinlawfirm.com
--
To unsubscribe, e-mail: radeonhd+unsubscribe@opensuse.org
For additional commands, e-mail: radeonhd+help@opensuse.org