sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

make vidintel work on pineview videocards

Browse Source 
git-svn-id: svn://kolibrios.org@3708 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2013-06-26 17:49:53 +00:00
parent 21c6048a8f
commit b457ca5b59
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/trunk/drivers/vidintel.asm
View File

@ -310,7 +310,9 @@ if 1
end if end if
and byte [esi+7000Bh], not 80h ; PIPEACONF: disable pipe and byte [esi+7000Bh], not 80h ; PIPEACONF: disable pipe
and byte [esi+7100Bh], not 80h ; PIPEBCONF: disable pipe and byte [esi+7100Bh], not 80h ; PIPEBCONF: disable pipe
if 1 cmp [deviceType], gen4_start
jb .wait_watching_scanline
; g45 and later: use special flag from PIPE*CONF
mov edx, 10000h mov edx, 10000h
@@: @@:
mov ecx, 1000h mov ecx, 1000h
@ -319,20 +321,17 @@ if 1
jz @f jz @f
dec edx dec edx
jnz @b jnz @b
.not_disabled: jmp .not_disabled
sti
jmp .return
@@: @@:
test byte [esi+7100Bh], 40h ; PIPEBCONF: wait until pipe disabled test byte [esi+7100Bh], 40h ; PIPEBCONF: wait until pipe disabled
jz @f jz .disabled
mov ecx, 1000h mov ecx, 1000h
loop $ loop $
dec edx dec edx
jnz @b jnz @b
jmp .not_disabled jmp .not_disabled
@@: ; pineview and before: wait while scanline still changes
else .wait_watching_scanline:
; alternative way of waiting for pipe stop, works too
mov edx, 1000h mov edx, 1000h
.dis1: .dis1:
push dword [esi+71000h] push dword [esi+71000h]
@ -354,7 +353,6 @@ else
sti sti
jmp .return jmp .return
.disabled: .disabled:
end if
lea eax, [esi+61183h] lea eax, [esi+61183h]
cmp [deviceType], ironlake_start cmp [deviceType], ironlake_start
jb @f jb @f
@ -378,6 +376,7 @@ end if
and ecx, not 15 and ecx, not 15
shl ecx, 2 shl ecx, 2
mov dword [edx+10188h], ecx ; DSPASTRIDE: set scanline length mov dword [edx+10188h], ecx ; DSPASTRIDE: set scanline length
mov dword [edx+10184h], 0 ; DSPALINOFF: force write to DSPA* registers
and byte [esi+61233h], not 80h ; PFIT_CONTROL: disable panel fitting and byte [esi+61233h], not 80h ; PFIT_CONTROL: disable panel fitting
or byte [edx+1000Bh], 80h ; PIPEACONF: enable pipe or byte [edx+1000Bh], 80h ; PIPEACONF: enable pipe
; and byte [edx+1000Ah], not 0Ch ; PIPEACONF: enable Display+Cursor Planes ; and byte [edx+1000Ah], not 0Ch ; PIPEACONF: enable Display+Cursor Planes
@ -437,6 +436,9 @@ i965_start = ($ - pciids) / 2
dw 0x29b2 ; q35g dw 0x29b2 ; q35g
dw 0x29c2 ; g33g dw 0x29c2 ; g33g
dw 0x29d2 ; q33g dw 0x29d2 ; q33g
dw 0xa001 ; pineview
dw 0xa011 ; pineview
gen4_start = ($ - pciids) / 2
dw 0x2a02 ; i965gm dw 0x2a02 ; i965gm
dw 0x2a12 ; i965gm dw 0x2a12 ; i965gm
dw 0x2a42 ; gm45 dw 0x2a42 ; gm45
@ -446,8 +448,6 @@ i965_start = ($ - pciids) / 2
dw 0x2e32 ; g45 dw 0x2e32 ; g45
dw 0x2e42 ; g45 dw 0x2e42 ; g45
dw 0x2e92 ; g45 dw 0x2e92 ; g45
dw 0xa001 ; pineview
dw 0xa011 ; pineview
ironlake_start = ($ - pciids) / 2 ironlake_start = ($ - pciids) / 2
dw 0x0042 ; ironlake_d dw 0x0042 ; ironlake_d
dw 0x0046 ; ironlake_m dw 0x0046 ; ironlake_m