| 25,13 → 25,13 |
|---|
| * Alex Deucher |
| * Jerome Glisse |
| */ |
| #include "drmP.h" |
| #include <drm/drmP.h> |
| #include "radeon.h" |
| #include "radeon_asic.h" |
| #include "atom.h" |
| #include "rs690d.h" |
| |
| static int rs690_mc_wait_for_idle(struct radeon_device *rdev) |
| int rs690_mc_wait_for_idle(struct radeon_device *rdev) |
| { |
| unsigned i; |
| uint32_t tmp; |
| 145,7 → 145,7 |
|---|
| rdev->pm.sideport_bandwidth.full = dfixed_div(rdev->pm.sideport_bandwidth, tmp); |
| } |
| |
| void rs690_mc_init(struct radeon_device *rdev) |
| static void rs690_mc_init(struct radeon_device *rdev) |
| { |
| u64 base; |
| |
| 224,7 → 224,7 |
|---|
| fixed20_12 sclk; |
| }; |
| |
| void rs690_crtc_bandwidth_compute(struct radeon_device *rdev, |
| static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev, |
| struct radeon_crtc *crtc, |
| struct rs690_watermark *wm) |
| { |
| 581,7 → 581,7 |
|---|
| WREG32(R_000078_MC_INDEX, 0x7F); |
| } |
| |
| void rs690_mc_program(struct radeon_device *rdev) |
| static void rs690_mc_program(struct radeon_device *rdev) |
| { |
| struct rv515_mc_save save; |
| |
| 630,11 → 630,14 |
|---|
| dev_err(rdev->dev, "failed initializing CP (%d).\n", r); |
| return r; |
| } |
| r = r100_ib_init(rdev); |
| |
| r = radeon_ib_pool_init(rdev); |
| if (r) { |
| dev_err(rdev->dev, "failed initializing IB (%d).\n", r); |
| dev_err(rdev->dev, "IB initialization failed (%d).\n", r); |
| return r; |
| } |
| |
| |
| return 0; |
| } |
| |
| 698,6 → 701,7 |
|---|
| if (r) |
| return r; |
| rs600_set_safe_registers(rdev); |
| |
| rdev->accel_working = true; |
| r = rs690_startup(rdev); |
| if (r) { |