diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2009-08-23 13:34:25 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-08-26 20:46:54 -0400 |
commit | ece2be7993cc5e269cbf0cad6442b401a2c31915 (patch) | |
tree | fff6ae1334506dd41a4f84b95e3830b269f70d59 /drivers/gpu/drm/mga/mga_dma.c | |
parent | c9c97b8c75019814d8c007059bc827bb475be917 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/mga/mga_dma.c')
-rw-r--r-- | drivers/gpu/drm/mga/mga_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
444 | { | 444 | { |
445 | drm_mga_private_t *const dev_priv = | 445 | drm_mga_private_t *const dev_priv = |
446 | (drm_mga_private_t *) dev->dev_private; | 446 | (drm_mga_private_t *) dev->dev_private; |
447 | unsigned int warp_size = mga_warp_microcode_size(dev_priv); | 447 | unsigned int warp_size = MGA_WARP_UCODE_SIZE; |
448 | int err; | 448 | int err; |
449 | unsigned offset; | 449 | unsigned offset; |
450 | const unsigned secondary_size = dma_bs->secondary_bin_count | 450 | const unsigned secondary_size = dma_bs->secondary_bin_count |
@@ -619,7 +619,7 @@ static int mga_do_pci_dma_bootstrap(struct drm_device * dev, | |||
619 | { | 619 | { |
620 | drm_mga_private_t *const dev_priv = | 620 | drm_mga_private_t *const dev_priv = |
621 | (drm_mga_private_t *) dev->dev_private; | 621 | (drm_mga_private_t *) dev->dev_private; |
622 | unsigned int warp_size = mga_warp_microcode_size(dev_priv); | 622 | unsigned int warp_size = MGA_WARP_UCODE_SIZE; |
623 | unsigned int primary_size; | 623 | unsigned int primary_size; |
624 | unsigned int bin_count; | 624 | unsigned int bin_count; |
625 | int err; | 625 | int err; |