From f7f3828178565188556e211cf56702f7ca810a89 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 16 Jun 2011 03:10:17 +0000 Subject: [PATCH] pass device pciid through to accelerant git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42203 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/graphics/radeon_hd/radeon_hd.h | 1 + src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp | 1 + src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp | 1 + .../kernel/drivers/graphics/radeon_hd/radeon_hd_private.h | 1 + 4 files changed, 4 insertions(+) diff --git a/headers/private/graphics/radeon_hd/radeon_hd.h b/headers/private/graphics/radeon_hd/radeon_hd.h index e2c17419e5..f6973db6e2 100644 --- a/headers/private/graphics/radeon_hd/radeon_hd.h +++ b/headers/private/graphics/radeon_hd/radeon_hd.h @@ -67,6 +67,7 @@ struct overlay_registers; struct radeon_shared_info { + uint32 device_id; // device pciid area_id mode_list_area; // area containing display mode list uint32 mode_count; diff --git a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp index 8e7f9199d5..5a6152868d 100644 --- a/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp +++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp @@ -242,6 +242,7 @@ init_driver(void) gDeviceInfo[found]->id = found; gDeviceInfo[found]->pci = info; gDeviceInfo[found]->registers = (uint8 *)info->u.h0.base_registers[0]; + gDeviceInfo[found]->device_id = kSupportedDevices[type].device_id; gDeviceInfo[found]->device_identifier = kSupportedDevices[type].name; gDeviceInfo[found]->device_chipset = kSupportedDevices[type].chipset; diff --git a/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp b/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp index 866883a5cb..b8a37c36d2 100644 --- a/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp +++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp @@ -93,6 +93,7 @@ radeon_hd_init(radeon_info &info) frambufferMapper.Detach(); // Pass common information to accelerant + info.shared_info->device_id = info.device_id; info.shared_info->device_chipset = info.device_chipset; info.shared_info->registers_area = info.registers_area; info.shared_info->frame_buffer_area = info.framebuffer_area; diff --git a/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd_private.h b/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd_private.h index eff8a872c8..aa3165f745 100644 --- a/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd_private.h +++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd_private.h @@ -32,6 +32,7 @@ struct radeon_info { area_id shared_area; const char* device_identifier; + uint32 device_id; uint16 device_chipset; };