[PATCH] Fix a link conflict between radeonfb and the radeon DRI

They both define radeon_engine_reset. Here's a fix (from Panagiotis Papadakos).

diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index f05a2d50fb6fb9dd9ed3d06e40d833468e9a73e7..aefff282443cfacda85b55d2f84ed7823909ae14 100644 (file)
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -126,7 +126,7 @@ int radeonfb_sync(struct fb_info *info)
        return 0;
 }
 
-void radeon_engine_reset(struct radeonfb_info *rinfo)
+void radeonfb_engine_reset(struct radeonfb_info *rinfo)
 {
        u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset;
        u32 host_path_cntl;
@@ -222,14 +222,14 @@ void radeon_engine_reset(struct radeonfb_info *rinfo)
                R300_cg_workardound(rinfo);
 }
 
-void radeon_engine_init (struct radeonfb_info *rinfo)
+void radeonfb_engine_init (struct radeonfb_info *rinfo)
 {
        unsigned long temp;
 
        /* disable 3D engine */
        OUTREG(RB3D_CNTL, 0);
 
-       radeon_engine_reset(rinfo);
+       radeonfb_engine_reset(rinfo);
 
        radeon_fifo_wait (1);
        if ((rinfo->family != CHIP_FAMILY_R300) &&

diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index c8b6c18352143f35ecc0a61f1706645b02f4e7a1..96a79866977a76eec31b7bc2c7852738956429e4 100644 (file)
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1662,7 +1662,7 @@ int radeonfb_set_par(struct fb_info *info)
                radeon_write_mode (rinfo, &newmode);
                /* (re)initialize the engine */
                if (!radeon_accel_disabled())
-                       radeon_engine_init (rinfo);
+                       radeonfb_engine_init (rinfo);
        
        }
        /* Update fix */

diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 39147a4ef897b0e2e06ec6d77cf68c9c9dac97ce..8bc80fa6fc417ca967971fd8efb12445948a9ce1 100644 (file)
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -862,7 +862,7 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, u32 state)
        if (!radeon_accel_disabled()) {
                /* Make sure engine is reset */
                radeon_engine_idle();
-               radeon_engine_reset(rinfo);
+               radeonfb_engine_reset(rinfo);
                radeon_engine_idle();
        }
 

diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 4e3fe0f3e5aab19a4e4f5c37494153a4fd7bed8b..4d55ab468ddb80108c05650901f14cd53f0ebb50 100644 (file)
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -556,8 +556,8 @@ extern void radeonfb_fillrect(struct fb_info *info, const struct fb_fillrect *re
 extern void radeonfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
 extern void radeonfb_imageblit(struct fb_info *p, const struct fb_image *image);
 extern int radeonfb_sync(struct fb_info *info);
-extern void radeon_engine_init (struct radeonfb_info *rinfo);
-extern void radeon_engine_reset(struct radeonfb_info *rinfo);
+extern void radeonfb_engine_init (struct radeonfb_info *rinfo);
+extern void radeonfb_engine_reset(struct radeonfb_info *rinfo);
 
 /* Other functions */
 extern int radeonfb_blank(int blank, struct fb_info *info);