drm/mga: Use request_firmware() to load microcode

Image format is IHEX, one record for each pipe in order (record
addresses are ignored).

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>

9 files changed, 186 insertions, 11750 deletions

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 39b393d38bb3..10edc9b0022f 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -116,6 +116,7 @@ endchoice
 config DRM_MGA
         tristate "Matrox g200/g400"
         depends on DRM
+        select FW_LOADER
         help
           Choose this option if you have a Matrox G200, G400 or G450 graphics
           card.  If M is selected, the module will be called mga.  AGP
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
index 6c67a02910c8..3c917fb3a60b 100644
--- a/drivers/gpu/drm/mga/mga_dma.c
+++ b/drivers/gpu/drm/mga/mga_dma.c
@@ -444,7 +444,7 @@ static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
 {
         drm_mga_private_t *const dev_priv =
             (drm_mga_private_t *) dev->dev_private;
-        unsigned int warp_size = mga_warp_microcode_size(dev_priv);
+        unsigned int warp_size = MGA_WARP_UCODE_SIZE;
         int err;
         unsigned offset;
         const unsigned secondary_size = dma_bs->secondary_bin_count
@@ -619,7 +619,7 @@ static int mga_do_pci_dma_bootstrap(struct drm_device * dev,
 {
         drm_mga_private_t *const dev_priv =
             (drm_mga_private_t *) dev->dev_private;
-        unsigned int warp_size = mga_warp_microcode_size(dev_priv);
+        unsigned int warp_size = MGA_WARP_UCODE_SIZE;
         unsigned int primary_size;
         unsigned int bin_count;
         int err;
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index 3d264f288237..be6c6b9b0e89 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -177,7 +177,6 @@ extern void mga_do_dma_wrap_end(drm_mga_private_t * dev_priv);
 extern int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf);
 
                                 /* mga_warp.c */
-extern unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv);
 extern int mga_warp_install_microcode(drm_mga_private_t * dev_priv);
 extern int mga_warp_init(drm_mga_private_t * dev_priv);
 
diff --git a/drivers/gpu/drm/mga/mga_ucode.h b/drivers/gpu/drm/mga/mga_ucode.h
deleted file mode 100644
index b611e27470e1..000000000000
--- a/drivers/gpu/drm/mga/mga_ucode.h
+++ /dev/null
@@ -1,11645 +0,0 @@
-/* mga_ucode.h -- Matrox G200/G400 WARP engine microcode -*- linux-c -*-
- * Created: Thu Jan 11 21:20:43 2001 by gareth@valinux.com
- *
- * 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.
- *
- * Kernel-based WARP engine management:
- *    Gareth Hughes <gareth@valinux.com>
- */
-
-/*
- * WARP pipes are named according to the functions they perform, where:
- *
- *   - T stands for computation of texture stage 0
- *   - T2 stands for computation of both texture stage 0 and texture stage 1
- *   - G stands for computation of triangle intensity (Gouraud interpolation)
- *   - Z stands for computation of Z buffer interpolation
- *   - S stands for computation of specular highlight
- *   - A stands for computation of the alpha channel
- *   - F stands for computation of vertex fog interpolation
- */
-
-static unsigned char warp_g200_tgz[] = {
-
-        0x00, 0x80, 0x00, 0xE8,
-        0x00, 0x80, 0x00, 0xE8,
-
-        0x00, 0x80, 0x00, 0xE8,
-        0x00, 0x80, 0x00, 0xE8,
-
-        0x00, 0x80, 0x00, 0xE8,
-        0x00, 0x80, 0x00, 0xE8,
-
-        0x00, 0x80, 0x00, 0xE8,
-        0x00, 0x80, 0x00, 0xE8,
-
-        0x00, 0x80, 0x00, 0xE8,
-        0x00, 0x80, 0x00, 0xE8,
-
-        0x00, 0x98, 0xA0, 0xE9,
-        0x40, 0x40, 0xD8, 0xEC,
-
-        0xFF, 0x80, 0xC0, 0xE9,
-        0x00, 0x80, 0x00, 0xE8,
-
-        0x1F, 0xD7, 0x18, 0xBD,
-        0x3F, 0xD7, 0x22, 0xBD,
-
-        0x81, 0x04,
-        0x89, 0x04,
-        0x01, 0x04,
-        0x09, 0x04,
-
-        0xC9, 0x41, 0xC0, 0xEC,
-        0x11, 0x04,
-        0x00, 0xE0,
-
-        0x41, 0xCC, 0x41, 0xCD,
-        0x49, 0xCC, 0x49, 0xCD,
-
-        0xD1, 0x41, 0xC0, 0xEC,
-        0x51, 0xCC, 0x51, 0xCD,
-
-        0x80, 0x04,
-        0x10, 0x04,
-        0x08, 0x04,
-        0x00, 0xE0,
-
-        0x00, 0xCC, 0xC0, 0xCD,
-        0xD1, 0x49, 0xC0, 0xEC,
-
-        0x8A, 0x1F, 0x20, 0xE9,
-        0x8B, 0x3F, 0x20, 0xE9,
-
-        0x41, 0x3C, 0x41, 0xAD,
-        0x49, 0x3C, 0x49, 0xAD,
-
-        0x10, 0xCC, 0x10, 0xCD,
-        0x08, 0xCC, 0x08, 0xCD,
-
-        0xB9, 0x41, 0x49, 0xBB,
-        0x1F, 0xF0, 0x41, 0xCD,
-
-        0x51, 0x3C, 0x51, 0xAD,
-        0x00, 0x98, 0x80, 0xE9,
-
-        0x72, 0x80, 0x07, 0xEA,
-        0x24, 0x1F, 0x20, 0xE9,
-
-        0x15, 0x41, 0x49, 0xBD,
-        0x1D, 0x41, 0x51, 0xBD,
-
-        0x2E, 0x41, 0x2A, 0xB8,
-        0x34, 0x53, 0xA0, 0xE8,
-
-        0x15, 0x30,
-        0x1D, 0x30,
-        0x58, 0xE3,
-        0x00, 0xE0,
-
-        0xB5, 0x40, 0x48, 0xBD,
-        0x3D, 0x40, 0x50, 0xBD,
-
-        0x24, 0x43, 0xA0, 0xE8,
-        0x2C, 0x4B, 0xA0, 0xE8,
-
-        0x15, 0x72,
-        0x09, 0xE3,
-        0x00, 0xE0,
-        0x1D, 0x72,
-
-        0x35, 0x30,
-        0xB5, 0x30,