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

ati.accelerant: 64 bit fixes

Browse Source 
Change-Id: I0f82dfe7bc73122546d262ab7e94010f1adff500
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4115
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
X512
2021-07-03 09:13:57 +00:00
committed by Adrien Destugues
parent 5a1731bcbc
commit 72e0f9bff5
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/definitions/regular
+2 -1
View File
@@ -110,6 +110,7 @@ SYSTEM_ADD_ONS_DRIVERS_BT_H2 +=
; ;
SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
ati.accelerant
x86,x86_64 @{ x86,x86_64 @{
intel_810.accelerant intel_extreme.accelerant intel_810.accelerant intel_extreme.accelerant
matrox.accelerant matrox.accelerant
@@ -118,7 +119,7 @@ SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
via.accelerant via.accelerant
}@ # x86,x86_64 }@ # x86,x86_64
x86 @{ x86 @{
3dfx.accelerant ati.accelerant neomagic.accelerant s3.accelerant 3dfx.accelerant neomagic.accelerant s3.accelerant
}@ # x86 }@ # x86
] ; ] ;
src/add-ons/accelerants/ati/mach64_overlay.cpp
+2 -2
View File
@@ -122,8 +122,8 @@ Mach64_DisplayOverlay(const overlay_window* window,
OUTREG(VIDEO_FORMAT, videoFormat); OUTREG(VIDEO_FORMAT, videoFormat);
// Compute offset of overlay buffer in the video memory. // Compute offset of overlay buffer in the video memory.
uint32 offset = uint32(buffer->buffer) - si.videoMemAddr; uint32 offset = (uint32)((addr_t)buffer->buffer - si.videoMemAddr);
if (si.chipType < MACH64_264VTB) { if (si.chipType < MACH64_264VTB) {
OUTREG(BUF0_OFFSET, offset); OUTREG(BUF0_OFFSET, offset);
OUTREG(BUF0_PITCH, buffer->width); OUTREG(BUF0_PITCH, buffer->width);
src/add-ons/accelerants/ati/overlay.cpp
+2 -2
View File
@@ -264,7 +264,7 @@ ReleaseOverlay(overlay_token overlayToken)
{ {
SharedInfo& si = *gInfo.sharedInfo; SharedInfo& si = *gInfo.sharedInfo;
if (overlayToken != (overlay_token)si.overlayToken) { if (overlayToken != (overlay_token)(addr_t)si.overlayToken) {
TRACE("ReleaseOverlay() error - no overlay previously allocated\n"); TRACE("ReleaseOverlay() error - no overlay previously allocated\n");
return B_BAD_VALUE; return B_BAD_VALUE;
} }
@@ -285,7 +285,7 @@ ConfigureOverlay(overlay_token overlayToken, const overlay_buffer* buffer,
{ {
SharedInfo& si = *gInfo.sharedInfo; SharedInfo& si = *gInfo.sharedInfo;
if (overlayToken != (overlay_token)si.overlayToken) if (overlayToken != (overlay_token)(addr_t)si.overlayToken)
return B_BAD_VALUE; return B_BAD_VALUE;
if (buffer == NULL) if (buffer == NULL)
src/add-ons/accelerants/ati/rage128_overlay.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ Rage128_DisplayOverlay(const overlay_window* window,
int32 p1_v_accum_init = ((tmp << 4) & 0x03ff8000) | 0x00000001; int32 p1_v_accum_init = ((tmp << 4) & 0x03ff8000) | 0x00000001;
// Compute offset of overlay buffer in the video memory. // Compute offset of overlay buffer in the video memory.
uint32 offset = uint32(buffer->buffer) - si.videoMemAddr; uint32 offset = (uint32)((addr_t)buffer->buffer - si.videoMemAddr);
OUTREG(R128_OV0_REG_LOAD_CNTL, 1); OUTREG(R128_OV0_REG_LOAD_CNTL, 1);
while (!(INREG(R128_OV0_REG_LOAD_CNTL) & (1 << 3))) while (!(INREG(R128_OV0_REG_LOAD_CNTL) & (1 << 3)))