i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel_extreme: fix width of interrupt register.

Browse Source 
The driver had been using 16 bit reads and write (introduced by Axel in
2006), but the hardware documentation (released in 2008) says the
register is 32bit. Use 32bit since that makes the code identical to
what's used for later devices.

If 16bit is needed, it's only for the pre-2008 devices.
This commit is contained in:
Adrien Destugues
2020-02-09 17:32:27 +01:00
parent 015fbeab9c
commit af8d74ae10
1 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
+14 -36
View File
@@ -150,10 +150,7 @@ intel_interrupt_handler(void* data)
bool hasPCH = (info.pch_info != INTEL_PCH_NONE); bool hasPCH = (info.pch_info != INTEL_PCH_NONE);
uint32 identity; uint32 identity;
if (hasPCH) identity = read32(info, reg);
identity = read32(info, reg);
else
identity = read16(info, reg);
if (identity == 0) if (identity == 0)
return B_UNHANDLED_INTERRUPT; return B_UNHANDLED_INTERRUPT;
@@ -182,7 +179,7 @@ intel_interrupt_handler(void* data)
} }
#if 0 #if 0
// FIXME we don't have supprot for the 3rd pipe yet // FIXME we don't have support for the 3rd pipe yet
mask = hasPCH ? PCH_INTERRUPT_VBLANK_PIPEC mask = hasPCH ? PCH_INTERRUPT_VBLANK_PIPEC
: 0; : 0;
if ((identity & mask) != 0) { if ((identity & mask) != 0) {
@@ -195,13 +192,9 @@ intel_interrupt_handler(void* data)
#endif #endif
// setting the bit clears it! // setting the bit clears it!
if (hasPCH) { write32(info, reg, identity);
write32(info, reg, identity); // update our identity register with the remaining interupts
identity = read32(info, reg); identity = read32(info, reg);
} else {
write16(info, reg, identity);
identity = read16(info, reg);
}
} }
return handled; return handled;
@@ -239,7 +232,7 @@ init_interrupt_handler(intel_info &info)
info.pci->function, 1, &msiVector) == B_OK info.pci->function, 1, &msiVector) == B_OK
&& gPCIx86Module->enable_msi(info.pci->bus, info.pci->device, && gPCIx86Module->enable_msi(info.pci->bus, info.pci->device,
info.pci->function) == B_OK) { info.pci->function) == B_OK) {
ERROR("using message signaled interrupts\n"); TRACE("using message signaled interrupts\n");
info.irq = msiVector; info.irq = msiVector;
info.use_msi = true; info.use_msi = true;
} }
@@ -263,22 +256,12 @@ init_interrupt_handler(intel_info &info)
uint32 enable = intel_get_interrupt_mask(info, uint32 enable = intel_get_interrupt_mask(info,
INTEL_PIPE_A | INTEL_PIPE_B, true); INTEL_PIPE_A | INTEL_PIPE_B, true);
if (hasPCH) { // Clear all the interrupts
// Clear all the interrupts write32(info, find_reg(info, INTEL_INTERRUPT_IDENTITY), ~0);
write32(info, find_reg(info, INTEL_INTERRUPT_IDENTITY), ~0);
// enable interrupts - we only want VBLANK interrupts
write32(info, find_reg(info, INTEL_INTERRUPT_ENABLED), enable);
write32(info, find_reg(info, INTEL_INTERRUPT_MASK), ~enable);
} else {
// Clear all the interrupts
write16(info, find_reg(info, INTEL_INTERRUPT_IDENTITY), ~0);
// enable interrupts - we only want VBLANK interrupts
write16(info, find_reg(info, INTEL_INTERRUPT_ENABLED), enable);
write16(info, find_reg(info, INTEL_INTERRUPT_MASK), ~enable);
}
// enable interrupts - we only want VBLANK interrupts
write32(info, find_reg(info, INTEL_INTERRUPT_ENABLED), enable);
write32(info, find_reg(info, INTEL_INTERRUPT_MASK), ~enable);
} }
} }
if (status < B_OK) { if (status < B_OK) {
@@ -288,7 +271,7 @@ init_interrupt_handler(intel_info &info)
info.fake_interrupts = true; info.fake_interrupts = true;
// TODO: fake interrupts! // TODO: fake interrupts!
TRACE("Fake interrupt mode (no PCI interrupt line assigned\n"); ERROR("Fake interrupt mode (no PCI interrupt line assigned\n");
status = B_ERROR; status = B_ERROR;
} }
@@ -570,13 +553,8 @@ intel_extreme_uninit(intel_info &info)
bool hasPCH = (info.pch_info != INTEL_PCH_NONE); bool hasPCH = (info.pch_info != INTEL_PCH_NONE);
// disable interrupt generation // disable interrupt generation
if (hasPCH) { write32(info, find_reg(info, INTEL_INTERRUPT_ENABLED), 0);
write32(info, find_reg(info, INTEL_INTERRUPT_ENABLED), 0); write32(info, find_reg(info, INTEL_INTERRUPT_MASK), ~0);
write32(info, find_reg(info, INTEL_INTERRUPT_MASK), ~0);
} else {
write16(info, find_reg(info, INTEL_INTERRUPT_ENABLED), 0);
write16(info, find_reg(info, INTEL_INTERRUPT_MASK), ~0);
}
remove_io_interrupt_handler(info.irq, intel_interrupt_handler, &info); remove_io_interrupt_handler(info.irq, intel_interrupt_handler, &info);