xf86-video-ati: Branch 'master'
Dave Airlie
airlied at kemper.freedesktop.org
Wed May 23 23:56:13 PDT 2012
src/radeon_bios.c | 20 ++++++++++----------
src/radeon_modes.c | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit a1f47768309aa8b14b13f05ba01bb490024c4cbc
Author: Dave Airlie <airlied at redhat.com>
Date: Thu May 24 07:55:14 2012 +0100
radeon: fix a few more RHDAtomBiosFunc uses
I missed these in my initial search/replace for some reason.
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 5f12534..ffa12df 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -429,35 +429,35 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
if (info->IsAtomBios) {
AtomBiosArgRec atomBiosArg;
- if (RHDAtomBiosFunc(pScrn->scrnIndex, NULL, ATOMBIOS_INIT, &atomBiosArg)
+ if (RHDAtomBiosFunc(pScrn, NULL, ATOMBIOS_INIT, &atomBiosArg)
== ATOM_SUCCESS) {
info->atomBIOS = atomBiosArg.atomhandle;
}
atomBiosArg.fb.start = info->FbFreeStart;
atomBiosArg.fb.size = info->FbFreeSize;
- if (RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS, ATOMBIOS_ALLOCATE_FB_SCRATCH,
+ if (RHDAtomBiosFunc(pScrn, info->atomBIOS, ATOMBIOS_ALLOCATE_FB_SCRATCH,
&atomBiosArg) == ATOM_SUCCESS) {
info->FbFreeStart = atomBiosArg.fb.start;
info->FbFreeSize = atomBiosArg.fb.size;
}
- RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS, GET_DEFAULT_ENGINE_CLOCK,
+ RHDAtomBiosFunc(pScrn, info->atomBIOS, GET_DEFAULT_ENGINE_CLOCK,
&atomBiosArg);
- RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS, GET_DEFAULT_MEMORY_CLOCK,
+ RHDAtomBiosFunc(pScrn, info->atomBIOS, GET_DEFAULT_MEMORY_CLOCK,
&atomBiosArg);
- RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS,
+ RHDAtomBiosFunc(pScrn, info->atomBIOS,
GET_MAX_PIXEL_CLOCK_PLL_OUTPUT, &atomBiosArg);
- RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS,
+ RHDAtomBiosFunc(pScrn, info->atomBIOS,
GET_MIN_PIXEL_CLOCK_PLL_OUTPUT, &atomBiosArg);
- RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS,
+ RHDAtomBiosFunc(pScrn, info->atomBIOS,
GET_MAX_PIXEL_CLOCK_PLL_INPUT, &atomBiosArg);
- RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS,
+ RHDAtomBiosFunc(pScrn, info->atomBIOS,
GET_MIN_PIXEL_CLOCK_PLL_INPUT, &atomBiosArg);
- RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS,
+ RHDAtomBiosFunc(pScrn, info->atomBIOS,
GET_MAX_PIXEL_CLK, &atomBiosArg);
- RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS,
+ RHDAtomBiosFunc(pScrn, info->atomBIOS,
GET_REF_CLOCK, &atomBiosArg);
info->MasterDataStart = RADEON_BIOS16 (info->ROMHeaderStart + 32);
diff --git a/src/radeon_modes.c b/src/radeon_modes.c
index d5635c9..215cde3 100644
--- a/src/radeon_modes.c
+++ b/src/radeon_modes.c
@@ -496,7 +496,7 @@ RADEONProbeOutputModes(xf86OutputPtr output)
else
modes = RADEONTVModes(output);
} else if (radeon_output->active_device & (ATOM_DEVICE_CV_SUPPORT)) {
- atomBiosResult = RHDAtomBiosFunc(pScrn->scrnIndex, info->atomBIOS,
+ atomBiosResult = RHDAtomBiosFunc(pScrn, info->atomBIOS,
ATOMBIOS_GET_CV_MODES, &atomBiosArg);
if (atomBiosResult == ATOM_SUCCESS) {
modes = atomBiosArg.modes;
@@ -514,7 +514,7 @@ RADEONProbeOutputModes(xf86OutputPtr output)
#endif
if (modes == NULL) {
if ((radeon_output->active_device & (ATOM_DEVICE_LCD_SUPPORT)) && info->IsAtomBios) {
- atomBiosResult = RHDAtomBiosFunc(pScrn->scrnIndex,
+ atomBiosResult = RHDAtomBiosFunc(pScrn,
info->atomBIOS,
ATOMBIOS_GET_PANEL_EDID, &atomBiosArg);
if (atomBiosResult == ATOM_SUCCESS) {
More information about the xorg-commit
mailing list