Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Accidently overwrote info.registers which let all subsequent register writes

Browse Source 
(in the kernel driver) fail - or crash the system.
* Waiting for VBLANK now works as expected - you actually have to *set* the bit
  to clear it, isn't that obvious? :-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17443 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-05-13 19:31:00 +00:00
parent 9ca9450e86
commit 63dbc0a8d6
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/private/graphics/intel_extreme/intel_extreme.h
View File

@ -223,6 +223,7 @@ struct intel_free_graphics_memory {
#define DISPLAY_PIPE_ENABLED (1UL << 31) #define DISPLAY_PIPE_ENABLED (1UL << 31)
#define INTEL_DISPLAY_PIPE_STATUS 0x70024 #define INTEL_DISPLAY_PIPE_STATUS 0x70024
#define DISPLAY_PIPE_VBLANK_ENABLED (1UL << 17) #define DISPLAY_PIPE_VBLANK_ENABLED (1UL << 17)
#define DISPLAY_PIPE_VBLANK_STATUS (1UL << 1)
#define INTEL_DISPLAY_PLL 0x06014 #define INTEL_DISPLAY_PLL 0x06014
#define INTEL_DISPLAY_PLL_DIVISOR_0 0x06040 #define INTEL_DISPLAY_PLL_DIVISOR_0 0x06040

26
src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
View File

@ -166,7 +166,7 @@ intel_interrupt_handler(void *data)
{ {
intel_info &info = *(intel_info *)data; intel_info &info = *(intel_info *)data;
uint32 identity = read32(info.registers + INTEL_INTERRUPT_IDENTITY); uint32 identity = read16(info.registers + INTEL_INTERRUPT_IDENTITY);
if (identity == 0) if (identity == 0)
return B_UNHANDLED_INTERRUPT; return B_UNHANDLED_INTERRUPT;
@ -176,10 +176,12 @@ intel_interrupt_handler(void *data)
handled = release_vblank_sem(info); handled = release_vblank_sem(info);
// make sure we'll get another one of those // make sure we'll get another one of those
write32(info.registers + INTEL_DISPLAY_PIPE_STATUS, DISPLAY_PIPE_VBLANK_ENABLED); write32(info.registers + INTEL_DISPLAY_PIPE_STATUS, DISPLAY_PIPE_VBLANK_STATUS);
write32(info.registers + INTEL_INTERRUPT_IDENTITY, 0);
} }
// setting the bit clears it!
write16(info.registers + INTEL_INTERRUPT_IDENTITY, identity);
return handled; return handled;
} }
@ -209,15 +211,16 @@ init_interrupt_handler(intel_info &info)
info.fake_interrupts = false; info.fake_interrupts = false;
status = install_io_interrupt_handler(info.pci->u.h0.interrupt_line, status = install_io_interrupt_handler(info.pci->u.h0.interrupt_line,
intel_interrupt_handler, (void *)&info, 0); &intel_interrupt_handler, (void *)&info, 0);
if (status == B_OK) { if (status == B_OK) {
// enable interrupts - we only want VBLANK interrupts // enable interrupts - we only want VBLANK interrupts
write32(info.registers + INTEL_INTERRUPT_ENABLED, INTERRUPT_VBLANK); write16(info.registers + INTEL_INTERRUPT_ENABLED,
write32(info.registers + INTEL_INTERRUPT_MASK, ~INTERRUPT_VBLANK); read16(info.registers + INTEL_INTERRUPT_ENABLED) | INTERRUPT_VBLANK);
write16(info.registers + INTEL_INTERRUPT_MASK, ~INTERRUPT_VBLANK);
write32(info.registers + INTEL_DISPLAY_PIPE_STATUS, write32(info.registers + INTEL_DISPLAY_PIPE_STATUS,
DISPLAY_PIPE_VBLANK_ENABLED); DISPLAY_PIPE_VBLANK_STATUS);
write32(info.registers + INTEL_INTERRUPT_IDENTITY, 0); write16(info.registers + INTEL_INTERRUPT_IDENTITY, ~0);
} }
} }
if (status < B_OK) { if (status < B_OK) {
@ -412,9 +415,10 @@ intel_extreme_init(intel_info &info)
set_gtt_entry(info, totalSize, info.shared_info->physical_cursor_memory); set_gtt_entry(info, totalSize, info.shared_info->physical_cursor_memory);
AreaKeeper cursorMapper; AreaKeeper cursorMapper;
void *cursorMemory;
info.cursor_area = cursorMapper.Map("intel extreme cursor", info.cursor_area = cursorMapper.Map("intel extreme cursor",
(void *)(info.shared_info->physical_graphics_memory + totalSize), (void *)(info.shared_info->physical_graphics_memory + totalSize),
B_PAGE_SIZE, B_ANY_KERNEL_ADDRESS, 0, (void **)&info.registers); B_PAGE_SIZE, B_ANY_KERNEL_ADDRESS, 0, &cursorMemory);
if (cursorMapper.InitCheck() < B_OK) { if (cursorMapper.InitCheck() < B_OK) {
// we can't do a hardware cursor, then... // we can't do a hardware cursor, then...
} }
@ -438,8 +442,8 @@ intel_extreme_uninit(intel_info &info)
if (!info.fake_interrupts && info.shared_info->vblank_sem > 0) { if (!info.fake_interrupts && info.shared_info->vblank_sem > 0) {
// disable interrupt generation // disable interrupt generation
write32(info.registers + INTEL_INTERRUPT_ENABLED, 0); write16(info.registers + INTEL_INTERRUPT_ENABLED, 0);
write32(info.registers + INTEL_INTERRUPT_MASK, ~0); write16(info.registers + INTEL_INTERRUPT_MASK, ~0);
remove_io_interrupt_handler(info.pci->u.h0.interrupt_line, remove_io_interrupt_handler(info.pci->u.h0.interrupt_line,
intel_interrupt_handler, &info); intel_interrupt_handler, &info);