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

* start using DCE versions in framebuffer code as it

Browse Source 
gives us finer control


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42898 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-10-21 22:44:23 +00:00
parent 72bc31d759
commit bbf37742d3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/display.cpp
+7 -7
View File
@@ -846,7 +846,7 @@ display_crtc_scale(uint8 crtcID, display_mode *mode)
args.ucScaler = crtcID; args.ucScaler = crtcID;
args.ucEnable = ATOM_SCALER_EXPANSION; args.ucEnable = ATOM_SCALER_EXPANSION;
atom_execute_table(gAtomContext, index, (uint32 *)&args); atom_execute_table(gAtomContext, index, (uint32*)&args);
} }
@@ -857,7 +857,7 @@ display_crtc_fb_set(uint8 crtcID, display_mode *mode)
register_info* regs = gDisplay[crtcID]->regs; register_info* regs = gDisplay[crtcID]->regs;
uint32 fbSwap; uint32 fbSwap;
if (info.device_chipset >= RADEON_R1000) if (info.dceMajor >= 4)
fbSwap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_NONE); fbSwap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_NONE);
else else
fbSwap = R600_D1GRPH_SWAP_ENDIAN_NONE; fbSwap = R600_D1GRPH_SWAP_ENDIAN_NONE;
@@ -871,7 +871,7 @@ display_crtc_fb_set(uint8 crtcID, display_mode *mode)
case B_CMAP8: case B_CMAP8:
bytesPerPixel = 1; bytesPerPixel = 1;
bitsPerPixel = 8; bitsPerPixel = 8;
if (info.device_chipset >= RADEON_R1000) { // DCE4 if (info.dceMajor >= 4) {
fbFormat = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_8BPP) fbFormat = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_8BPP)
| EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_INDEXED)); | EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_INDEXED));
} else { } else {
@@ -882,7 +882,7 @@ display_crtc_fb_set(uint8 crtcID, display_mode *mode)
case B_RGB15_LITTLE: case B_RGB15_LITTLE:
bytesPerPixel = 2; bytesPerPixel = 2;
bitsPerPixel = 15; bitsPerPixel = 15;
if (info.device_chipset >= RADEON_R1000) { // DCE4 if (info.dceMajor >= 4) {
fbFormat = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP) fbFormat = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP)
| EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB1555)); | EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB1555));
} else { } else {
@@ -894,7 +894,7 @@ display_crtc_fb_set(uint8 crtcID, display_mode *mode)
bytesPerPixel = 2; bytesPerPixel = 2;
bitsPerPixel = 16; bitsPerPixel = 16;
if (info.device_chipset >= RADEON_R1000) { // DCE4 if (info.dceMajor >= 4) {
fbFormat = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP) fbFormat = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP)
| EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB565)); | EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB565));
#ifdef __POWERPC__ #ifdef __POWERPC__
@@ -914,7 +914,7 @@ display_crtc_fb_set(uint8 crtcID, display_mode *mode)
default: default:
bytesPerPixel = 4; bytesPerPixel = 4;
bitsPerPixel = 32; bitsPerPixel = 32;
if (info.device_chipset >= RADEON_R1000) { // DCE4 if (info.dceMajor >= 4) {
fbFormat = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_32BPP) fbFormat = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_32BPP)
| EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB8888)); | EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB8888));
#ifdef __POWERPC__ #ifdef __POWERPC__
@@ -974,7 +974,7 @@ display_crtc_fb_set(uint8 crtcID, display_mode *mode)
(viewport_w << 16) | viewport_h); (viewport_w << 16) | viewport_h);
// Pageflip setup // Pageflip setup
if (info.device_chipset >= RADEON_R1000) { // DCE4 if (info.dceMajor >= 4) {
uint32 tmp uint32 tmp
= Read32(OUT, EVERGREEN_GRPH_FLIP_CONTROL + regs->crtcOffset); = Read32(OUT, EVERGREEN_GRPH_FLIP_CONTROL + regs->crtcOffset);
tmp &= ~EVERGREEN_GRPH_SURFACE_UPDATE_H_RETRACE_EN; tmp &= ~EVERGREEN_GRPH_SURFACE_UPDATE_H_RETRACE_EN;