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

further enhance / cleanup tracing; detect Radeon HD graphics card memory size and store it in shared info

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41459 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-05-12 01:36:51 +00:00
parent fb90397da7
commit e1d1a14430
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp
+20 -10
View File
@@ -1,10 +1,11 @@
/* /*
* Copyright 2006-2010, Haiku, Inc. All Rights Reserved. * Copyright 2006-2011, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Axel Dörfler, [email protected] * Axel Dörfler, [email protected]
* Clemens Zeidler, [email protected] * Clemens Zeidler, [email protected]
* Alexander von Gluck, [email protected]
*/ */
@@ -27,7 +28,7 @@
#define TRACE_DEVICE #define TRACE_DEVICE
#ifdef TRACE_DEVICE #ifdef TRACE_DEVICE
# define TRACE(x) dprintf x # define TRACE(x...) dprintf("radeon_hd: " x)
#else #else
# define TRACE(x) ; # define TRACE(x) ;
#endif #endif
@@ -43,7 +44,7 @@
status_t status_t
radeon_hd_init(radeon_info &info) radeon_hd_init(radeon_info &info)
{ {
TRACE((DEVICE_NAME ": radeon_hd_init() called\n")); TRACE("card(%ld): %s: called\n", info.id, __func__);
// memory mapped I/O // memory mapped I/O
AreaKeeper sharedCreator; AreaKeeper sharedCreator;
@@ -56,6 +57,7 @@ radeon_hd_init(radeon_info &info)
memset((void *)info.shared_info, 0, sizeof(radeon_shared_info)); memset((void *)info.shared_info, 0, sizeof(radeon_shared_info));
// R6xx_R7xx_3D.pdf, 5.3.3.1 SET_CONFIG_REG
AreaKeeper mmioMapper; AreaKeeper mmioMapper;
info.registers_area = mmioMapper.Map("radeon hd mmio", info.registers_area = mmioMapper.Map("radeon hd mmio",
(void *)info.pci->u.h0.base_registers[RHD_MMIO_BAR], (void *)info.pci->u.h0.base_registers[RHD_MMIO_BAR],
@@ -63,7 +65,8 @@ radeon_hd_init(radeon_info &info)
B_ANY_KERNEL_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, B_ANY_KERNEL_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA,
(void **)&info.registers); (void **)&info.registers);
if (mmioMapper.InitCheck() < B_OK) { if (mmioMapper.InitCheck() < B_OK) {
dprintf(DEVICE_NAME ": could not map memory I/O!\n"); dprintf(DEVICE_NAME ": card (%ld): could not map memory I/O!\n",
info.id);
return info.registers_area; return info.registers_area;
} }
@@ -74,7 +77,8 @@ radeon_hd_init(radeon_info &info)
B_ANY_KERNEL_ADDRESS, B_READ_AREA | B_WRITE_AREA, B_ANY_KERNEL_ADDRESS, B_READ_AREA | B_WRITE_AREA,
(void **)&info.shared_info->graphics_memory); (void **)&info.shared_info->graphics_memory);
if (frambufferMapper.InitCheck() < B_OK) { if (frambufferMapper.InitCheck() < B_OK) {
dprintf(DEVICE_NAME ": could not map framebuffer!\n"); dprintf(DEVICE_NAME ": card(%ld): could not map framebuffer!\n",
info.id);
return info.framebuffer_area; return info.framebuffer_area;
} }
@@ -95,18 +99,24 @@ radeon_hd_init(radeon_info &info)
edid1_info* edidInfo = (edid1_info*)get_boot_item(EDID_BOOT_INFO, edid1_info* edidInfo = (edid1_info*)get_boot_item(EDID_BOOT_INFO,
NULL); NULL);
if (edidInfo != NULL) { if (edidInfo != NULL) {
TRACE((DEVICE_NAME ": %s found VESA EDID modes.\n", __func__)); TRACE("card(%ld): %s found BIOS EDID information.\n", info.id,
__func__);
info.shared_info->has_edid = true; info.shared_info->has_edid = true;
memcpy(&info.shared_info->edid_info, edidInfo, sizeof(edid1_info)); memcpy(&info.shared_info->edid_info, edidInfo, sizeof(edid1_info));
} else { } else {
TRACE((DEVICE_NAME ": %s didn't find VESA EDID modes.\n", __func__)); TRACE("card(%ld): %s didn't find BIOS EDID modes.\n", info.id,
__func__);
info.shared_info->has_edid = false; info.shared_info->has_edid = false;
} }
// Read R6XX memory size into shared info // Read R6XX memory size into shared info
//info.shared_info->graphics_memory_size = (uint32)read32(R6XX_CONFIG_MEMSIZE); info.shared_info->graphics_memory_size
= read32(info.registers + R6XX_CONFIG_MEMSIZE);
TRACE((DEVICE_NAME ": radeon_hd_init() completed successfully!\n")); TRACE("card(%ld): found %ld MB memory on card.\n", info.id,
info.shared_info->graphics_memory_size);
TRACE("card(%ld): %s completed successfully!\n", info.id, __func__);
return B_OK; return B_OK;
} }
@@ -114,7 +124,7 @@ radeon_hd_init(radeon_info &info)
void void
radeon_hd_uninit(radeon_info &info) radeon_hd_uninit(radeon_info &info)
{ {
TRACE((DEVICE_NAME ": radeon_hd_uninit()\n")); TRACE("card(%ld): %s called\n", info.id, __func__);
delete_area(info.shared_area); delete_area(info.shared_area);
delete_area(info.registers_area); delete_area(info.registers_area);