summaryrefslogtreecommitdiffstats
path: root/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/features/all/drivers-gpu-drm-mga-request_firmware.patch')
-rw-r--r--patches/features/all/drivers-gpu-drm-mga-request_firmware.patch277
1 files changed, 0 insertions, 277 deletions
diff --git a/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch b/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch
deleted file mode 100644
index 88f57d4..0000000
--- a/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Subject: mga: Use request_firmware() to load microcode
-
-Image format is IHEX, one record for each pipe in order (record
-addresses are ignored).
-
-Compile-tested only.
----
- drivers/gpu/drm/Kconfig | 2 +-
- drivers/gpu/drm/mga/mga_dma.c | 4 +-
- drivers/gpu/drm/mga/mga_drv.h | 1 -
- drivers/gpu/drm/mga/mga_warp.c | 180 +++++++++++++++++-----------------------
- include/drm/mga_drm.h | 2 +-
- 5 files changed, 82 insertions(+), 107 deletions(-)
-
-diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 853814c..a61d10a 100644
---- a/drivers/gpu/drm/Kconfig
-+++ b/drivers/gpu/drm/Kconfig
-@@ -81,7 +81,7 @@ endchoice
- config DRM_MGA
- tristate "Matrox g200/g400"
- depends on DRM
-- depends on BROKEN
-+ 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 b49c5ff..7e0b106 100644
---- a/drivers/gpu/drm/mga/mga_dma.c
-+++ b/drivers/gpu/drm/mga/mga_dma.c
-@@ -447,7 +447,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
-@@ -622,7 +622,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 88257c2..9e40226 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_warp.c b/drivers/gpu/drm/mga/mga_warp.c
-index 651b93c..9aad484 100644
---- a/drivers/gpu/drm/mga/mga_warp.c
-+++ b/drivers/gpu/drm/mga/mga_warp.c
-@@ -27,132 +27,108 @@
- * Gareth Hughes <gareth@valinux.com>
- */
-
-+#include <linux/firmware.h>
-+#include <linux/ihex.h>
-+#include <linux/platform_device.h>
-+
- #include "drmP.h"
- #include "drm.h"
- #include "mga_drm.h"
- #include "mga_drv.h"
--#include "mga_ucode.h"
-+
-+#define FIRMWARE_G200 "matrox/g200_warp.fw"
-+#define FIRMWARE_G400 "matrox/g400_warp.fw"
-+
-+MODULE_FIRMWARE(FIRMWARE_G200);
-+MODULE_FIRMWARE(FIRMWARE_G400);
-
- #define MGA_WARP_CODE_ALIGN 256 /* in bytes */
-
--#define WARP_UCODE_SIZE( which ) \
-- ((sizeof(which) / MGA_WARP_CODE_ALIGN + 1) * MGA_WARP_CODE_ALIGN)
--
--#define WARP_UCODE_INSTALL( which, where ) \
--do { \
-- DRM_DEBUG( " pcbase = 0x%08lx vcbase = %p\n", pcbase, vcbase );\
-- dev_priv->warp_pipe_phys[where] = pcbase; \
-- memcpy( vcbase, which, sizeof(which) ); \
-- pcbase += WARP_UCODE_SIZE( which ); \
-- vcbase += WARP_UCODE_SIZE( which ); \
--} while (0)
--
--static const unsigned int mga_warp_g400_microcode_size =
-- (WARP_UCODE_SIZE(warp_g400_tgz) +
-- WARP_UCODE_SIZE(warp_g400_tgza) +
-- WARP_UCODE_SIZE(warp_g400_tgzaf) +
-- WARP_UCODE_SIZE(warp_g400_tgzf) +
-- WARP_UCODE_SIZE(warp_g400_tgzs) +
-- WARP_UCODE_SIZE(warp_g400_tgzsa) +
-- WARP_UCODE_SIZE(warp_g400_tgzsaf) +
-- WARP_UCODE_SIZE(warp_g400_tgzsf) +
-- WARP_UCODE_SIZE(warp_g400_t2gz) +
-- WARP_UCODE_SIZE(warp_g400_t2gza) +
-- WARP_UCODE_SIZE(warp_g400_t2gzaf) +
-- WARP_UCODE_SIZE(warp_g400_t2gzf) +
-- WARP_UCODE_SIZE(warp_g400_t2gzs) +
-- WARP_UCODE_SIZE(warp_g400_t2gzsa) +
-- WARP_UCODE_SIZE(warp_g400_t2gzsaf) + WARP_UCODE_SIZE(warp_g400_t2gzsf));
--
--static const unsigned int mga_warp_g200_microcode_size =
-- (WARP_UCODE_SIZE(warp_g200_tgz) +
-- WARP_UCODE_SIZE(warp_g200_tgza) +
-- WARP_UCODE_SIZE(warp_g200_tgzaf) +
-- WARP_UCODE_SIZE(warp_g200_tgzf) +
-- WARP_UCODE_SIZE(warp_g200_tgzs) +
-- WARP_UCODE_SIZE(warp_g200_tgzsa) +
-- WARP_UCODE_SIZE(warp_g200_tgzsaf) + WARP_UCODE_SIZE(warp_g200_tgzsf));
--
--unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv)
-+#define WARP_UCODE_SIZE(size) ALIGN(size, MGA_WARP_CODE_ALIGN)
-+
-+int mga_warp_install_microcode(drm_mga_private_t * dev_priv)
- {
-+ unsigned char *vcbase = dev_priv->warp->handle;
-+ unsigned long pcbase = dev_priv->warp->offset;
-+ const char *firmware_name;
-+ struct platform_device *pdev;
-+ const struct firmware *fw = NULL;
-+ const struct ihex_binrec *rec;
-+ unsigned int size;
-+ int n_pipes, where;
-+ int rc = 0;
-+
- switch (dev_priv->chipset) {
- case MGA_CARD_TYPE_G400:
- case MGA_CARD_TYPE_G550:
-- return PAGE_ALIGN(mga_warp_g400_microcode_size);
-+ firmware_name = FIRMWARE_G400;
-+ n_pipes = MGA_MAX_G400_PIPES;
-+ break;
- case MGA_CARD_TYPE_G200:
-- return PAGE_ALIGN(mga_warp_g200_microcode_size);
-+ firmware_name = FIRMWARE_G200;
-+ n_pipes = MGA_MAX_G200_PIPES;
-+ break;
- default:
-- return 0;
-+ return -EINVAL;
- }
--}
--
--static int mga_warp_install_g400_microcode(drm_mga_private_t * dev_priv)
--{
-- unsigned char *vcbase = dev_priv->warp->handle;
-- unsigned long pcbase = dev_priv->warp->offset;
--
-- memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
--
-- WARP_UCODE_INSTALL(warp_g400_tgz, MGA_WARP_TGZ);
-- WARP_UCODE_INSTALL(warp_g400_tgzf, MGA_WARP_TGZF);
-- WARP_UCODE_INSTALL(warp_g400_tgza, MGA_WARP_TGZA);
-- WARP_UCODE_INSTALL(warp_g400_tgzaf, MGA_WARP_TGZAF);
-- WARP_UCODE_INSTALL(warp_g400_tgzs, MGA_WARP_TGZS);
-- WARP_UCODE_INSTALL(warp_g400_tgzsf, MGA_WARP_TGZSF);
-- WARP_UCODE_INSTALL(warp_g400_tgzsa, MGA_WARP_TGZSA);
-- WARP_UCODE_INSTALL(warp_g400_tgzsaf, MGA_WARP_TGZSAF);
--
-- WARP_UCODE_INSTALL(warp_g400_t2gz, MGA_WARP_T2GZ);
-- WARP_UCODE_INSTALL(warp_g400_t2gzf, MGA_WARP_T2GZF);
-- WARP_UCODE_INSTALL(warp_g400_t2gza, MGA_WARP_T2GZA);
-- WARP_UCODE_INSTALL(warp_g400_t2gzaf, MGA_WARP_T2GZAF);
-- WARP_UCODE_INSTALL(warp_g400_t2gzs, MGA_WARP_T2GZS);
-- WARP_UCODE_INSTALL(warp_g400_t2gzsf, MGA_WARP_T2GZSF);
-- WARP_UCODE_INSTALL(warp_g400_t2gzsa, MGA_WARP_T2GZSA);
-- WARP_UCODE_INSTALL(warp_g400_t2gzsaf, MGA_WARP_T2GZSAF);
--
-- return 0;
--}
--
--static int mga_warp_install_g200_microcode(drm_mga_private_t * dev_priv)
--{
-- unsigned char *vcbase = dev_priv->warp->handle;
-- unsigned long pcbase = dev_priv->warp->offset;
--
-- memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
--
-- WARP_UCODE_INSTALL(warp_g200_tgz, MGA_WARP_TGZ);
-- WARP_UCODE_INSTALL(warp_g200_tgzf, MGA_WARP_TGZF);
-- WARP_UCODE_INSTALL(warp_g200_tgza, MGA_WARP_TGZA);
-- WARP_UCODE_INSTALL(warp_g200_tgzaf, MGA_WARP_TGZAF);
-- WARP_UCODE_INSTALL(warp_g200_tgzs, MGA_WARP_TGZS);
-- WARP_UCODE_INSTALL(warp_g200_tgzsf, MGA_WARP_TGZSF);
-- WARP_UCODE_INSTALL(warp_g200_tgzsa, MGA_WARP_TGZSA);
-- WARP_UCODE_INSTALL(warp_g200_tgzsaf, MGA_WARP_TGZSAF);
-
-- return 0;
--}
-+ pdev = platform_device_register_simple("mga_warp", 0, NULL, 0);
-+ if (IS_ERR(pdev)) {
-+ DRM_ERROR("mga: Failed to register microcode\n");
-+ return PTR_ERR(pdev);
-+ }
-+ rc = request_ihex_firmware(&fw, firmware_name, &pdev->dev);
-+ platform_device_unregister(pdev);
-+ if (rc) {
-+ DRM_ERROR("mga: Failed to load microcode \"%s\"\n",
-+ firmware_name);
-+ return rc;
-+ }
-
--int mga_warp_install_microcode(drm_mga_private_t * dev_priv)
--{
-- const unsigned int size = mga_warp_microcode_size(dev_priv);
-+ size = 0;
-+ where = 0;
-+ for (rec = (const struct ihex_binrec *)fw->data;
-+ rec;
-+ rec = ihex_next_binrec(rec)) {
-+ size += WARP_UCODE_SIZE(be16_to_cpu(rec->len));
-+ where++;
-+ }
-
-+ if (where != n_pipes) {
-+ DRM_ERROR("mga: Invalid microcode \"%s\"\n", firmware_name);
-+ rc = -EINVAL;
-+ goto out;
-+ }
-+ size = PAGE_ALIGN(size);
- DRM_DEBUG("MGA ucode size = %d bytes\n", size);
- if (size > dev_priv->warp->size) {
- DRM_ERROR("microcode too large! (%u > %lu)\n",
- size, dev_priv->warp->size);
-- return -ENOMEM;
-+ rc = -ENOMEM;
-+ goto out;
- }
-
-- switch (dev_priv->chipset) {
-- case MGA_CARD_TYPE_G400:
-- case MGA_CARD_TYPE_G550:
-- return mga_warp_install_g400_microcode(dev_priv);
-- case MGA_CARD_TYPE_G200:
-- return mga_warp_install_g200_microcode(dev_priv);
-- default:
-- return -EINVAL;
-+ memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
-+
-+ where = 0;
-+ for (rec = (const struct ihex_binrec *)fw->data;
-+ rec;
-+ rec = ihex_next_binrec(rec)) {
-+ unsigned int src_size, dst_size;
-+
-+ DRM_DEBUG(" pcbase = 0x%08lx vcbase = %p\n", pcbase, vcbase);
-+ dev_priv->warp_pipe_phys[where] = pcbase;
-+ src_size = be16_to_cpu(rec->len);
-+ dst_size = WARP_UCODE_SIZE(src_size);
-+ memcpy(vcbase, rec->data, src_size);
-+ pcbase += dst_size;
-+ vcbase += dst_size;
-+ where++;
- }
-+
-+out:
-+ release_firmware(fw);
-+ return rc;
- }
-
- #define WMISC_EXPECTED (MGA_WUCODECACHE_ENABLE | MGA_WMASTER_ENABLE)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-22 18:13:47 +0000