Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ece2be79 authored by Ben Hutchings's avatar Ben Hutchings Committed by Dave Airlie
Browse files

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: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c9c97b8c

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/mga/mga_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/mga/mga_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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);