diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r420.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r420.c | 9 | 
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index c7593b8f58e..c2bda4ad62e 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c @@ -26,9 +26,11 @@   *          Jerome Glisse   */  #include <linux/seq_file.h> +#include <linux/slab.h>  #include "drmP.h"  #include "radeon_reg.h"  #include "radeon.h" +#include "radeon_asic.h"  #include "atom.h"  #include "r100d.h"  #include "r420d.h" @@ -57,6 +59,12 @@ void r420_pipes_init(struct radeon_device *rdev)  	/* get max number of pipes */  	gb_pipe_select = RREG32(0x402C);  	num_pipes = ((gb_pipe_select >> 12) & 3) + 1; + +	/* SE chips have 1 pipe */ +	if ((rdev->pdev->device == 0x5e4c) || +	    (rdev->pdev->device == 0x5e4f)) +		num_pipes = 1; +  	rdev->num_gb_pipes = num_pipes;  	tmp = 0;  	switch (num_pipes) { @@ -266,6 +274,7 @@ int r420_suspend(struct radeon_device *rdev)  void r420_fini(struct radeon_device *rdev)  { +	radeon_pm_fini(rdev);  	r100_cp_fini(rdev);  	r100_wb_fini(rdev);  	r100_ib_fini(rdev);  |