xserver-xorg-video-ati: Changes to 'upstream-unstable'
COPYING | 133 +++++++++-
configure.ac | 9
man/radeon.man | 2
src/Makefile.am | 5
src/ati_pciids_gen.h | 7
src/atombios_crtc.c | 22 +
src/atombios_output.c | 8
src/drmmode_display.c | 152 ++++++++++-
src/drmmode_display.h | 16 +
src/legacy_crtc.c | 28 +-
src/legacy_output.c | 6
src/pcidb/ati_pciids.csv | 7
src/r600_exa.c | 2
src/r600_shader.c | 2
src/r600_state.h | 6
src/r6xx_accel.c | 383 +++++++++++++---------------
src/radeon.h | 15 -
src/radeon_accel.c | 22 +
src/radeon_accelfuncs.c | 2
src/radeon_atombios.c | 59 ++--
src/radeon_bios.c | 19 -
src/radeon_chipinfo_gen.h | 7
src/radeon_chipset_gen.h | 7
src/radeon_commonfuncs.c | 15 -
src/radeon_crtc.c | 67 +----
src/radeon_cursor.c | 4
src/radeon_dri.c | 135 +++-------
src/radeon_dri.h | 4
src/radeon_dri2.c | 493 +++++++++++++++++++++++++++++++++++--
src/radeon_dri2.h | 6
src/radeon_driver.c | 104 ++++---
src/radeon_exa.c | 51 +++
src/radeon_exa_funcs.c | 2
src/radeon_exa_render.c | 46 +++
src/radeon_kms.c | 72 +++--
src/radeon_output.c | 4
src/radeon_pci_chipset_gen.h | 7
src/radeon_pci_device_match_gen.h | 7
src/radeon_probe.c | 8
src/radeon_probe.h | 9
src/radeon_textured_video.c | 6
src/radeon_textured_videofuncs.c | 504 ++++++++++++++++++++++++++------------
src/radeon_vbo.c | 12
src/radeon_video.c | 42 +--
src/radeon_video.h | 2
src/radeon_vip.c | 2
src/theatre200.c | 8
47 files changed, 1764 insertions(+), 765 deletions(-)
New commits:
commit ad999e633ff41d27eed9d2c6535e163a7181b0bd
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 7 10:49:22 2010 +1000
set version for release
diff --git a/configure.ac b/configure.ac
index cf0a855..3a1c46a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.13.99,
+ 6.13.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
commit 37b348059b1c15d7b381cd3df3db52bd9ee6613e
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Wed Jun 30 12:56:48 2010 -0400
remove rv100 quirk
Some RV100 cards with 2 VGA ports show up with DVI+VGA, however
some boards with DVI+VGA have the same subsystem ids. Better
to have a VGA port show up as DVI than having a non-useable
DVI port.
reported by DHR in irc.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 7d615c0..5810bdb 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -548,15 +548,6 @@ static void RADEONApplyLegacyQuirks(ScrnInfoPtr pScrn, int index)
}
}
- /* Some RV100 cards with 2 VGA ports show up with DVI+VGA */
- if (info->Chipset == PCI_CHIP_RV100_QY &&
- PCI_SUB_VENDOR_ID(info->PciInfo) == 0x1002 &&
- PCI_SUB_DEVICE_ID(info->PciInfo) == 0x013a) {
- if (info->BiosConnector[index].ConnectorType == CONNECTOR_DVI_I) {
- info->BiosConnector[index].ConnectorType = CONNECTOR_VGA;
- }
- }
-
/* X300 card with extra non-existent DVI port */
if (info->Chipset == PCI_CHIP_RV370_5B60 &&
PCI_SUB_VENDOR_ID(info->PciInfo) == 0x17af &&
commit c8ea942bd0e9d1c055d50b94440aa4dae425f20b
Author: Cooper Yuan <cooperyuan@gmail.com>
Date: Tue Jun 29 20:34:57 2010 +0800
Remove HDP_SOFT_RESET function, there is no need to reset HDP block.
This commit can fix an issue reported on DELL server, system gets hang
during soft resetting while another application tries to access PCI
configuration space.
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 92503d9..281bc6d 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -328,10 +328,6 @@ void RADEONEngineReset(ScrnInfoPtr pScrn)
INREG(RADEON_RBBM_SOFT_RESET);
}
- OUTREG(RADEON_HOST_PATH_CNTL, host_path_cntl | RADEON_HDP_SOFT_RESET);
- INREG(RADEON_HOST_PATH_CNTL);
- OUTREG(RADEON_HOST_PATH_CNTL, host_path_cntl);
-
if (!IS_R300_VARIANT && !IS_AVIVO_VARIANT)
OUTREG(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset);
commit 139b38bf67ec10d876cc56df833541d497ae4fa4
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Jun 24 14:55:09 2010 -0400
r6xx shader: use ADDR() for CF_DWORD0
no change in functionality
diff --git a/src/r600_shader.c b/src/r600_shader.c
index e78aa32..7e25f6d 100644
--- a/src/r600_shader.c
+++ b/src/r600_shader.c
@@ -1403,7 +1403,7 @@ int R600_comp_vs(RADEONChipFamily ChipSet, uint32_t* shader)
WHOLE_QUAD_MODE(0),
BARRIER(0));
/* 2 */
- shader[i++] = CF_DWORD0(0);
+ shader[i++] = CF_DWORD0(ADDR(0));
shader[i++] = CF_DWORD1(POP_COUNT(0),
CF_CONST(0),
COND(SQ_CF_COND_ACTIVE),
commit 801e83227a59a29eea425ea612083bbf2b536c30
Author: Wolfram <bugzilla1@malloc.de>
Date: Mon Jun 21 18:59:19 2010 -0400
r6xx/r7xx: fix ums cmd buffer leak
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=27957
diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index c8ef451..0edfe8b 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -1283,6 +1283,8 @@ void r600_vb_no_space(ScrnInfoPtr pScrn, int vert_size)
}
#endif
- r600_finish_op(pScrn, vert_size);
- r600_cp_start(pScrn);
+ if (accel_state->vb_start_op != -1) {
+ r600_finish_op(pScrn, vert_size);
+ r600_cp_start(pScrn);
+ }
}
commit b13d719080b75fc6db4d15d2d323b8fce8b7ad06
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Jun 21 18:49:44 2010 -0400
r6xx/r7xx: fix miscount in state emit
diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index 603b271..c8ef451 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -979,7 +979,7 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
for (i = 0; i < PA_SC_VPORT_SCISSOR_0_TL_num; i++)
set_vport_scissor (pScrn, ib, i, 0, 0, 8192, 8192);
- BEGIN_BATCH(40);
+ BEGIN_BATCH(42);
PACK0(ib, PA_SC_MPASS_PS_CNTL, 2);
E32(ib, 0);
if (info->ChipFamily < CHIP_FAMILY_RV770)
commit c3c5c8e2cc91b51a24effdffb85281216eed731d
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Jun 21 14:30:17 2010 -0400
r6xx/r7xx accel: add back some additional default state
This adds back everything removed in c29157bbf5b0dd26857675282ab094082fbaed0d
except CB_FOG_*, CB_CLEAR_* and the VPORT transforms. Those shouldn't
be needed as we aren't using fog or viewport transforms. We probably don't
need all the state that was added back either but I can't reproduce any
problems here, so it's hard to say which parts are problematic.
Should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=28629
and several corruption reports on #radeon.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index a0073ff..603b271 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -877,14 +877,50 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
sq_setup(pScrn, ib, &sq_conf);
- BEGIN_BATCH(41);
+ BEGIN_BATCH(83);
+ if (info->ChipFamily < CHIP_FAMILY_RV770) {
+ EREG(ib, TA_CNTL_AUX, (( 3 << GRADIENT_CREDIT_shift) |
+ - (28 << TD_FIFO_CREDIT_shift)));
+ EREG(ib, VC_ENHANCE, 0);
+ EREG(ib, R7xx_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0);
+ EREG(ib, DB_DEBUG, 0x82000000); /* ? */
+ EREG(ib, DB_WATERMARKS, ((4 << DEPTH_FREE_shift) |
+ (16 << DEPTH_FLUSH_shift) |
+ (0 << FORCE_SUMMARIZE_shift) |
+ (4 << DEPTH_PENDING_FREE_shift) |
+ (16 << DEPTH_CACHELINE_FREE_shift) |
+ 0));
+ } else {
+ EREG(ib, TA_CNTL_AUX, (( 2 << GRADIENT_CREDIT_shift) |
+ - (28 << TD_FIFO_CREDIT_shift)));
+ EREG(ib, VC_ENHANCE, 0);
+ EREG(ib, R7xx_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, VS_PC_LIMIT_ENABLE_bit);
+ EREG(ib, DB_DEBUG, 0);
+ EREG(ib, DB_WATERMARKS, ((4 << DEPTH_FREE_shift) |
+ (16 << DEPTH_FLUSH_shift) |
+ (0 << FORCE_SUMMARIZE_shift) |
+ (4 << DEPTH_PENDING_FREE_shift) |
+ (4 << DEPTH_CACHELINE_FREE_shift) |
+ 0));
+ }
+
PACK0(ib, SQ_VTX_BASE_VTX_LOC, 2);
E32(ib, 0);
E32(ib, 0);
+ PACK0(ib, SQ_ESGS_RING_ITEMSIZE, 9);
+ E32(ib, 0); // SQ_ESGS_RING_ITEMSIZE
+ E32(ib, 0); // SQ_GSVS_RING_ITEMSIZE
+ E32(ib, 0); // SQ_ESTMP_RING_ITEMSIZE
+ E32(ib, 0); // SQ_GSTMP_RING_ITEMSIZE
+ E32(ib, 0); // SQ_VSTMP_RING_ITEMSIZE
+ E32(ib, 0); // SQ_PSTMP_RING_ITEMSIZE
+ E32(ib, 0); // SQ_FBUF_RING_ITEMSIZE
+ E32(ib, 0); // SQ_REDUC_RING_ITEMSIZE
+ E32(ib, 0); // SQ_GS_VERT_ITEMSIZE
+
// DB
EREG(ib, DB_DEPTH_INFO, 0);
-
EREG(ib, DB_DEPTH_CONTROL, 0);
PACK0(ib, DB_RENDER_CONTROL, 2);
E32(ib, STENCIL_COMPRESS_DISABLE_bit | DEPTH_COMPRESS_DISABLE_bit);
@@ -899,6 +935,15 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
EREG(ib, DB_SHADER_CONTROL, ((1 << Z_ORDER_shift) | /* EARLY_Z_THEN_LATE_Z */
DUAL_EXPORT_ENABLE_bit)); /* Only useful if no depth export */
+ PACK0(ib, DB_STENCIL_CLEAR, 2);
+ E32(ib, 0); // DB_STENCIL_CLEAR
+ E32(ib, 0); // DB_DEPTH_CLEAR
+
+ PACK0(ib, DB_STENCILREFMASK, 3);
+ E32(ib, 0); // DB_STENCILREFMASK
+ E32(ib, 0); // DB_STENCILREFMASK_BF
+ E32(ib, 0); // SX_ALPHA_REF
+
PACK0(ib, CB_CLRCMP_CONTROL, 4);
E32(ib, 1 << CLRCMP_FCN_SEL_shift); // CB_CLRCMP_CONTROL: use CLRCMP_FCN_SRC
E32(ib, 0); // CB_CLRCMP_SRC
@@ -908,6 +953,13 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
EREG(ib, CB_SHADER_MASK, OUTPUT0_ENABLE_mask);
EREG(ib, R7xx_CB_SHADER_CONTROL, (RT0_ENABLE_bit));
+ PACK0(ib, SX_ALPHA_TEST_CONTROL, 5);
+ E32(ib, 0); // SX_ALPHA_TEST_CONTROL
+ E32(ib, 0x00000000); // CB_BLEND_RED
+ E32(ib, 0x00000000); // CB_BLEND_GREEN
+ E32(ib, 0x00000000); // CB_BLEND_BLUE
+ E32(ib, 0x00000000); // CB_BLEND_ALPHA
+
EREG(ib, PA_SC_WINDOW_OFFSET, ((0 << WINDOW_X_OFFSET_shift) |
(0 << WINDOW_Y_OFFSET_shift)));
@@ -936,7 +988,7 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
E32(ib, (FORCE_EOV_CNTDWN_ENABLE_bit | FORCE_EOV_REZ_ENABLE_bit |
0x00500000)); /* ? */
- PACK0(ib, PA_SC_LINE_CNTL, 7);
+ PACK0(ib, PA_SC_LINE_CNTL, 9);
E32(ib, 0); // PA_SC_LINE_CNTL
E32(ib, 0); // PA_SC_AA_CONFIG
E32(ib, ((2 << PA_SU_VTX_CNTL__ROUND_MODE_shift) | PIX_CENTER_bit | // PA_SU_VTX_CNTL
@@ -945,6 +997,8 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
EFLOAT(ib, 1.0); // PA_CL_GB_VERT_DISC_ADJ
EFLOAT(ib, 1.0); // PA_CL_GB_HORZ_CLIP_ADJ
EFLOAT(ib, 1.0); // PA_CL_GB_HORZ_DISC_ADJ
+ E32(ib, 0); // PA_SC_AA_SAMPLE_LOCS_MCTX
+ E32(ib, 0); // PA_SC_AA_SAMPLE_LOCS_8S_WD1_M
EREG(ib, PA_SC_AA_MASK, 0xFFFFFFFF);
@@ -982,7 +1036,7 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
fs_setup(pScrn, ib, &fs_conf, RADEON_GEM_DOMAIN_VRAM);
// VGT
- BEGIN_BATCH(39);
+ BEGIN_BATCH(43);
PACK0(ib, VGT_MAX_VTX_INDX, 4);
E32(ib, 2048); /* XXX set to a reasonably large number of indices */ // VGT_MAX_VTX_INDX
E32(ib, 0); // VGT_MIN_VTX_INDX
@@ -996,7 +1050,11 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
E32(ib, 0); // VGT_INSTANCE_STEP_RATE_0
E32(ib, 0); // VGT_INSTANCE_STEP_RATE_1
- PACK0(ib, VGT_OUTPUT_PATH_CNTL, 13);
+ PACK0(ib, PA_SU_POINT_SIZE, 17);
+ E32(ib, 0); // PA_SU_POINT_SIZE
+ E32(ib, 0); // PA_SU_POINT_MINMAX
+ E32(ib, (8 << PA_SU_LINE_CNTL__WIDTH_shift)); /* Line width 1 pixel */ // PA_SU_LINE_CNTL
+ E32(ib, 0); // PA_SC_LINE_STIPPLE
E32(ib, 0); // VGT_OUTPUT_PATH_CNTL
E32(ib, 0); // VGT_HOS_CNTL
E32(ib, 0); // VGT_HOS_MAX_TESS_LEVEL
commit 800cb2088fec698d0626063a9ab198ff534938c0
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Jun 21 08:15:14 2010 +0200
DRI2: Fix up confusion between windows and pixmaps.
Fixes crashes with xserver master, where looking up a pixmap private on a
window no longer happens to work.
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 0ecdcd4..a0ed085 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -272,26 +272,28 @@ radeon_dri2_copy_region(DrawablePtr drawable,
struct dri2_buffer_priv *dst_private = dest_buffer->driverPrivate;
ScreenPtr pScreen = drawable->pScreen;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- PixmapPtr src_pixmap;
- PixmapPtr dst_pixmap;
+ DrawablePtr src_drawable;
+ DrawablePtr dst_drawable;
RegionPtr copy_clip;
GCPtr gc;
RADEONInfoPtr info = RADEONPTR(pScrn);
Bool vsync;
- src_pixmap = src_private->pixmap;
- dst_pixmap = dst_private->pixmap;
if (src_private->attachment == DRI2BufferFrontLeft) {
- src_pixmap = (PixmapPtr)drawable;
+ src_drawable = drawable;
+ } else {
+ src_drawable = &src_private->pixmap->drawable;
}
if (dst_private->attachment == DRI2BufferFrontLeft) {
- dst_pixmap = (PixmapPtr)drawable;
+ dst_drawable = drawable;
+ } else {
+ dst_drawable = &dst_private->pixmap->drawable;
}
- gc = GetScratchGC(drawable->depth, pScreen);
+ gc = GetScratchGC(dst_drawable->depth, pScreen);
copy_clip = REGION_CREATE(pScreen, NULL, 0);
REGION_COPY(pScreen, copy_clip, region);
(*gc->funcs->ChangeClip) (gc, CT_REGION, copy_clip, 0);
- ValidateGC(&dst_pixmap->drawable, gc);
+ ValidateGC(dst_drawable, gc);
/* If this is a full buffer swap or frontbuffer flush, throttle on the
* previous one
@@ -304,7 +306,7 @@ radeon_dri2_copy_region(DrawablePtr drawable,
extents->x2 == drawable->width &&
extents->y2 == drawable->height) {
struct radeon_exa_pixmap_priv *exa_priv =
- exaGetPixmapDriverPrivate(dst_pixmap);
+ exaGetPixmapDriverPrivate(dst_private->pixmap);
if (exa_priv && exa_priv->bo)
radeon_bo_wait(exa_priv->bo);
@@ -315,7 +317,7 @@ radeon_dri2_copy_region(DrawablePtr drawable,
vsync = info->accel_state->vsync;
info->accel_state->vsync = TRUE;
- (*gc->ops->CopyArea)(&src_pixmap->drawable, &dst_pixmap->drawable, gc,
+ (*gc->ops->CopyArea)(src_drawable, dst_drawable, gc,
0, 0, drawable->width, drawable->height, 0, 0);
info->accel_state->vsync = vsync;
commit f7a91ece264af9f3fd2fc18e99aefcda93ce9f5c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Jun 14 08:52:16 2010 +0200
Convert x(c)alloc/xfree to m/calloc/free.
Fixes deprecation warnings with xserver master and should also work with older
xservers.
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index c427bf1..1366b36 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -292,7 +292,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
#endif
}
- output_ids = xcalloc(sizeof(uint32_t), xf86_config->num_output);
+ output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
if (!output_ids) {
ret = FALSE;
goto done;
@@ -649,15 +649,15 @@ drmmode_output_destroy(xf86OutputPtr output)
drmModeFreePropertyBlob(drmmode_output->edid_blob);
for (i = 0; i < drmmode_output->num_props; i++) {
drmModeFreeProperty(drmmode_output->props[i].mode_prop);
- xfree(drmmode_output->props[i].atoms);
+ free(drmmode_output->props[i].atoms);
}
for (i = 0; i < drmmode_output->mode_output->count_encoders; i++) {
drmModeFreeEncoder(drmmode_output->mode_encoders[i]);
- xfree(drmmode_output->mode_encoders);
+ free(drmmode_output->mode_encoders);
}
- xfree(drmmode_output->props);
+ free(drmmode_output->props);
drmModeFreeConnector(drmmode_output->mode_output);
- xfree(drmmode_output);
+ free(drmmode_output);
output->driver_private = NULL;
}
@@ -699,7 +699,7 @@ drmmode_output_create_resources(xf86OutputPtr output)
drmModePropertyPtr drmmode_prop;
int i, j, err;
- drmmode_output->props = xcalloc(mode_output->count_props, sizeof(drmmode_prop_rec));
+ drmmode_output->props = calloc(mode_output->count_props, sizeof(drmmode_prop_rec));
if (!drmmode_output->props)
return;
@@ -725,7 +725,7 @@ drmmode_output_create_resources(xf86OutputPtr output)
INT32 value = p->value;
p->num_atoms = 1;
- p->atoms = xcalloc(p->num_atoms, sizeof(Atom));
+ p->atoms = calloc(p->num_atoms, sizeof(Atom));
if (!p->atoms)
continue;
p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
@@ -747,7 +747,7 @@ drmmode_output_create_resources(xf86OutputPtr output)
}
} else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) {
p->num_atoms = drmmode_prop->count_enums + 1;
- p->atoms = xcalloc(p->num_atoms, sizeof(Atom));
+ p->atoms = calloc(p->num_atoms, sizeof(Atom));
if (!p->atoms)
continue;
p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
@@ -896,7 +896,7 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
if (!koutput)
return;
- kencoders = xcalloc(sizeof(drmModeEncoderPtr), koutput->count_encoders);
+ kencoders = calloc(sizeof(drmModeEncoderPtr), koutput->count_encoders);
if (!kencoders) {
goto out_free_encoders;
}
@@ -945,7 +945,7 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
goto out_free_encoders;
}
- drmmode_output = xcalloc(sizeof(drmmode_output_private_rec), 1);
+ drmmode_output = calloc(sizeof(drmmode_output_private_rec), 1);
if (!drmmode_output) {
xf86OutputDestroy(output);
goto out_free_encoders;
@@ -985,7 +985,7 @@ out_free_encoders:
if (kencoders){
for (i = 0; i < koutput->count_encoders; i++)
drmModeFreeEncoder(kencoders[i]);
- xfree(kencoders);
+ free(kencoders);
}
drmModeFreeConnector(koutput);
@@ -1130,10 +1130,10 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
} else {
if (radeon_bo_map(info->front_bo, 1))
goto fail;
- fb_shadow = xcalloc(1, screen_size);
+ fb_shadow = calloc(1, screen_size);
if (fb_shadow == NULL)
goto fail;
- xfree(info->fb_shadow);
+ free(info->fb_shadow);
info->fb_shadow = fb_shadow;
screen->ModifyPixmapHeader(screen->GetScreenPixmap(screen),
width, height, -1, -1, pitch * cpp,
diff --git a/src/legacy_output.c b/src/legacy_output.c
index fe0fbe3..670f1ba 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -165,7 +165,7 @@ RADEONGetExtTMDSInfo(ScrnInfoPtr pScrn, radeon_dvo_ptr dvo)
dvo->DVOChip =
RADEONDVODeviceInit(dvo->pI2CBus, dvo->dvo_i2c_slave_addr);
if (!dvo->DVOChip)
- xfree(dvo->pI2CBus);
+ free(dvo->pI2CBus);
}
}
}
@@ -442,7 +442,7 @@ RADEONDVODeviceInit(I2CBusPtr b, I2CSlaveAddr addr)
{
I2CDevPtr dvo;
- dvo = xcalloc(1, sizeof(I2CDevRec));
+ dvo = calloc(1, sizeof(I2CDevRec));
if (dvo == NULL)
return NULL;
@@ -458,7 +458,7 @@ RADEONDVODeviceInit(I2CBusPtr b, I2CSlaveAddr addr)
return dvo;
}
- xfree(dvo);
+ free(dvo);
return NULL;
}
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 26b59d8..b1c024a 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2360,7 +2360,7 @@ R600DrawInit(ScreenPtr pScreen)
info->accel_state->vsync = FALSE;
if (!exaDriverInit(pScreen, info->accel_state->exa)) {
- xfree(info->accel_state->exa);
+ free(info->accel_state->exa);
return FALSE;
}
diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c
index 36f25e7..d0bead3 100644
--- a/src/radeon_accelfuncs.c
+++ b/src/radeon_accelfuncs.c
@@ -1206,7 +1206,7 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a)
a->ScanlineColorExpandBuffers = info->accel_state->scratch_buffer;
if (!info->accel_state->scratch_save)
info->accel_state->scratch_save
- = xalloc(((pScrn->virtualX+31)/32*4)
+ = malloc(((pScrn->virtualX+31)/32*4)
+ (pScrn->virtualX * info->CurrentLayout.pixel_bytes));
info->accel_state->scratch_buffer[0] = info->accel_state->scratch_save;
a->SetupForScanlineCPUToScreenColorExpandFill
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 30dbaf6..996e6ee 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -490,7 +490,7 @@ rhdAtomAllocateFbScratch(atomBiosHandlePtr handle,
xf86DrvMsg(handle->scrnIndex, X_INFO,
"Cannot get VRAM scratch space. "
"Allocating in main memory instead\n");
- handle->scratchBase = xcalloc(fb_size,1);
+ handle->scratchBase = calloc(fb_size,1);
return ATOM_SUCCESS;
}
return ATOM_FAILED;
@@ -651,14 +651,14 @@ rhdAtomInit(atomBiosHandlePtr unused1, AtomBiosRequestID unused2,
BIOSImageSize = RADEON_VBIOS_SIZE;
#endif
- if (!(atomDataPtr = xcalloc(1, sizeof(atomDataTables)))) {
+ if (!(atomDataPtr = calloc(1, sizeof(atomDataTables)))) {
xf86DrvMsg(scrnIndex,X_ERROR,"Cannot allocate memory for "
"ATOM BIOS data tabes\n");
goto error;
}
if (!rhdAtomGetDataTable(scrnIndex, info->VBIOS, atomDataPtr, &cmd_offset, BIOSImageSize))
goto error1;
- if (!(handle = xcalloc(1, sizeof(atomBiosHandleRec)))) {
+ if (!(handle = calloc(1, sizeof(atomBiosHandleRec)))) {
xf86DrvMsg(scrnIndex,X_ERROR,"Cannot allocate memory\n");
goto error1;
}
@@ -677,7 +677,7 @@ rhdAtomInit(atomBiosHandlePtr unused1, AtomBiosRequestID unused2,
return ATOM_SUCCESS;
error1:
- xfree(atomDataPtr);
+ free(atomDataPtr);
error:
return ATOM_FAILED;
}
@@ -688,10 +688,10 @@ rhdAtomTearDown(atomBiosHandlePtr handle,
{
//RHDFUNC(handle);
- xfree(handle->BIOSBase);
- xfree(handle->atomDataPtr);
- if (handle->scratchBase) xfree(handle->scratchBase);
- xfree(handle);
+ free(handle->BIOSBase);
+ free(handle->atomDataPtr);
+ if (handle->scratchBase) free(handle->scratchBase);
+ free(handle);
return ATOM_SUCCESS;
}
@@ -777,7 +777,7 @@ rhdAtomDTDTimings(atomBiosHandlePtr handle, ATOM_DTD_FORMAT *dtd)
if (!dtd->usHActive || !dtd->usVActive)
return NULL;
- if (!(mode = (DisplayModePtr)xcalloc(1,sizeof(DisplayModeRec))))
+ if (!(mode = (DisplayModePtr)calloc(1,sizeof(DisplayModeRec))))
return NULL;
mode->CrtcHDisplay = mode->HDisplay = le16_to_cpu(dtd->usHActive);
@@ -861,7 +861,7 @@ rhdAtomLvdsDDC(atomBiosHandlePtr handle, uint32_t offset, unsigned char *record)
- sizeof(UCHAR);
if (offset > handle->BIOSImageSize) break;
/* dup string as we free it later */
- if (!(EDIDBlock = (unsigned char *)xalloc(
+ if (!(EDIDBlock = (unsigned char *)malloc(
((ATOM_FAKE_EDID_PATCH_RECORD*)record)->ucFakeEDIDLength)))
return NULL;
memcpy(EDIDBlock,&((ATOM_FAKE_EDID_PATCH_RECORD*)record)->ucFakeEDIDString,
@@ -871,7 +871,7 @@ rhdAtomLvdsDDC(atomBiosHandlePtr handle, uint32_t offset, unsigned char *record)
{
xf86MonPtr mon = xf86InterpretEDID(handle->scrnIndex,EDIDBlock);
xf86PrintEDID(mon);
- xfree(mon);
+ free(mon);
}
return EDIDBlock;
@@ -1802,9 +1802,9 @@ radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_suppo
if (device_support & ATOM_DEVICE_LCD1_SUPPORT) {
if (info->encoders[device_index]->dev_priv == NULL) {
info->encoders[device_index]->dev_priv =
- (radeon_lvds_ptr)xcalloc(1,sizeof(radeon_lvds_rec));
+ (radeon_lvds_ptr)calloc(1,sizeof(radeon_lvds_rec));
if (info->encoders[device_index]->dev_priv == NULL) {
- ErrorF("xalloc failed\n");
+ ErrorF("calloc failed\n");
return FALSE;
} else
RADEONGetATOMLVDSInfo(pScrn, (radeon_lvds_ptr)info->encoders[device_index]->dev_priv);
@@ -1816,7 +1816,7 @@ radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_suppo
}
}
- info->encoders[device_index] = (radeon_encoder_ptr)xcalloc(1,sizeof(radeon_encoder_rec));
+ info->encoders[device_index] = (radeon_encoder_ptr)calloc(1,sizeof(radeon_encoder_rec));
if (info->encoders[device_index] != NULL) {
info->encoders[device_index]->encoder_id = encoder_id;
info->encoders[device_index]->devices = 0;
@@ -1824,9 +1824,9 @@ radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_suppo
// add dev_priv stuff
switch (encoder_id) {
case ENCODER_OBJECT_ID_INTERNAL_LVDS:
- info->encoders[device_index]->dev_priv = (radeon_lvds_ptr)xcalloc(1,sizeof(radeon_lvds_rec));
+ info->encoders[device_index]->dev_priv = (radeon_lvds_ptr)calloc(1,sizeof(radeon_lvds_rec));
if (info->encoders[device_index]->dev_priv == NULL) {
- ErrorF("xalloc failed\n");
+ ErrorF("calloc failed\n");
return FALSE;
} else {
if (info->IsAtomBios)
@@ -1837,9 +1837,9 @@ radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_suppo
break;
case ENCODER_OBJECT_ID_INTERNAL_DAC2:
if (!IS_AVIVO_VARIANT) {
- info->encoders[device_index]->dev_priv = (radeon_tvdac_ptr)xcalloc(1,sizeof(radeon_tvdac_rec));
+ info->encoders[device_index]->dev_priv = (radeon_tvdac_ptr)calloc(1,sizeof(radeon_tvdac_rec));
if (info->encoders[device_index]->dev_priv == NULL) {
- ErrorF("xalloc failed\n");
+ ErrorF("calloc failed\n");
return FALSE;
} else
RADEONGetTVDacAdjInfo(pScrn, (radeon_tvdac_ptr)info->encoders[device_index]->dev_priv);
@@ -1847,9 +1847,9 @@ radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_suppo
break;
case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
if (!IS_AVIVO_VARIANT) {
- info->encoders[device_index]->dev_priv = (radeon_tmds_ptr)xcalloc(1,sizeof(radeon_tmds_rec));
+ info->encoders[device_index]->dev_priv = (radeon_tmds_ptr)calloc(1,sizeof(radeon_tmds_rec));
if (info->encoders[device_index]->dev_priv == NULL) {
- ErrorF("xalloc failed\n");
+ ErrorF("calloc failed\n");
return FALSE;
} else
RADEONGetTMDSInfo(pScrn, (radeon_tmds_ptr)info->encoders[device_index]->dev_priv);
@@ -1857,9 +1857,9 @@ radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_suppo
break;
case ENCODER_OBJECT_ID_INTERNAL_DVO1:
if (!IS_AVIVO_VARIANT) {
- info->encoders[device_index]->dev_priv = (radeon_dvo_ptr)xcalloc(1,sizeof(radeon_dvo_rec));
+ info->encoders[device_index]->dev_priv = (radeon_dvo_ptr)calloc(1,sizeof(radeon_dvo_rec));
if (info->encoders[device_index]->dev_priv == NULL) {
- ErrorF("xalloc failed\n");
+ ErrorF("calloc failed\n");
return FALSE;
} else
RADEONGetExtTMDSInfo(pScrn, (radeon_dvo_ptr)info->encoders[device_index]->dev_priv);
@@ -1871,9 +1871,9 @@ radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_suppo
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
case ENCODER_OBJECT_ID_INTERNAL_LVTM1:
if (device_support & ATOM_DEVICE_LCD1_SUPPORT) {
- info->encoders[device_index]->dev_priv = (radeon_lvds_ptr)xcalloc(1,sizeof(radeon_lvds_rec));
+ info->encoders[device_index]->dev_priv = (radeon_lvds_ptr)calloc(1,sizeof(radeon_lvds_rec));
if (info->encoders[device_index]->dev_priv == NULL) {
- ErrorF("xalloc failed\n");
+ ErrorF("calloc failed\n");
return FALSE;
} else
RADEONGetATOMLVDSInfo(pScrn, (radeon_lvds_ptr)info->encoders[device_index]->dev_priv);
@@ -1882,7 +1882,7 @@ radeon_add_encoder(ScrnInfoPtr pScrn, uint32_t encoder_id, uint32_t device_suppo
}
return TRUE;
} else {
- ErrorF("xalloc failed\n");
+ ErrorF("calloc failed\n");
return FALSE;
}
}
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index d066edc..7d615c0 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -361,9 +361,9 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
#ifdef XSERVER_LIBPCIACCESS
int size = info->PciInfo->rom_size > RADEON_VBIOS_SIZE ? info->PciInfo->rom_size : RADEON_VBIOS_SIZE;
- info->VBIOS = xalloc(size);
+ info->VBIOS = malloc(size);
#else
- info->VBIOS = xalloc(RADEON_VBIOS_SIZE);
+ info->VBIOS = malloc(RADEON_VBIOS_SIZE);
#endif
if (!info->VBIOS) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -381,7 +381,7 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Unrecognized BIOS signature, BIOS data will not be used\n");
- xfree (info->VBIOS);
+ free (info->VBIOS);
info->VBIOS = NULL;
return FALSE;
}
@@ -396,7 +396,7 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
else if (info->VBIOS[dptr + 0x14] != 0x0) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Not an x86 BIOS ROM image, BIOS data will not be used\n");
- xfree (info->VBIOS);
+ free (info->VBIOS);
info->VBIOS = NULL;
return FALSE;
}
@@ -406,7 +406,7 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
if(!info->ROMHeaderStart) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Invalid ROM pointer, BIOS data will not be used\n");
- xfree (info->VBIOS);
+ free (info->VBIOS);
info->VBIOS = NULL;
return FALSE;
}
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index bc23ee5..5f4a0a7 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -866,7 +866,7 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask)
pRADEONEnt->Controller[1] = xnfcalloc(sizeof(RADEONCrtcPrivateRec), 1);
if (!pRADEONEnt->Controller[1])
{
- xfree(pRADEONEnt->Controller[0]);
+ free(pRADEONEnt->Controller[0]);
return FALSE;
}
@@ -894,7 +894,7 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask)
pRADEONEnt->Controller[i] = xnfcalloc(sizeof(RADEONCrtcPrivateRec), 1);
if (!pRADEONEnt->Controller[i])
{
- xfree(pRADEONEnt->Controller[i]);
+ free(pRADEONEnt->Controller[i]);
return FALSE;
}
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 6d12435..ed167ed 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -122,21 +122,21 @@ static Bool RADEONInitVisualConfigs(ScreenPtr pScreen)
if (use_db) numConfigs *= 2;
if (!(pConfigs
- = (__GLXvisualConfig *)xcalloc(sizeof(__GLXvisualConfig),
- numConfigs))) {
+ = (__GLXvisualConfig *)calloc(sizeof(__GLXvisualConfig),
+ numConfigs))) {
return FALSE;
}
if (!(pRADEONConfigs
- = (RADEONConfigPrivPtr)xcalloc(sizeof(RADEONConfigPrivRec),
- numConfigs))) {
- xfree(pConfigs);
+ = (RADEONConfigPrivPtr)calloc(sizeof(RADEONConfigPrivRec),
+ numConfigs))) {
+ free(pConfigs);
return FALSE;
}
if (!(pRADEONConfigPtrs
- = (RADEONConfigPrivPtr *)xcalloc(sizeof(RADEONConfigPrivPtr),
- numConfigs))) {
- xfree(pConfigs);
- xfree(pRADEONConfigs);
+ = (RADEONConfigPrivPtr *)calloc(sizeof(RADEONConfigPrivPtr),
+ numConfigs))) {
+ free(pConfigs);
+ free(pRADEONConfigs);
return FALSE;
}
@@ -208,21 +208,21 @@ static Bool RADEONInitVisualConfigs(ScreenPtr pScreen)
if (use_db) numConfigs *= 2;
if (!(pConfigs
- = (__GLXvisualConfig *)xcalloc(sizeof(__GLXvisualConfig),
- numConfigs))) {
+ = (__GLXvisualConfig *)calloc(sizeof(__GLXvisualConfig),
+ numConfigs))) {
return FALSE;
}
if (!(pRADEONConfigs
- = (RADEONConfigPrivPtr)xcalloc(sizeof(RADEONConfigPrivRec),
- numConfigs))) {
- xfree(pConfigs);
+ = (RADEONConfigPrivPtr)calloc(sizeof(RADEONConfigPrivRec),
+ numConfigs))) {
+ free(pConfigs);
return FALSE;
}
if (!(pRADEONConfigPtrs
- = (RADEONConfigPrivPtr *)xcalloc(sizeof(RADEONConfigPrivPtr),
- numConfigs))) {
- xfree(pConfigs);
- xfree(pRADEONConfigs);
+ = (RADEONConfigPrivPtr *)calloc(sizeof(RADEONConfigPrivPtr),
+ numConfigs))) {
+ free(pConfigs);
+ free(pRADEONConfigs);
return FALSE;
}
@@ -523,12 +523,12 @@ static void RADEONDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
if (nbox > 1) {
/* Keep ordering in each band, reverse order of bands */
- pboxNew1 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
+ pboxNew1 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
if (!pboxNew1) return;
- pptNew1 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
+ pptNew1 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
if (!pptNew1) {
- xfree(pboxNew1);
+ free(pboxNew1);
return;
}
@@ -565,14 +565,14 @@ static void RADEONDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
if (nbox > 1) {
/* reverse order of rects in each band */
- pboxNew2 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
- pptNew2 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
+ pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
+ pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
if (!pboxNew2 || !pptNew2) {
- xfree(pptNew2);
- xfree(pboxNew2);
- xfree(pptNew1);
- xfree(pboxNew1);
+ free(pptNew2);
+ free(pboxNew2);
+ free(pptNew1);
+ free(pboxNew1);
return;
}
@@ -643,10 +643,10 @@ static void RADEONDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
info->accel_state->dst_pitch_offset = info->dri->frontPitchOffset;;
- xfree(pptNew2);
- xfree(pboxNew2);
- xfree(pptNew1);
- xfree(pboxNew1);
+ free(pptNew2);
+ free(pboxNew2);
+ free(pptNew1);
+ free(pboxNew1);
info->accel_state->accel->NeedToSync = TRUE;
#endif /* USE_XAA */
@@ -1410,7 +1410,7 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
busId = DRICreatePCIBusID(info->PciInfo);
} else {
- busId = xalloc(64);
+ busId = malloc(64);
sprintf(busId,
"PCI:%d:%d:%d",
PCI_DEV_BUS(info->PciInfo),
@@ -1420,7 +1420,7 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pScrn)
/* Low level DRM open */
fd = drmOpen(RADEON_DRIVER_NAME, busId);
- xfree(busId);
+ free(busId);
if (fd < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[dri] RADEONDRIGetVersion failed to open the DRM\n"
@@ -1557,7 +1557,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
pDRIInfo->busIdString = DRICreatePCIBusID(info->PciInfo);
} else {
- pDRIInfo->busIdString = xalloc(64);
+ pDRIInfo->busIdString = malloc(64);
sprintf(pDRIInfo->busIdString,
"PCI:%d:%d:%d",
PCI_DEV_BUS(info->PciInfo),
@@ -1598,7 +1598,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->SAREASize = SAREA_MAX;
#endif
- if (!(pRADEONDRI = (RADEONDRIPtr)xcalloc(sizeof(RADEONDRIRec),1))) {
+ if (!(pRADEONDRI = (RADEONDRIPtr)calloc(sizeof(RADEONDRIRec),1))) {
DRIDestroyInfoRec(info->dri->pDRIInfo);
info->dri->pDRIInfo = NULL;
return FALSE;
@@ -1645,7 +1645,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
if (!DRIScreenInit(pScreen, pDRIInfo, &info->dri->drmFD)) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[dri] DRIScreenInit failed. Disabling DRI.\n");
- xfree(pDRIInfo->devPrivate);
+ free(pDRIInfo->devPrivate);
pDRIInfo->devPrivate = NULL;
DRIDestroyInfoRec(pDRIInfo);
pDRIInfo = NULL;
@@ -1934,7 +1934,7 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
}
if (info->dri->pciGartBackup) {
- xfree(info->dri->pciGartBackup);
+ free(info->dri->pciGartBackup);
info->dri->pciGartBackup = NULL;
}
@@ -1944,18 +1944,18 @@ void RADEONDRICloseScreen(ScreenPtr pScreen)
/* De-allocate all DRI data structures */
if (info->dri->pDRIInfo) {
if (info->dri->pDRIInfo->devPrivate) {
- xfree(info->dri->pDRIInfo->devPrivate);
+ free(info->dri->pDRIInfo->devPrivate);
info->dri->pDRIInfo->devPrivate = NULL;
}
DRIDestroyInfoRec(info->dri->pDRIInfo);
info->dri->pDRIInfo = NULL;
}
if (info->dri->pVisualConfigs) {
Reply to: