summarylogtreecommitdiffstats
path: root/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch')
-rw-r--r--0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch31
1 files changed, 2 insertions, 29 deletions
diff --git a/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index 297f2e5530e3..15aee35c0667 100644
--- a/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
@@ -6,11 +6,10 @@ Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
---
drivers/gpu/drm/radeon/r600.c | 8 ++++----
- drivers/gpu/drm/radeon/r600_cp.c | 5 ++++-
- 2 files changed, 8 insertions(+), 5 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index 103f5d0..98f923b4 100644
+index ca4c01f..2062228 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2489,7 +2489,7 @@ int r600_init_microcode(struct radeon_device *rdev)
@@ -49,29 +48,3 @@ index 103f5d0..98f923b4 100644
/* 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 cd3f6ac..b09af51 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
---
-1.9.1
-