Changes in rn50

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 14:07:08 +0000

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

f43dc23d5ea91fca257be02138a255f02d98e806 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Thu, 13 Jan 2011 06:06:28 +0000

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-reworkConflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

6548698f929814375fa5d62ae1db96959b0418c1 - Merge commit 'v2.6.32' into reiserfs/kill-bkl

Mon, 07 Dec 2009 06:28:35 +0000

Merge commit 'v2.6.32' into reiserfs/kill-bklMerge-reason: The tree was based 2.6.31. It's better to be up to datewith 2.6.32. Although no conflicting changes were made in between,it gives benchmarking results closer to the lastest kernel behaviour. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

838632438145ac6863377eb12d8b8eef9c55d288 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Tue, 01 Dec 2009 07:16:22 +0000

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1 - Merge commit 'v2.6.32-rc5' into for-linus

Tue, 03 Nov 2009 06:10:07 +0000

Merge commit 'v2.6.32-rc5' into for-linus List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

e87a3dd33eab30b4db539500064a9584867e4f2c - Merge branch 'fix/misc' into topic/misc

Sun, 01 Nov 2009 10:11:07 +0000

Merge branch 'fix/misc' into topic/misc List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

0b9e31e9264f1bad89856afb96da1688292f13b4 - Merge branch 'linus' into sched/core

Sun, 25 Oct 2009 16:30:53 +0000

Merge branch 'linus' into sched/coreConflicts: fs/proc/array.cMerge reason: resolve conflict and queue up dependent patch.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

0f8f86c7bdd1c954fbe153af437a0d91a6c5721a - Merge commit 'perf/core' into perf/hw-breakpoint

Sat, 17 Oct 2009 23:09:09 +0000

Merge commit 'perf/core' into perf/hw-breakpointConflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/MakefileMerge reason: We need to be uptodate with the perf events developmentbranch because we plan to rewrite the breakpoints API on top ofperf events. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b - Merge commit 'v2.6.32-rc3'

Tue, 06 Oct 2009 15:36:55 +0000

Merge commit 'v2.6.32-rc3' List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

907bc6c7fc7071b00083fc11e510e47dd93df45d - Merge branch 'for-2.6.32' into for-2.6.33

Tue, 06 Oct 2009 15:01:27 +0000

Merge branch 'for-2.6.32' into for-2.6.33 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

0aa73ba1c4e1ad1d51a29e0df95ccd9f746918b6 - Merge branch 'tracing/urgent' into tracing/core

Thu, 01 Oct 2009 09:20:33 +0000

Merge branch 'tracing/urgent' into tracing/coreMerge reason: Pick up latest fixes and update to latest upstream.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

1669b049db50fc7f1d4e694fb115a0f408c63fce - Merge branch 'master' into next

Tue, 29 Sep 2009 21:47:33 +0000

Merge branch 'master' into next List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

8b3f6af86378d0a10ca2f1ded1da124aef13b62c - Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Thu, 24 Sep 2009 22:13:11 +0000

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

baea7b946f00a291b166ccae7fcfed6c01530cc6 - Merge branch 'origin' into for-linus

Thu, 24 Sep 2009 20:22:33 +0000

Merge branch 'origin' into for-linusConflicts: MAINTAINERS List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

d7a4b414eed51f1653bb05ebe84122bf9a7ae18b - Merge commit 'linus/master' into tracing/kprobes

Wed, 23 Sep 2009 21:08:43 +0000

Merge commit 'linus/master' into tracing/kprobesConflicts: kernel/trace/Makefile kernel/trace/trace.h kernel/trace/trace_event_types.h kernel/trace/trace_export.cMerge reason: Sync with latest significant tracing core changes. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

f056878332a91ed984a116bad4e7d49aefff9e6e - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Tue, 22 Sep 2009 23:49:27 +0000

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Conflicts: drivers/power/wm97xx_battery.c List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

44040f107e64d689ccd3211ac62c6bc44f3f0775 - Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

Mon, 21 Sep 2009 15:10:09 +0000

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits) drm/vgaarb: add VGA arbitration support to the drm and kms. drm/radeon: some r420s have a CP race with the DMA engine. drm/radeon/r600/kms: rv670 is not DCE3 drm/radeon/kms: r420 idle after programming GA_ENHANCE drm/radeon/kms: more fixes to rv770 suspend/resume path. drm/radeon/kms: more alignment for rv770.c with r600.c drm/radeon/kms: rv770 blit init called too late. drm/radeon/kms: move around new init path code to avoid posting at init drm/radeon/r600: fix some issues with suspend/resume. drm/radeon/kms: disable VGA rendering engine before taking over VRAM drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init(). drm/radeon/kms: add initial connector properties drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian. drm/radeon/kms: don't fail if we fail to init GPU acceleration drm/r600/kms: fixup number of loops per blit calculation. drm/radeon/kms: reprogram format in set base. drm/radeon: avivo chips have no separate int bit for display drm/radeon/r600: don't do interrupts drm: fix _DRM_GEM addmap error message drm: update crtc x/y when only fb changes ...Fixed up trivial conflicts in firmware/Makefile due to network driver(cxgb3) and drm (mga/r128/radeon) firmware being listed next to eachother. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50

551ebd837c75fc75df81811a18b7136c39cab487 - drm/radeon/kms: add rn50/r100/r200 CS tracker.

Tue, 01 Sep 2009 05:25:57 +0000

drm/radeon/kms: add rn50/r100/r200 CS tracker.This adds the command stream checker for the RN50, R100 and R200 cards.It stops any access to 3D registers on RN50, and does checkson buffer sizes on the r100/r200 cards. It also fixes some texturesizing checks on r300.Signed-off-by: Dave Airlie List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rn50