Subversion Repositories Kolibri OS

Rev

Rev 6104 | Rev 6938 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6104 Rev 6661
Line 33... Line 33...
33 
#include
33 
#include
34 
#include "radeon_reg.h"
 34 
#include "radeon_reg.h"
35 
#include "radeon.h"
 35 
#include "radeon.h"
36 
#include "atom.h"
 36 
#include "atom.h"
Line 37... Line -...
37 
 
 - 
 
38 
#include "bitmap.h"
 37 
 
Line 39... Line 38...
39 
#include "display.h"
 38 
#include "display.h"
Line 823... Line 822...
823 
	rdev->dummy_page.page = alloc_page(GFP_DMA32 | GFP_KERNEL | __GFP_ZERO);
 822 
	rdev->dummy_page.page = alloc_page(GFP_DMA32 | GFP_KERNEL | __GFP_ZERO);
824 
	if (rdev->dummy_page.page == NULL)
 823 
	if (rdev->dummy_page.page == NULL)
825 
		return -ENOMEM;
 824 
		return -ENOMEM;
826 
	rdev->dummy_page.addr = pci_map_page(rdev->pdev, rdev->dummy_page.page,
 825 
	rdev->dummy_page.addr = pci_map_page(rdev->pdev, rdev->dummy_page.page,
827 
					0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
 826 
					0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
- 
 
 827 
	rdev->dummy_page.entry = radeon_gart_get_page_entry(rdev->dummy_page.addr,
- 
 
 828 
							    RADEON_GART_PAGE_DUMMY);
828 
	return 0;
 829 
	return 0;
829 
}
 830 
}
Line 830... Line 831...
830 
 
 831 
 
831 
/**
 832 
/**
Line 1472... Line 1473...
1472 
	if (!rdev->needs_reset) {
 1473 
	if (!rdev->needs_reset) {
1473 
		up_write(&rdev->exclusive_lock);
 1474 
		up_write(&rdev->exclusive_lock);
1474 
		return 0;
 1475 
		return 0;
1475 
	}
 1476 
	}
Line -... Line 1477...
- 
 
 1477 
 
- 
 
 1478 
	atomic_inc(&rdev->gpu_reset_counter);
1476 
 
 1479 
 
1477 
    radeon_save_bios_scratch_regs(rdev);
 1480 
    radeon_save_bios_scratch_regs(rdev);
1478 
    /* block TTM */
 1481 
    /* block TTM */
1479 
//    resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev);
 1482 
//    resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev);