xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Tue Mar 11 16:07:46 PDT 2008
src/atombios_crtc.c | 6 ++----
src/radeon_exa_render.c | 6 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit e946c097f0438afbea6f3dd37ee39d67d415708c
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Mar 11 19:07:58 2008 -0400
[PATCH] Fix a few warnings
diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
index d18f2cf..6fbf7ed 100644
--- a/src/atombios_crtc.c
+++ b/src/atombios_crtc.c
@@ -237,7 +237,7 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode)
switch(minor) {
case 1:
case 2:
- spc2_ptr = &spc_param.sPCLKInput;
+ spc2_ptr = (PIXEL_CLOCK_PARAMETERS_V2*)&spc_param.sPCLKInput;
spc2_ptr->usPixelClock = sclock;
spc2_ptr->usRefDiv = ref_div;
spc2_ptr->usFbDiv = fb_div;
@@ -248,8 +248,7 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode)
ptr = &spc_param;
break;
case 3:
- spc3_ptr = &spc_param.sPCLKInput;
-
+ spc3_ptr = (PIXEL_CLOCK_PARAMETERS_V3*)&spc_param.sPCLKInput;
spc3_ptr->usPixelClock = sclock;
spc3_ptr->usRefDiv = ref_div;
spc3_ptr->usFbDiv = fb_div;
@@ -331,7 +330,6 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
unsigned long fb_location = crtc->scrn->fbOffset + info->fbLocation;
- Bool tilingOld = info->tilingEnabled;
int need_tv_timings = 0;
int i, ret;
SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION crtc_timing;
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 4410cf5..72bc38d 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -425,7 +425,7 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
PixmapPtr pDst)
{
RINFO_FROM_SCREEN(pDst->drawable.pScreen);
- CARD32 dst_format, dst_offset, dst_pitch, colorpitch;
+ CARD32 dst_format = 0, dst_offset, dst_pitch, colorpitch;
CARD32 pp_cntl, blendcntl, cblend, ablend;
int pixel_shift;
ACCEL_PREAMBLE();
@@ -707,7 +707,7 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
RINFO_FROM_SCREEN(pDst->drawable.pScreen);
- CARD32 dst_format, dst_offset, dst_pitch;
+ CARD32 dst_format = 0, dst_offset, dst_pitch;
CARD32 pp_cntl, blendcntl, cblend, ablend, colorpitch;
int pixel_shift;
ACCEL_PREAMBLE();
@@ -1030,7 +1030,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
RINFO_FROM_SCREEN(pDst->drawable.pScreen);
- CARD32 dst_format, dst_offset, dst_pitch;
+ CARD32 dst_format = 0, dst_offset, dst_pitch;
CARD32 txenable, colorpitch;
CARD32 blendcntl;
int pixel_shift;
More information about the xorg-commit
mailing list