fixup radeon stuff - need to checkout irqs

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index b370e01..392abaf 100644 (file)
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -44,7 +44,7 @@ nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
 radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o radeon_gem.o \
         radeon_buffer.o radeon_fence.o atom.o radeon_display.o radeon_atombios.o radeon_i2c.o radeon_connectors.o radeon_cs.o \
        atombios_crtc.o radeon_encoders.o radeon_fb.o radeon_combios.o radeon_legacy_crtc.o radeon_legacy_encoders.o \
-       radeon_cursor.o
+       radeon_cursor.o radeon_pm.o
 sis-objs    := sis_drv.o sis_mm.o
 ffb-objs    := ffb_drv.o ffb_context.o
 savage-objs := savage_drv.o savage_bci.o savage_state.o

diff --git a/linux-core/radeon_mode.h b/linux-core/radeon_mode.h
index 261bf8e..a4ee78a 100644 (file)
--- a/linux-core/radeon_mode.h
+++ b/linux-core/radeon_mode.h
@@ -326,5 +326,12 @@ void radeon_rmx_mode_fixup(struct drm_encoder *encoder,
                           struct drm_display_mode *mode,
                           struct drm_display_mode *adjusted_mode);
 void radeon_enc_destroy(struct drm_encoder *encoder);
+void radeon_emit_copy_blit(struct drm_device * dev,
+                          uint32_t src_offset,
+                          uint32_t dst_offset,
+                          uint32_t pages);
+void radeon_copy_fb(struct drm_device *dev, struct drm_gem_object *dst_obj);
+void radeon_combios_asic_init(struct drm_device *dev);
+extern int radeon_static_clocks_init(struct drm_device *dev);
 
 #endif

diff --git a/linux-core/radeon_pm.c b/linux-core/radeon_pm.c
index c7a57b9..e9a6130 100644 (file)
--- a/linux-core/radeon_pm.c
+++ b/linux-core/radeon_pm.c
@@ -151,7 +151,7 @@ int radeon_resume(struct drm_device *dev)
        /* reset swi reg */
        RADEON_WRITE(RADEON_LAST_SWI_REG, dev_priv->counter);
 
-       radeon_enable_interrupt(dev);
+//     radeon_enable_interrupt(dev);
 
        /* reset the context for userspace */
        if (dev->primary->master) {