diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-08-05 17:38:11 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-08-05 17:38:11 -0300 |
| commit | d77340aa88148fa7ad01f14870740e81cf942561 (patch) | |
| tree | cd115670cf1fdc67356822056efc43d80a8a184f /drivers/gpu | |
| parent | 57f0f512b273f60d52568b8c6b77e17f5636edc0 (diff) | |
Making the radeon kernel module work again -> https://lists.parabola.nu/pipermail/dev/2015-August/003171.html
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_cp.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 720e5997e..d6a92ba73 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2442,7 +2442,7 @@ int r600_init_microcode(struct radeon_device *rdev) } DRM_INFO("Loading %s Microcode\n", chip_name); - +#if 0 snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name); err = reject_firmware(&rdev->pfp_fw, fw_name, rdev->dev); if (err) @@ -2494,7 +2494,7 @@ int r600_init_microcode(struct radeon_device *rdev) err = -EINVAL; } } - +#endif out: if (err) { if (err != -EINVAL) @@ -3154,7 +3154,7 @@ int r600_init(struct radeon_device *rdev) r = radeon_bo_init(rdev); if (r) return r; - +#if 0 if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { r = r600_init_microcode(rdev); if (r) { @@ -3162,7 +3162,7 @@ int r600_init(struct radeon_device *rdev) return r; } } - +#endif /* Initialize power management */ radeon_pm_init(rdev); diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index af15260d4..f138df9a9 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c @@ -2241,7 +2241,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, else r600_vm_init(dev); } - +#if 0 if (!dev_priv->me_fw || !dev_priv->pfp_fw) { int err = r600_cp_init_microcode(dev_priv); if (err) { @@ -2250,6 +2250,9 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init, return err; } } +#endif + printk("Skipping firmware loading\n"); +#endif if (((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)) r700_cp_load_microcode(dev_priv); else |