XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-24 01:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip trailing whitespace from source files

Browse Source 
Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'`

`git diff -w` & `git diff -b` show no diffs from this change

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/merge_requests/32>
This commit is contained in:
Alan Coopersmith
2025-08-12 17:22:33 -07:00
parent 7fb2787108
commit 008e3482de
21 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -66,8 +66,8 @@ core
*.tar.bz2 *.tar.bz2
*.tar.gz *.tar.gz
# #
# Add & Override patterns for xf86-video-ati # Add & Override patterns for xf86-video-ati
# #
# Edit the following section as needed # Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore' # For example, !report.pc overrides *.pc. See 'man gitignore'
# #

10
configure.ac
View File

@@ -242,7 +242,7 @@ b = bswap16(a);
if test "$SYS_ENDIAN_BSWAP" = "yes" ; then if test "$SYS_ENDIAN_BSWAP" = "yes" ; then
USE_SYS_ENDIAN_H=yes USE_SYS_ENDIAN_H=yes
BSWAP=bswap BSWAP=bswap
else else
if test "$SYS_ENDIAN__SWAP" = "yes" ; then if test "$SYS_ENDIAN__SWAP" = "yes" ; then
USE_SYS_ENDIAN_H=yes USE_SYS_ENDIAN_H=yes
BSWAP=__swap BSWAP=__swap
@@ -252,13 +252,13 @@ b = bswap16(a);
fi fi
if test "$USE_SYS_ENDIAN_H" = "yes" ; then if test "$USE_SYS_ENDIAN_H" = "yes" ; then
AC_DEFINE([USE_SYS_ENDIAN_H], 1, AC_DEFINE([USE_SYS_ENDIAN_H], 1,
[Define to use byteswap macros from <sys/endian.h>]) [Define to use byteswap macros from <sys/endian.h>])
AC_DEFINE_UNQUOTED([radeon_bswap_16], ${BSWAP}16, AC_DEFINE_UNQUOTED([radeon_bswap_16], ${BSWAP}16,
[Define to 16-bit byteswap macro]) [Define to 16-bit byteswap macro])
AC_DEFINE_UNQUOTED([radeon_bswap_32], ${BSWAP}32, AC_DEFINE_UNQUOTED([radeon_bswap_32], ${BSWAP}32,
[Define to 32-bit byteswap macro]) [Define to 32-bit byteswap macro])
AC_DEFINE_UNQUOTED([radeon_bswap_64], ${BSWAP}64, AC_DEFINE_UNQUOTED([radeon_bswap_64], ${BSWAP}64,
[Define to 64-bit byteswap macro]) [Define to 64-bit byteswap macro])
fi fi
fi fi

2
man/Makefile.am
View File

@@ -19,7 +19,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
drivermandir = $(DRIVER_MAN_DIR) drivermandir = $(DRIVER_MAN_DIR)

2
src/atipcirename.h
View File

@@ -31,7 +31,7 @@
enum region_type { enum region_type {
REGION_MEM, REGION_MEM,
REGION_IO REGION_IO
}; };
typedef struct pci_device *pciVideoPtr; typedef struct pci_device *pciVideoPtr;

14
src/drmmode_display.c
View File

@@ -574,7 +574,7 @@ drmmode_crtc_scanout_create(xf86CrtcPtr crtc, struct drmmode_scanout *scanout,
scanout->height = height; scanout->height = height;
} else { } else {
ErrorF("failed to create CRTC scanout FB\n"); ErrorF("failed to create CRTC scanout FB\n");
error: error:
drmmode_crtc_scanout_destroy(drmmode, scanout); drmmode_crtc_scanout_destroy(drmmode, scanout);
} }
@@ -745,7 +745,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
*x = *y = 0; *x = *y = 0;
drmmode_crtc->scanout_id = scanout_id; drmmode_crtc->scanout_id = scanout_id;
} }
static void static void
drmmode_crtc_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode, drmmode_crtc_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
@@ -1813,7 +1813,7 @@ drmmode_output_create_resources(xf86OutputPtr output)
drmmode_output->props = calloc(mode_output->count_props + 1, sizeof(drmmode_prop_rec)); drmmode_output->props = calloc(mode_output->count_props + 1, sizeof(drmmode_prop_rec));
if (!drmmode_output->props) if (!drmmode_output->props)
return; return;
drmmode_output->num_props = 0; drmmode_output->num_props = 0;
for (i = 0, j = 0; i < mode_output->count_props; i++) { for (i = 0, j = 0; i < mode_output->count_props; i++) {
drmmode_prop = drmModeGetProperty(pRADEONEnt->fd, mode_output->props[i]); drmmode_prop = drmModeGetProperty(pRADEONEnt->fd, mode_output->props[i]);
@@ -2227,7 +2227,7 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_r
#if XF86_CRTC_VERSION >= 8 #if XF86_CRTC_VERSION >= 8
output->non_desktop = nonDesktop; output->non_desktop = nonDesktop;
#endif #endif
output->possible_crtcs = 0xffffffff; output->possible_crtcs = 0xffffffff;
for (i = 0; i < koutput->count_encoders; i++) { for (i = 0; i < koutput->count_encoders; i++) {
output->possible_crtcs &= kencoders[i]->possible_crtcs; output->possible_crtcs &= kencoders[i]->possible_crtcs;
@@ -2271,7 +2271,7 @@ uint32_t find_clones(ScrnInfoPtr scrn, xf86OutputPtr output)
clone_drmout = clone_output->driver_private; clone_drmout = clone_output->driver_private;
if (output == clone_output) if (output == clone_output)
continue; continue;
if (clone_drmout->enc_mask == 0) if (clone_drmout->enc_mask == 0)
continue; continue;
if (drmmode_output->enc_clone_mask == clone_drmout->enc_mask) if (drmmode_output->enc_clone_mask == clone_drmout->enc_mask)
@@ -2737,7 +2737,7 @@ drm_wakeup_handler(pointer data, int err, pointer p)
{ {
drmmode_ptr drmmode = data; drmmode_ptr drmmode = data;
RADEONEntPtr pRADEONEnt = RADEONEntPriv(drmmode->scrn); RADEONEntPtr pRADEONEnt = RADEONEntPriv(drmmode->scrn);
#if !HAVE_NOTIFY_FD #if !HAVE_NOTIFY_FD
fd_set *read_mask = p; fd_set *read_mask = p;
@@ -3050,7 +3050,7 @@ miPointerSpriteFuncRec drmmode_sprite_funcs = {
.DeviceCursorCleanup = drmmode_sprite_device_cursor_cleanup, .DeviceCursorCleanup = drmmode_sprite_device_cursor_cleanup,
}; };
void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y) void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y)
{ {
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);

2
src/evergreen_exa.c
View File

@@ -2072,7 +2072,7 @@ EVERGREENDrawInit(ScreenPtr pScreen)
info->accel_state->exa->UploadToScreen = EVERGREENUploadToScreen; info->accel_state->exa->UploadToScreen = EVERGREENUploadToScreen;
info->accel_state->exa->DownloadFromScreen = EVERGREENDownloadFromScreen; info->accel_state->exa->DownloadFromScreen = EVERGREENDownloadFromScreen;
info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2; info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2;
info->accel_state->exa->SharePixmapBacking = RADEONEXASharePixmapBacking; info->accel_state->exa->SharePixmapBacking = RADEONEXASharePixmapBacking;
info->accel_state->exa->SetSharedPixmapBacking = RADEONEXASetSharedPixmapBacking; info->accel_state->exa->SetSharedPixmapBacking = RADEONEXASetSharedPixmapBacking;
info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS | EXA_SUPPORTS_PREPARE_AUX | info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS | EXA_SUPPORTS_PREPARE_AUX |
EXA_HANDLES_PIXMAPS | EXA_MIXED_PIXMAPS; EXA_HANDLES_PIXMAPS | EXA_MIXED_PIXMAPS;

2
src/pcidb/parse_pci_ids.pl
View File

@@ -48,7 +48,7 @@ while (<CSV>) {
if (($columns[2] ne "R128") && ($columns[2] ne "MACH64") && ($columns[2] ne "MACH32")) { if (($columns[2] ne "R128") && ($columns[2] ne "MACH64") && ($columns[2] ne "MACH32")) {
print PCICHIPSET " { PCI_CHIP_$columns[1], PCI_CHIP_$columns[1], RES_SHARED_VGA },\n"; print PCICHIPSET " { PCI_CHIP_$columns[1], PCI_CHIP_$columns[1], RES_SHARED_VGA },\n";
print PCIDEVICEMATCH " ATI_DEVICE_MATCH( PCI_CHIP_$columns[1], 0 ),\n"; print PCIDEVICEMATCH " ATI_DEVICE_MATCH( PCI_CHIP_$columns[1], 0 ),\n";
print RADEONCHIPSET " { PCI_CHIP_$columns[1], \"$columns[8]\" },\n"; print RADEONCHIPSET " { PCI_CHIP_$columns[1], \"$columns[8]\" },\n";

4
src/r600_exa.c
View File

@@ -577,7 +577,7 @@ R600PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst,
0); 0);
if (!accel_state->copy_area_bo) if (!accel_state->copy_area_bo)
RADEON_FALLBACK(("temp copy surface alloc failed\n")); RADEON_FALLBACK(("temp copy surface alloc failed\n"));
radeon_cs_space_add_persistent_bo(info->cs, accel_state->copy_area_bo, radeon_cs_space_add_persistent_bo(info->cs, accel_state->copy_area_bo,
0, RADEON_GEM_DOMAIN_VRAM); 0, RADEON_GEM_DOMAIN_VRAM);
if (radeon_cs_space_check(info->cs)) { if (radeon_cs_space_check(info->cs)) {
@@ -2051,7 +2051,7 @@ R600DrawInit(ScreenPtr pScreen)
info->accel_state->exa->UploadToScreen = R600UploadToScreenCS; info->accel_state->exa->UploadToScreen = R600UploadToScreenCS;
info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreenCS; info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreenCS;
info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2; info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2;
info->accel_state->exa->SharePixmapBacking = RADEONEXASharePixmapBacking; info->accel_state->exa->SharePixmapBacking = RADEONEXASharePixmapBacking;
info->accel_state->exa->SetSharedPixmapBacking = RADEONEXASetSharedPixmapBacking; info->accel_state->exa->SetSharedPixmapBacking = RADEONEXASetSharedPixmapBacking;
info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS | EXA_SUPPORTS_PREPARE_AUX | info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS | EXA_SUPPORTS_PREPARE_AUX |
EXA_HANDLES_PIXMAPS | EXA_MIXED_PIXMAPS; EXA_HANDLES_PIXMAPS | EXA_MIXED_PIXMAPS;

12
src/r600_shader.c
View File

@@ -455,13 +455,13 @@ int R600_copy_ps(RADEONChipFamily ChipSet, uint32_t* shader)
/* /*
* ; xv vertex shader * ; xv vertex shader
* 00 VTX: ADDR(4) CNT(2) * 00 VTX: ADDR(4) CNT(2)
* 0 VFETCH R1.xy01, R0.x, fc0 MEGA(16) FORMAT(32_32_FLOAT) * 0 VFETCH R1.xy01, R0.x, fc0 MEGA(16) FORMAT(32_32_FLOAT)
* FORMAT_COMP(SIGNED) * FORMAT_COMP(SIGNED)
* 1 VFETCH R0.xy01, R0.x, fc0 MINI(8) OFFSET(8) FORMAT(32_32_FLOAT) * 1 VFETCH R0.xy01, R0.x, fc0 MINI(8) OFFSET(8) FORMAT(32_32_FLOAT)
* FORMAT_COMP(SIGNED) * FORMAT_COMP(SIGNED)
* 01 EXP_DONE: POS0, R1 * 01 EXP_DONE: POS0, R1
* 02 EXP_DONE: PARAM0, R0 NO_BARRIER * 02 EXP_DONE: PARAM0, R0 NO_BARRIER
* END_OF_PROGRAM * END_OF_PROGRAM
*/ */
int R600_xv_vs(RADEONChipFamily ChipSet, uint32_t* shader) int R600_xv_vs(RADEONChipFamily ChipSet, uint32_t* shader)

8
src/radeon.h
View File

@@ -137,7 +137,7 @@ RegionDuplicate(RegionPtr pOld)
#define radeon_bswap_32(value) \ #define radeon_bswap_32(value) \
(((uint32_t)radeon_bswap_16((uint16_t)((value) & 0xffff)) << 16) | \ (((uint32_t)radeon_bswap_16((uint16_t)((value) & 0xffff)) << 16) | \
(uint32_t)radeon_bswap_16((uint16_t)((value) >> 16))) (uint32_t)radeon_bswap_16((uint16_t)((value) >> 16)))
#define radeon_bswap_64(value) \ #define radeon_bswap_64(value) \
(((uint64_t)radeon_bswap_32((uint32_t)((value) & 0xffffffff)) \ (((uint64_t)radeon_bswap_32((uint32_t)((value) & 0xffffffff)) \
<< 32) | \ << 32) | \
@@ -364,7 +364,7 @@ struct radeon_2d_state {
struct radeon_bo *dst_bo; struct radeon_bo *dst_bo;
struct radeon_bo *src_bo; struct radeon_bo *src_bo;
}; };
#define DMA_BO_FREE_TIME 1000 #define DMA_BO_FREE_TIME 1000
struct radeon_dma_bo { struct radeon_dma_bo {
@@ -569,7 +569,7 @@ typedef struct {
Bool r600_shadow_fb; Bool r600_shadow_fb;
void *fb_shadow; void *fb_shadow;
void (*reemit_current2d)(ScrnInfoPtr pScrn, int op); // emit the current 2D state into the IB void (*reemit_current2d)(ScrnInfoPtr pScrn, int op); // emit the current 2D state into the IB
struct radeon_2d_state state_2d; struct radeon_2d_state state_2d;
struct radeon_buffer *front_buffer; struct radeon_buffer *front_buffer;
struct radeon_bo_manager *bufmgr; struct radeon_bo_manager *bufmgr;
@@ -885,7 +885,7 @@ radeon_pixmap_get_fb(PixmapPtr pix)
if (fb_ptr && *fb_ptr) if (fb_ptr && *fb_ptr)
return *fb_ptr; return *fb_ptr;
if (radeon_get_pixmap_handle(pix, &handle)) { if (radeon_get_pixmap_handle(pix, &handle)) {
ScrnInfoPtr scrn = xf86ScreenToScrn(pix->drawable.pScreen); ScrnInfoPtr scrn = xf86ScreenToScrn(pix->drawable.pScreen);
RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);

2
src/radeon_accel.c
View File

@@ -984,7 +984,7 @@ void RADEONWaitForVLine(ScrnInfoPtr pScrn, PixmapPtr pPix,
} }
OUT_RING_REG(RADEON_WAIT_UNTIL, (RADEON_WAIT_CRTC_VLINE | OUT_RING_REG(RADEON_WAIT_UNTIL, (RADEON_WAIT_CRTC_VLINE |
RADEON_ENG_DISPLAY_SELECT_CRTC0)); RADEON_ENG_DISPLAY_SELECT_CRTC0));
OUT_RING(CP_PACKET3(RADEON_CP_PACKET3_NOP, 0)); OUT_RING(CP_PACKET3(RADEON_CP_PACKET3_NOP, 0));
OUT_RING(drmmode_crtc->mode_crtc->crtc_id); OUT_RING(drmmode_crtc->mode_crtc->crtc_id);
ADVANCE_RING(); ADVANCE_RING();

10
src/radeon_dri2.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2008 Kristian Høgsberg * Copyright 2008 Kristian Høgsberg
* Copyright 2008 Jérôme Glisse * Copyright 2008 Jérôme Glisse
* *
* All Rights Reserved. * All Rights Reserved.
@@ -195,7 +195,7 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
flags = RADEON_CREATE_PIXMAP_TILING_MACRO | RADEON_CREATE_PIXMAP_TILING_MICRO; flags = RADEON_CREATE_PIXMAP_TILING_MACRO | RADEON_CREATE_PIXMAP_TILING_MICRO;
if (IS_R200_3D || info->ChipFamily == CHIP_FAMILY_RV200 || info->ChipFamily == CHIP_FAMILY_RADEON) if (IS_R200_3D || info->ChipFamily == CHIP_FAMILY_RV200 || info->ChipFamily == CHIP_FAMILY_RADEON)
flags |= RADEON_CREATE_PIXMAP_DEPTH; flags |= RADEON_CREATE_PIXMAP_DEPTH;
break; break;
case DRI2BufferBackLeft: case DRI2BufferBackLeft:
case DRI2BufferBackRight: case DRI2BufferBackRight:
@@ -289,7 +289,7 @@ radeon_dri2_destroy_buffer2(ScreenPtr pScreen,
if (private->refcnt == 0) { if (private->refcnt == 0) {
ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
xf86DrvMsg(scrn->scrnIndex, X_WARNING, xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"Attempted to destroy previously destroyed buffer.\ "Attempted to destroy previously destroyed buffer.\
This is a programming error\n"); This is a programming error\n");
return; return;
@@ -376,7 +376,7 @@ radeon_dri2_copy_region2(ScreenPtr pScreen,
ValidateGC(dst_drawable, gc); ValidateGC(dst_drawable, gc);
vsync = info->accel_state->vsync; vsync = info->accel_state->vsync;
/* Driver option "SwapbuffersWait" defines if we vsync DRI2 copy-swaps. */ /* Driver option "SwapbuffersWait" defines if we vsync DRI2 copy-swaps. */
info->accel_state->vsync = info->swapBuffersWait; info->accel_state->vsync = info->swapBuffersWait;
info->accel_state->force = TRUE; info->accel_state->force = TRUE;
@@ -1204,7 +1204,7 @@ static int radeon_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
/* radeon_dri2_frame_event_handler will get called some unknown time in the /* radeon_dri2_frame_event_handler will get called some unknown time in the
* future with these buffers. Take a reference to ensure that they won't * future with these buffers. Take a reference to ensure that they won't
* get destroyed before then. * get destroyed before then.
*/ */
radeon_dri2_ref_buffer(front); radeon_dri2_ref_buffer(front);
radeon_dri2_ref_buffer(back); radeon_dri2_ref_buffer(back);

2
src/radeon_exa.c
View File

@@ -207,7 +207,7 @@ Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index)
if (flush) if (flush)
radeon_cs_flush_indirect(pScrn); radeon_cs_flush_indirect(pScrn);
/* flush IB */ /* flush IB */
ret = radeon_bo_map(driver_priv->bo->bo.radeon, 1); ret = radeon_bo_map(driver_priv->bo->bo.radeon, 1);
if (ret) { if (ret) {

2
src/radeon_exa_funcs.c
View File

@@ -646,7 +646,7 @@ Bool RADEONDrawInit(ScreenPtr pScreen)
info->accel_state->exa->PrepareAccess = RADEONPrepareAccess_CS; info->accel_state->exa->PrepareAccess = RADEONPrepareAccess_CS;
info->accel_state->exa->FinishAccess = RADEONFinishAccess_CS; info->accel_state->exa->FinishAccess = RADEONFinishAccess_CS;
info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2; info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2;
info->accel_state->exa->SharePixmapBacking = RADEONEXASharePixmapBacking; info->accel_state->exa->SharePixmapBacking = RADEONEXASharePixmapBacking;
info->accel_state->exa->SetSharedPixmapBacking = RADEONEXASetSharedPixmapBacking; info->accel_state->exa->SetSharedPixmapBacking = RADEONEXASetSharedPixmapBacking;

18
src/radeon_exa_render.c
View File

@@ -264,13 +264,13 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict,
info->accel_state->need_src_tile_x = info->accel_state->need_src_tile_y = FALSE; info->accel_state->need_src_tile_x = info->accel_state->need_src_tile_y = FALSE;
info->accel_state->src_tile_width = info->accel_state->src_tile_height = 65536; /* "infinite" */ info->accel_state->src_tile_width = info->accel_state->src_tile_height = 65536; /* "infinite" */
if (repeatType == RepeatNormal || repeatType == RepeatReflect) { if (repeatType == RepeatNormal || repeatType == RepeatReflect) {
Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix); Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix);
int w = pPict->pDrawable ? pPict->pDrawable->width : 1; int w = pPict->pDrawable ? pPict->pDrawable->width : 1;
int h = pPict->pDrawable ? pPict->pDrawable->height : 1; int h = pPict->pDrawable ? pPict->pDrawable->height : 1;
if (pPict->transform) { if (pPict->transform) {
if (badPitch) if (badPitch)
RADEON_FALLBACK(("Width %d and pitch %u not compatible for repeat\n", RADEON_FALLBACK(("Width %d and pitch %u not compatible for repeat\n",
@@ -1217,7 +1217,7 @@ static Bool R300TextureSetup(PicturePtr pPict, PixmapPtr pPix,
txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP); txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP);
else else
txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL); txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL);
if (unit != 0 || !info->accel_state->need_src_tile_y) if (unit != 0 || !info->accel_state->need_src_tile_y)
txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP); txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP);
else else
@@ -2073,7 +2073,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
} }
ADVANCE_RING(); ADVANCE_RING();
BEGIN_ACCEL_RELOC(3, 2); BEGIN_ACCEL_RELOC(3, 2);
EMIT_WRITE_OFFSET(R300_RB3D_COLOROFFSET0, 0, pDst); EMIT_WRITE_OFFSET(R300_RB3D_COLOROFFSET0, 0, pDst);
EMIT_COLORPITCH(R300_RB3D_COLORPITCH0, colorpitch, pDst); EMIT_COLORPITCH(R300_RB3D_COLORPITCH0, colorpitch, pDst);
@@ -2390,7 +2390,7 @@ static void RadeonComposite(PixmapPtr pDst,
int remainingWidth = width; int remainingWidth = width;
int tileSrcX, tileMaskX, tileDstX; int tileSrcX, tileMaskX, tileDstX;
int h = info->accel_state->src_tile_height - tileSrcY; int h = info->accel_state->src_tile_height - tileSrcY;
if (h > remainingHeight) if (h > remainingHeight)
h = remainingHeight; h = remainingHeight;
remainingHeight -= h; remainingHeight -= h;
@@ -2398,13 +2398,13 @@ static void RadeonComposite(PixmapPtr pDst,
modulus(srcX, info->accel_state->src_tile_width, tileSrcX); modulus(srcX, info->accel_state->src_tile_width, tileSrcX);
tileMaskX = maskX; tileMaskX = maskX;
tileDstX = dstX; tileDstX = dstX;
while (remainingWidth > 0) { while (remainingWidth > 0) {
int w = info->accel_state->src_tile_width - tileSrcX; int w = info->accel_state->src_tile_width - tileSrcX;
if (w > remainingWidth) if (w > remainingWidth)
w = remainingWidth; w = remainingWidth;
remainingWidth -= w; remainingWidth -= w;
RadeonCompositeTile(pScrn, RadeonCompositeTile(pScrn,
info, info,
pDst, pDst,
@@ -2412,7 +2412,7 @@ static void RadeonComposite(PixmapPtr pDst,
tileMaskX, tileMaskY, tileMaskX, tileMaskY,
tileDstX, tileDstY, tileDstX, tileDstY,
w, h); w, h);
tileSrcX = 0; tileSrcX = 0;
tileMaskX += w; tileMaskX += w;
tileDstX += w; tileDstX += w;

8
src/radeon_kms.c
View File

@@ -300,7 +300,7 @@ radeon_event_callback(CallbackListPtr *list,
*/ */
client_priv->needs_flush = info->gpu_flushed; client_priv->needs_flush = info->gpu_flushed;
server_priv->needs_flush = info->gpu_flushed; server_priv->needs_flush = info->gpu_flushed;
for (i = 0; i < eventinfo->count; i++) { for (i = 0; i < eventinfo->count; i++) {
if (eventinfo->events[i].u.u.type == info->callback_event_type) { if (eventinfo->events[i].u.u.type == info->callback_event_type) {
client_priv->needs_flush++; client_priv->needs_flush++;
@@ -846,7 +846,7 @@ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
"Failed to get FB for PRIME flip.\n"); "Failed to get FB for PRIME flip.\n");
return; return;
} }
drm_queue_seq = radeon_drm_queue_alloc(crtc, drm_queue_seq = radeon_drm_queue_alloc(crtc,
RADEON_DRM_QUEUE_CLIENT_DEFAULT, RADEON_DRM_QUEUE_CLIENT_DEFAULT,
RADEON_DRM_QUEUE_ID_DEFAULT, fb, RADEON_DRM_QUEUE_ID_DEFAULT, fb,
@@ -1782,7 +1782,7 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
(unsigned)ARRAY_SIZE(pRADEONEnt->scrn)); (unsigned)ARRAY_SIZE(pRADEONEnt->scrn));
return FALSE; return FALSE;
} }
if (!RADEONGetRec(pScrn)) return FALSE; if (!RADEONGetRec(pScrn)) return FALSE;
info = RADEONPTR(pScrn); info = RADEONPTR(pScrn);
@@ -2328,7 +2328,7 @@ Bool RADEONScreenInit_KMS(ScreenPtr pScreen, int argc, char **argv)
} }
radeon_cs_set_limit(info->cs, RADEON_GEM_DOMAIN_GTT, info->gart_size); radeon_cs_set_limit(info->cs, RADEON_GEM_DOMAIN_GTT, info->gart_size);
radeon_cs_space_set_flush(info->cs, (void(*)(void *))radeon_cs_flush_indirect, pScrn); radeon_cs_space_set_flush(info->cs, (void(*)(void *))radeon_cs_flush_indirect, pScrn);
if (!radeon_setup_kernel_mem(pScreen)) { if (!radeon_setup_kernel_mem(pScreen)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "radeon_setup_kernel_mem failed\n"); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "radeon_setup_kernel_mem failed\n");

8
src/radeon_reg.h
View File

@@ -2304,7 +2304,7 @@
# define RADEON_ROUND_PREC_8TH_PIX (1 << 30) # define RADEON_ROUND_PREC_8TH_PIX (1 << 30)
# define RADEON_ROUND_PREC_4TH_PIX (2 << 30) # define RADEON_ROUND_PREC_4TH_PIX (2 << 30)
# define RADEON_ROUND_PREC_HALF_PIX (3 << 30) # define RADEON_ROUND_PREC_HALF_PIX (3 << 30)
#define R200_RE_CNTL 0x1c50 #define R200_RE_CNTL 0x1c50
# define R200_STIPPLE_ENABLE 0x1 # define R200_STIPPLE_ENABLE 0x1
# define R200_SCISSOR_ENABLE 0x2 # define R200_SCISSOR_ENABLE 0x2
# define R200_PATTERN_ENABLE 0x4 # define R200_PATTERN_ENABLE 0x4
@@ -2596,7 +2596,7 @@
# define RADEON_VF_NUM_VERTICES_SHIFT 16 # define RADEON_VF_NUM_VERTICES_SHIFT 16
#define RADEON_SE_PORT_DATA0 0x2000 #define RADEON_SE_PORT_DATA0 0x2000
#define R200_SE_VAP_CNTL 0x2080 #define R200_SE_VAP_CNTL 0x2080
# define R200_VAP_TCL_ENABLE 0x00000001 # define R200_VAP_TCL_ENABLE 0x00000001
# define R200_VAP_SINGLE_BUF_STATE_ENABLE 0x00000010 # define R200_VAP_SINGLE_BUF_STATE_ENABLE 0x00000010
@@ -2630,7 +2630,7 @@
# define R200_SCISSOR_ENABLE_0 0x10000000 # define R200_SCISSOR_ENABLE_0 0x10000000
# define R200_SCISSOR_ENABLE_1 0x20000000 # define R200_SCISSOR_ENABLE_1 0x20000000
# define R200_SCISSOR_ENABLE_2 0x40000000 # define R200_SCISSOR_ENABLE_2 0x40000000
#define R200_PP_TXFILTER_0 0x2c00 #define R200_PP_TXFILTER_0 0x2c00
#define R200_PP_TXFILTER_1 0x2c20 #define R200_PP_TXFILTER_1 0x2c20
#define R200_PP_TXFILTER_2 0x2c40 #define R200_PP_TXFILTER_2 0x2c40
#define R200_PP_TXFILTER_3 0x2c60 #define R200_PP_TXFILTER_3 0x2c60
@@ -3856,7 +3856,7 @@
# define AVIVO_DACB_POWERDOWN_POWERDOWN (1 << 0) # define AVIVO_DACB_POWERDOWN_POWERDOWN (1 << 0)
# define AVIVO_DACB_POWERDOWN_BLUE (1 << 8) # define AVIVO_DACB_POWERDOWN_BLUE (1 << 8)
# define AVIVO_DACB_POWERDOWN_GREEN (1 << 16) # define AVIVO_DACB_POWERDOWN_GREEN (1 << 16)
# define AVIVO_DACB_POWERDOWN_RED # define AVIVO_DACB_POWERDOWN_RED
#define AVIVO_TMDSA_CNTL 0x7880 #define AVIVO_TMDSA_CNTL 0x7880
# define AVIVO_TMDSA_CNTL_ENABLE (1 << 0) # define AVIVO_TMDSA_CNTL_ENABLE (1 << 0)

4
src/radeon_textured_video.c
View File

@@ -348,13 +348,13 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
nlines = ((y2 + 0xffff) >> 16) - top; nlines = ((y2 + 0xffff) >> 16) - top;
pPriv->currentBuffer ^= 1; pPriv->currentBuffer ^= 1;
src_bo = pPriv->src_bo[pPriv->currentBuffer]; src_bo = pPriv->src_bo[pPriv->currentBuffer];
ret = radeon_bo_map(src_bo, 1); ret = radeon_bo_map(src_bo, 1);
if (ret) if (ret)
return BadAlloc; return BadAlloc;
pPriv->src_addr = src_bo->ptr; pPriv->src_addr = src_bo->ptr;
pPriv->src_pitch = dstPitch; pPriv->src_pitch = dstPitch;

2
src/radeon_textured_videofuncs.c
View File

@@ -2384,7 +2384,7 @@ R500PrepareTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
if (pPriv->bicubic_enabled) if (pPriv->bicubic_enabled)
radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo, radeon_cs_space_add_persistent_bo(info->cs, info->bicubic_bo,
RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0); RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
driver_priv = exaGetPixmapDriverPrivate(pPixmap); driver_priv = exaGetPixmapDriverPrivate(pPixmap);
radeon_cs_space_add_persistent_bo(info->cs, driver_priv->bo->bo.radeon, 0, radeon_cs_space_add_persistent_bo(info->cs, driver_priv->bo->bo.radeon, 0,
RADEON_GEM_DOMAIN_VRAM); RADEON_GEM_DOMAIN_VRAM);

4
src/radeon_video.c
View File

@@ -269,12 +269,12 @@ RADEONCopyMungedData(
dst++; s2++; s3++; dst++; s2++; s3++;
s1 += 2; s1 += 2;
} }
dst1 += dstPitch; dst1 += dstPitch;
src1 += srcPitch; src1 += srcPitch;
if( j & 1 ) { if( j & 1 ) {
src2 += srcPitch2; src2 += srcPitch2;
src3 += srcPitch2; src3 += srcPitch2;
} }
} }
} }

12
src/simple_list.h
View File

@@ -4,7 +4,7 @@
* *
* Intended to work with a list sentinel which is created as an empty * Intended to work with a list sentinel which is created as an empty
* list. Insert & delete are O(1). * list. Insert & delete are O(1).
* *
* \author * \author
* (C) 1997, Keith Whitwell * (C) 1997, Keith Whitwell
*/ */
@@ -154,19 +154,19 @@ do { \
/** /**
* Test whether element is at end of the list. * Test whether element is at end of the list.
* *
* \param list list. * \param list list.
* \param elem element. * \param elem element.
* *
* \return non-zero if element is at end of list, or zero otherwise. * \return non-zero if element is at end of list, or zero otherwise.
*/ */
#define at_end(list, elem) ((elem) == (list)) #define at_end(list, elem) ((elem) == (list))
/** /**
* Test if a list is empty. * Test if a list is empty.
* *
* \param list list. * \param list list.
* *
* \return non-zero if list empty, or zero otherwise. * \return non-zero if list empty, or zero otherwise.
*/ */
#define is_empty_list(list) ((list)->next == (list)) #define is_empty_list(list) ((list)->next == (list))
@@ -188,7 +188,7 @@ do { \
* *
* Same as #foreach but lets you unlink the current value during a list * Same as #foreach but lets you unlink the current value during a list
* traversal. Useful for freeing a list, element by element. * traversal. Useful for freeing a list, element by element.
* *
* \param ptr pointer to the current element. * \param ptr pointer to the current element.
* \param t temporary pointer. * \param t temporary pointer.
* \param list list. * \param list list.