From: Linus Torvalds Date: Mon, 21 Sep 2009 15:10:09 +0000 (-0700) Subject: Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6f35cef3de51ad686ce0a072e0f2adb862ec680;hp=1ca52a490b6afd54f2b074c89b85126d2bbb762d;p=linux-firmware 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 each other. --- diff --git a/WHENCE b/WHENCE index 82db525..3f8c4f6 100644 --- a/WHENCE +++ b/WHENCE @@ -727,3 +727,124 @@ Found in hex form in kernel source, with the following comment: Copyright (c) 1998-2002 by Paul Davis -------------------------------------------------------------------------- + +Driver: mga - Matrox G200/G400/G550 + +File: matrox/g200_warp.fw +File: matrox/g400_warp.fw + +Licence: + +Copyright 1999 Matrox Graphics Inc. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER 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 DEALINGS IN THE SOFTWARE. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: r128 - ATI Rage 128 + +File: r128/r128_cce.bin + +Licence: + +Copyright 2000 Advanced Micro Devices, Inc. + + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER 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 + * DEALINGS IN THE SOFTWARE. + +Found in decimal form in kernel source. + +-------------------------------------------------------------------------- + +Driver: radeon - ATI Radeon + +File: radeon/R100_cp.bin +File: radeon/R200_cp.bin +File: radeon/R300_cp.bin +File: radeon/R420_cp.bin +File: radeon/RS600_cp.bin +File: radeon/RS690_cp.bin +File: radeon/R520_cp.bin +File: radeon/R600_pfp.bin +File: radeon/R600_me.bin +File: radeon/RV610_pfp.bin +File: radeon/RV610_me.bin +File: radeon/RV630_pfp.bin +File: radeon/RV630_me.bin +File: radeon/RV620_pfp.bin +File: radeon/RV620_me.bin +File: radeon/RV635_pfp.bin +File: radeon/RV635_me.bin +File: radeon/RV670_pfp.bin +File: radeon/RV670_me.bin +File: radeon/RS780_pfp.bin +File: radeon/RS780_me.bin +File: radeon/RV770_pfp.bin +File: radeon/RV770_me.bin +File: radeon/RV730_pfp.bin +File: radeon/RV730_me.bin +File: radeon/RV710_pfp.bin +File: radeon/RV710_me.bin + +Licence: + + * Copyright 2007-2009 Advanced Micro Devices, Inc. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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 DEALINGS IN THE SOFTWARE. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- diff --git a/matrox/g200_warp.fw b/matrox/g200_warp.fw new file mode 100644 index 0000000..2c7f7fe Binary files /dev/null and b/matrox/g200_warp.fw differ diff --git a/matrox/g400_warp.fw b/matrox/g400_warp.fw new file mode 100644 index 0000000..57f1088 Binary files /dev/null and b/matrox/g400_warp.fw differ diff --git a/r128/r128_cce.bin b/r128/r128_cce.bin new file mode 100644 index 0000000..18b00b7 Binary files /dev/null and b/r128/r128_cce.bin differ diff --git a/radeon/R100_cp.bin b/radeon/R100_cp.bin new file mode 100644 index 0000000..f1e8a11 Binary files /dev/null and b/radeon/R100_cp.bin differ diff --git a/radeon/R200_cp.bin b/radeon/R200_cp.bin new file mode 100644 index 0000000..8ac88c6 Binary files /dev/null and b/radeon/R200_cp.bin differ diff --git a/radeon/R300_cp.bin b/radeon/R300_cp.bin new file mode 100644 index 0000000..b1b1100 Binary files /dev/null and b/radeon/R300_cp.bin differ diff --git a/radeon/R420_cp.bin b/radeon/R420_cp.bin new file mode 100644 index 0000000..bfeff60 Binary files /dev/null and b/radeon/R420_cp.bin differ diff --git a/radeon/R520_cp.bin b/radeon/R520_cp.bin new file mode 100644 index 0000000..1c93ca9 Binary files /dev/null and b/radeon/R520_cp.bin differ diff --git a/radeon/R600_me.bin b/radeon/R600_me.bin new file mode 100644 index 0000000..3939685 Binary files /dev/null and b/radeon/R600_me.bin differ diff --git a/radeon/R600_pfp.bin b/radeon/R600_pfp.bin new file mode 100644 index 0000000..b1b2e95 Binary files /dev/null and b/radeon/R600_pfp.bin differ diff --git a/radeon/RS600_cp.bin b/radeon/RS600_cp.bin new file mode 100644 index 0000000..171ecac Binary files /dev/null and b/radeon/RS600_cp.bin differ diff --git a/radeon/RS690_cp.bin b/radeon/RS690_cp.bin new file mode 100644 index 0000000..38f11b4 Binary files /dev/null and b/radeon/RS690_cp.bin differ diff --git a/radeon/RS780_me.bin b/radeon/RS780_me.bin new file mode 100644 index 0000000..67292bf Binary files /dev/null and b/radeon/RS780_me.bin differ diff --git a/radeon/RS780_pfp.bin b/radeon/RS780_pfp.bin new file mode 100644 index 0000000..7d89878 Binary files /dev/null and b/radeon/RS780_pfp.bin differ diff --git a/radeon/RV610_me.bin b/radeon/RV610_me.bin new file mode 100644 index 0000000..66d265c Binary files /dev/null and b/radeon/RV610_me.bin differ diff --git a/radeon/RV610_pfp.bin b/radeon/RV610_pfp.bin new file mode 100644 index 0000000..18c3546 Binary files /dev/null and b/radeon/RV610_pfp.bin differ diff --git a/radeon/RV620_me.bin b/radeon/RV620_me.bin new file mode 100644 index 0000000..66d265c Binary files /dev/null and b/radeon/RV620_me.bin differ diff --git a/radeon/RV620_pfp.bin b/radeon/RV620_pfp.bin new file mode 100644 index 0000000..18c3546 Binary files /dev/null and b/radeon/RV620_pfp.bin differ diff --git a/radeon/RV630_me.bin b/radeon/RV630_me.bin new file mode 100644 index 0000000..9ded757 Binary files /dev/null and b/radeon/RV630_me.bin differ diff --git a/radeon/RV630_pfp.bin b/radeon/RV630_pfp.bin new file mode 100644 index 0000000..18c3546 Binary files /dev/null and b/radeon/RV630_pfp.bin differ diff --git a/radeon/RV635_me.bin b/radeon/RV635_me.bin new file mode 100644 index 0000000..9ded757 Binary files /dev/null and b/radeon/RV635_me.bin differ diff --git a/radeon/RV635_pfp.bin b/radeon/RV635_pfp.bin new file mode 100644 index 0000000..18c3546 Binary files /dev/null and b/radeon/RV635_pfp.bin differ diff --git a/radeon/RV670_me.bin b/radeon/RV670_me.bin new file mode 100644 index 0000000..109b675 Binary files /dev/null and b/radeon/RV670_me.bin differ diff --git a/radeon/RV670_pfp.bin b/radeon/RV670_pfp.bin new file mode 100644 index 0000000..18c3546 Binary files /dev/null and b/radeon/RV670_pfp.bin differ diff --git a/radeon/RV710_me.bin b/radeon/RV710_me.bin new file mode 100644 index 0000000..da259e0 Binary files /dev/null and b/radeon/RV710_me.bin differ diff --git a/radeon/RV710_pfp.bin b/radeon/RV710_pfp.bin new file mode 100644 index 0000000..925b36d Binary files /dev/null and b/radeon/RV710_pfp.bin differ diff --git a/radeon/RV730_me.bin b/radeon/RV730_me.bin new file mode 100644 index 0000000..09b8eae Binary files /dev/null and b/radeon/RV730_me.bin differ diff --git a/radeon/RV730_pfp.bin b/radeon/RV730_pfp.bin new file mode 100644 index 0000000..925b36d Binary files /dev/null and b/radeon/RV730_pfp.bin differ diff --git a/radeon/RV770_me.bin b/radeon/RV770_me.bin new file mode 100644 index 0000000..ae8c8d9 Binary files /dev/null and b/radeon/RV770_me.bin differ diff --git a/radeon/RV770_pfp.bin b/radeon/RV770_pfp.bin new file mode 100644 index 0000000..e835372 Binary files /dev/null and b/radeon/RV770_pfp.bin differ