Commit d0d0b2da authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

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

They both define radeon_engine_reset. Here's a fix (from Panagiotis Papadakos).
parent a3500b9e
......@@ -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) &&
......
......@@ -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 */
......
......@@ -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();
}
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment