~ubuntu-branches/ubuntu/oneiric/xserver-xorg-video-ati/oneiric

« back to all changes in this revision

Viewing changes to src/radeon_cursor.c

Committer: Bazaar Package Importer
Author(s): Robert Hooker
Date: 2010-07-08 16:45:59 UTC
mfrom: (1.5.5 upstream)
mto: (0.2.12 sid)
mto: This revision was merged to the branch mainline in revision 95.
Revision ID: james.westby@ubuntu.com-20100708164559-wjwmwrsnixdt1ckv

Tags: upstream-6.13.1

Import upstream version 6.13.1

files modified:
COPYING

ChangeLog

Makefile.in

aclocal.m4

config.guess

config.h.in

config.sub

configure

configure.ac

depcomp

install-sh

ltmain.sh

man/Makefile.in

man/radeon.man

missing

src/Makefile.am

src/Makefile.in

src/ati_pciids_gen.h

src/atombios_crtc.c

src/atombios_output.c

src/drmmode_display.c

src/drmmode_display.h

src/legacy_crtc.c

src/legacy_output.c

src/modes/xf86Crtc.c

src/modes/xf86Crtc.h

src/modes/xf86Cursors.c

src/modes/xf86DiDGA.c

src/modes/xf86EdidModes.c

src/modes/xf86Modes.c

src/modes/xf86Modes.h

src/modes/xf86RandR12.c

src/modes/xf86RandR12.h

src/modes/xf86Rotate.c

src/parser/xf86Parser.h

src/pcidb/ati_pciids.csv

src/r600_exa.c

src/r600_shader.c

src/r600_state.h

src/r6xx_accel.c

src/radeon.h

src/radeon_accel.c

src/radeon_accelfuncs.c

src/radeon_atombios.c

src/radeon_bios.c

src/radeon_chipinfo_gen.h

src/radeon_chipset_gen.h

src/radeon_commonfuncs.c

src/radeon_crtc.c

src/radeon_cursor.c

src/radeon_dri.c

src/radeon_dri.h

src/radeon_dri2.c

src/radeon_dri2.h

src/radeon_driver.c

src/radeon_exa.c

src/radeon_exa_funcs.c

src/radeon_exa_render.c

src/radeon_kms.c

src/radeon_output.c

src/radeon_pci_chipset_gen.h

src/radeon_pci_device_match_gen.h

src/radeon_probe.c

src/radeon_probe.h

src/radeon_textured_video.c

src/radeon_textured_videofuncs.c

src/radeon_vbo.c

src/radeon_video.c

src/radeon_video.h

src/radeon_vip.c

src/theatre200.c

Show diffs side-by-side

added added

removed removed

src/radeon_cursor.c

343

ScrnInfoPtr pScrn = crtc->scrn;

344

RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;

345

RADEONInfoPtr info = RADEONPTR(pScrn);

346

uint32_t *pixels = (uint32_t *)(pointer)(info->FB + radeon_crtc->cursor_offset);

346

uint32_t *pixels = (uint32_t *)(pointer)(info->FB + pScrn->fbOffset + radeon_crtc->cursor_offset);

347

int pixel, i;

348

CURSOR_SWAPPING_DECL_MMIO

349

386

RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;

387

RADEONInfoPtr info = RADEONPTR(pScrn);

388

CURSOR_SWAPPING_DECL_MMIO

389

uint32_t *d = (uint32_t *)(pointer)(info->FB + radeon_crtc->cursor_offset);

389

uint32_t *d = (uint32_t *)(pointer)(info->FB + pScrn->fbOffset + radeon_crtc->cursor_offset);

390

391

RADEONCTRACE(("RADEONLoadCursorARGB\n"));

392

Older »