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

pre-work style cleanup; no functional change

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41028 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-03-19 18:49:14 +00:00
parent d1901581f4
commit 47ad511f59
9 changed files with 185 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/accelerant.cpp
+14 -14
View File
@@ -35,18 +35,18 @@ struct accelerant_info *gInfo;
class AreaCloner { class AreaCloner {
public: public:
AreaCloner(); AreaCloner();
~AreaCloner(); ~AreaCloner();
area_id Clone(const char *name, void **_address, area_id Clone(const char *name, void **_address,
uint32 spec, uint32 protection, uint32 spec, uint32 protection,
area_id sourceArea); area_id sourceArea);
status_t InitCheck() status_t InitCheck()
{ return fArea < 0 ? (status_t)fArea : B_OK; } {return fArea < 0 ? (status_t)fArea : B_OK;}
void Keep(); void Keep();
private: private:
area_id fArea; area_id fArea;
}; };
@@ -118,8 +118,8 @@ init_common(int device, bool isClone)
status_t status = sharedCloner.InitCheck(); status_t status = sharedCloner.InitCheck();
if (status < B_OK) { if (status < B_OK) {
free(gInfo); free(gInfo);
TRACE(("radeon_init_accelerant() failed shared area%i, %i\n", data.shared_info_area, TRACE(("radeon_init_accelerant() failed shared area%i, %i\n",
gInfo->shared_info_area)); data.shared_info_area, gInfo->shared_info_area));
return status; return status;
} }
@@ -132,7 +132,7 @@ init_common(int device, bool isClone)
free(gInfo); free(gInfo);
return status; return status;
} }
sharedCloner.Keep(); sharedCloner.Keep();
regsCloner.Keep(); regsCloner.Keep();
@@ -194,9 +194,9 @@ void
radeon_uninit_accelerant(void) radeon_uninit_accelerant(void)
{ {
TRACE(("radeon_uninit_accelerant()\n")); TRACE(("radeon_uninit_accelerant()\n"));
gInfo->mode_list = NULL; gInfo->mode_list = NULL;
radeon_shared_info &info = *gInfo->shared_info; radeon_shared_info &info = *gInfo->shared_info;
uninit_lock(&info.accelerant_lock); uninit_lock(&info.accelerant_lock);
src/add-ons/accelerants/radeon_hd/accelerant.h
+3 -1
View File
@@ -50,13 +50,15 @@ read32(uint32 offset)
return *(volatile uint32 *)(gInfo->regs + offset); return *(volatile uint32 *)(gInfo->regs + offset);
} }
inline void inline void
write32(uint32 offset, uint32 value) write32(uint32 offset, uint32 value)
{ {
*(volatile uint32 *)(gInfo->regs + offset) = value; *(volatile uint32 *)(gInfo->regs + offset) = value;
} }
// modes.cpp
// modes.cpp
extern status_t create_mode_list(void); extern status_t create_mode_list(void);
#endif /* RADEON_HD_ACCELERANT_H */ #endif /* RADEON_HD_ACCELERANT_H */
src/add-ons/accelerants/radeon_hd/engine.cpp
+2 -2
View File
@@ -30,8 +30,8 @@ static engine_token sEngineToken = {1, 0 /*B_2D_ACCELERATION*/, NULL};
status_t status_t
radeon_acquire_engine(uint32 capabilities, uint32 maxWait, sync_token *syncToken, radeon_acquire_engine(uint32 capabilities, uint32 maxWait,
engine_token **_engineToken) sync_token *syncToken, engine_token **_engineToken)
{ {
TRACE(("radeon_acquire_engine()\n")); TRACE(("radeon_acquire_engine()\n"));
*_engineToken = &sEngineToken; *_engineToken = &sEngineToken;
src/add-ons/accelerants/radeon_hd/hooks.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ get_accelerant_hook(uint32 feature, void *data)
return (void*)radeon_get_frame_buffer_config; return (void*)radeon_get_frame_buffer_config;
case B_GET_PIXEL_CLOCK_LIMITS: case B_GET_PIXEL_CLOCK_LIMITS:
return (void*)radeon_get_pixel_clock_limits; return (void*)radeon_get_pixel_clock_limits;
case B_ACQUIRE_ENGINE: case B_ACQUIRE_ENGINE:
return (void*)radeon_acquire_engine; return (void*)radeon_acquire_engine;
case B_RELEASE_ENGINE: case B_RELEASE_ENGINE:
src/add-ons/accelerants/radeon_hd/mode.cpp
+145 -139
View File
@@ -38,27 +38,30 @@ static display_mode gDisplayMode;
status_t status_t
create_mode_list(void) create_mode_list(void)
{ {
// TODO : Read active monitor EDID
/* Populate modeline with temporary example */
gDisplayMode.timing.pixel_clock = 71500; gDisplayMode.timing.pixel_clock = 71500;
gDisplayMode.timing.h_display = 1366; /* in pixels (not character clocks) */ gDisplayMode.timing.h_display = 1366; // In Pixels
gDisplayMode.timing.h_sync_start = 1406; gDisplayMode.timing.h_sync_start = 1406;
gDisplayMode.timing.h_sync_end = 1438; gDisplayMode.timing.h_sync_end = 1438;
gDisplayMode.timing.h_total = 1510; gDisplayMode.timing.h_total = 1510;
gDisplayMode.timing.v_display = 768; /* in lines */ gDisplayMode.timing.v_display = 768; // In Pixels
gDisplayMode.timing.v_sync_start = 771; gDisplayMode.timing.v_sync_start = 771;
gDisplayMode.timing.v_sync_end = 777; gDisplayMode.timing.v_sync_end = 777;
gDisplayMode.timing.v_total = 789; gDisplayMode.timing.v_total = 789;
gDisplayMode.timing.flags = 0; /* sync polarity, etc. */ gDisplayMode.timing.flags = 0; // Polarity, ex: B_POSITIVE_HSYNC
gDisplayMode.space = B_RGB32_LITTLE; /* pixel configuration */ gDisplayMode.space = B_RGB32_LITTLE; // Pixel configuration
gDisplayMode.virtual_width = 1366; /* in pixels */ gDisplayMode.virtual_width = 1366; // In Pixels
gDisplayMode.virtual_height = 768; /* in lines */ gDisplayMode.virtual_height = 768; // In Pixels
gDisplayMode.h_display_start = 0; /* first displayed pixel in line */ gDisplayMode.h_display_start = 0;
gDisplayMode.v_display_start = 0; /* first displayed line */ gDisplayMode.v_display_start = 0;
gDisplayMode.flags = 0; /* mode flags (Some drivers use this */ gDisplayMode.flags = 0; // Mode flags (Some drivers use this
gInfo->mode_list = &gDisplayMode; gInfo->mode_list = &gDisplayMode;
gInfo->shared_info->mode_count = 1; gInfo->shared_info->mode_count = 1;
return B_OK; return B_OK;
} }
@@ -69,7 +72,7 @@ uint32
radeon_accelerant_mode_count(void) radeon_accelerant_mode_count(void)
{ {
TRACE(("radeon_accelerant_mode_count()\n")); TRACE(("radeon_accelerant_mode_count()\n"));
return gInfo->shared_info->mode_count; return gInfo->shared_info->mode_count;
} }
@@ -87,74 +90,74 @@ radeon_get_mode_list(display_mode *modeList)
inline void inline void
write32AtMask(uint32 adress, uint32 value, uint32 mask) write32AtMask(uint32 adress, uint32 value, uint32 mask)
{ {
uint32 temp; uint32 temp;
temp = read32(adress); temp = read32(adress);
temp &= ~mask; temp &= ~mask;
temp |= value & mask; temp |= value & mask;
write32(adress, temp); write32(adress, temp);
} }
enum { enum {
/* CRTC1 registers */ /* CRTC1 registers */
D1CRTC_H_TOTAL = 0x6000, D1CRTC_H_TOTAL = 0x6000,
D1CRTC_H_BLANK_START_END = 0x6004, D1CRTC_H_BLANK_START_END = 0x6004,
D1CRTC_H_SYNC_A = 0x6008, D1CRTC_H_SYNC_A = 0x6008,
D1CRTC_H_SYNC_A_CNTL = 0x600C, D1CRTC_H_SYNC_A_CNTL = 0x600C,
D1CRTC_H_SYNC_B = 0x6010, D1CRTC_H_SYNC_B = 0x6010,
D1CRTC_H_SYNC_B_CNTL = 0x6014, D1CRTC_H_SYNC_B_CNTL = 0x6014,
D1CRTC_V_TOTAL = 0x6020, D1CRTC_V_TOTAL = 0x6020,
D1CRTC_V_BLANK_START_END = 0x6024, D1CRTC_V_BLANK_START_END = 0x6024,
D1CRTC_V_SYNC_A = 0x6028, D1CRTC_V_SYNC_A = 0x6028,
D1CRTC_V_SYNC_A_CNTL = 0x602C, D1CRTC_V_SYNC_A_CNTL = 0x602C,
D1CRTC_V_SYNC_B = 0x6030, D1CRTC_V_SYNC_B = 0x6030,
D1CRTC_V_SYNC_B_CNTL = 0x6034, D1CRTC_V_SYNC_B_CNTL = 0x6034,
D1CRTC_CONTROL = 0x6080,
D1CRTC_BLANK_CONTROL = 0x6084,
D1CRTC_INTERLACE_CONTROL = 0x6088,
D1CRTC_BLACK_COLOR = 0x6098,
D1CRTC_STATUS = 0x609C,
D1CRTC_COUNT_CONTROL = 0x60B4,
D1CRTC_CONTROL = 0x6080,
D1CRTC_BLANK_CONTROL = 0x6084,
D1CRTC_INTERLACE_CONTROL = 0x6088,
D1CRTC_BLACK_COLOR = 0x6098,
D1CRTC_STATUS = 0x609C,
D1CRTC_COUNT_CONTROL = 0x60B4,
/* D1GRPH registers */ /* D1GRPH registers */
D1GRPH_ENABLE = 0x6100, D1GRPH_ENABLE = 0x6100,
D1GRPH_CONTROL = 0x6104, D1GRPH_CONTROL = 0x6104,
D1GRPH_LUT_SEL = 0x6108, D1GRPH_LUT_SEL = 0x6108,
D1GRPH_SWAP_CNTL = 0x610C, D1GRPH_SWAP_CNTL = 0x610C,
D1GRPH_PRIMARY_SURFACE_ADDRESS = 0x6110, D1GRPH_PRIMARY_SURFACE_ADDRESS = 0x6110,
D1GRPH_SECONDARY_SURFACE_ADDRESS = 0x6118, D1GRPH_SECONDARY_SURFACE_ADDRESS = 0x6118,
D1GRPH_PITCH = 0x6120, D1GRPH_PITCH = 0x6120,
D1GRPH_SURFACE_OFFSET_X = 0x6124, D1GRPH_SURFACE_OFFSET_X = 0x6124,
D1GRPH_SURFACE_OFFSET_Y = 0x6128, D1GRPH_SURFACE_OFFSET_Y = 0x6128,
D1GRPH_X_START = 0x612C, D1GRPH_X_START = 0x612C,
D1GRPH_Y_START = 0x6130, D1GRPH_Y_START = 0x6130,
D1GRPH_X_END = 0x6134, D1GRPH_X_END = 0x6134,
D1GRPH_Y_END = 0x6138, D1GRPH_Y_END = 0x6138,
D1GRPH_UPDATE = 0x6144, D1GRPH_UPDATE = 0x6144,
/* D1MODE */ /* D1MODE */
D1MODE_DESKTOP_HEIGHT = 0x652C, D1MODE_DESKTOP_HEIGHT = 0x652C,
D1MODE_VLINE_START_END = 0x6538, D1MODE_VLINE_START_END = 0x6538,
D1MODE_VLINE_STATUS = 0x653C, D1MODE_VLINE_STATUS = 0x653C,
D1MODE_VIEWPORT_START = 0x6580, D1MODE_VIEWPORT_START = 0x6580,
D1MODE_VIEWPORT_SIZE = 0x6584, D1MODE_VIEWPORT_SIZE = 0x6584,
D1MODE_EXT_OVERSCAN_LEFT_RIGHT = 0x6588, D1MODE_EXT_OVERSCAN_LEFT_RIGHT = 0x6588,
D1MODE_EXT_OVERSCAN_TOP_BOTTOM = 0x658C, D1MODE_EXT_OVERSCAN_TOP_BOTTOM = 0x658C,
D1MODE_DATA_FORMAT = 0x6528, D1MODE_DATA_FORMAT = 0x6528,
/* D1SCL */ /* D1SCL */
D1SCL_ENABLE = 0x6590, D1SCL_ENABLE = 0x6590,
D1SCL_TAP_CONTROL = 0x6594, D1SCL_TAP_CONTROL = 0x6594,
D1MODE_CENTER = 0x659C, /* guess */ D1MODE_CENTER = 0x659C, /* guess */
D1SCL_HVSCALE = 0x65A4, /* guess */ D1SCL_HVSCALE = 0x65A4, /* guess */
D1SCL_HFILTER = 0x65B0, /* guess */ D1SCL_HFILTER = 0x65B0, /* guess */
D1SCL_VFILTER = 0x65C0, /* guess */ D1SCL_VFILTER = 0x65C0, /* guess */
D1SCL_UPDATE = 0x65CC, D1SCL_UPDATE = 0x65CC,
D1SCL_DITHER = 0x65D4, /* guess */ D1SCL_DITHER = 0x65D4, /* guess */
D1SCL_FLIP_CONTROL = 0x65D8 /* guess */ D1SCL_FLIP_CONTROL = 0x65D8 /* guess */
}; };
@@ -196,59 +199,62 @@ get_color_space_format(const display_mode &mode, uint32 &colorMode,
bytesPerRow = (bytesPerRow + 63) & ~63; bytesPerRow = (bytesPerRow + 63) & ~63;
} }
#define D1_REG_OFFSET 0x0000 #define D1_REG_OFFSET 0x0000
#define D2_REG_OFFSET 0x0800 #define D2_REG_OFFSET 0x0800
static void static void
DxModeSet(display_mode *mode) DxModeSet(display_mode *mode)
{ {
uint32 regOffset = D1_REG_OFFSET; uint32 regOffset = D1_REG_OFFSET;
display_timing& displayTiming = mode->timing; display_timing& displayTiming = mode->timing;
/* enable read requests */
write32AtMask(regOffset + D1CRTC_CONTROL, 0, 0x01000000);
/* Horizontal */ /* enable read requests */
write32(regOffset + D1CRTC_H_TOTAL, displayTiming.h_total - 1); write32AtMask(regOffset + D1CRTC_CONTROL, 0, 0x01000000);
uint16 blankStart = displayTiming.h_display; //displayTiming.h_sync_end;
uint16 blankEnd = displayTiming.h_sync_start;//displayTiming.h_total;
// write32(regOffset + D1CRTC_H_BLANK_START_END,
// blankStart | (blankEnd << 16));
write32(regOffset + D1CRTC_H_SYNC_A, /* Horizontal */
write32(regOffset + D1CRTC_H_TOTAL, displayTiming.h_total - 1);
uint16 blankStart = displayTiming.h_display; // displayTiming.h_sync_end;
uint16 blankEnd = displayTiming.h_sync_start; // displayTiming.h_total;
// write32(regOffset + D1CRTC_H_BLANK_START_END,
// blankStart | (blankEnd << 16));
write32(regOffset + D1CRTC_H_SYNC_A,
(displayTiming.h_sync_end - displayTiming.h_sync_start) << 16); (displayTiming.h_sync_end - displayTiming.h_sync_start) << 16);
//write32(regOffset + D1CRTC_H_SYNC_A_CNTL, Mode->Flags & V_NHSYNC); // write32(regOffset + D1CRTC_H_SYNC_A_CNTL, Mode->Flags & V_NHSYNC);
//!!!write32(regOffset + D1CRTC_H_SYNC_A_CNTL, V_NHSYNC); //! write32(regOffset + D1CRTC_H_SYNC_A_CNTL, V_NHSYNC);
/* Vertical */ /* Vertical */
write32(regOffset + D1CRTC_V_TOTAL, displayTiming.v_total - 1); write32(regOffset + D1CRTC_V_TOTAL, displayTiming.v_total - 1);
blankStart = displayTiming.v_display;//displayTiming.v_sync_end; blankStart = displayTiming.v_display; // displayTiming.v_sync_end;
blankEnd = displayTiming.v_sync_start;//displayTiming.v_total; blankEnd = displayTiming.v_sync_start; // displayTiming.v_total;
// write32(regOffset + D1CRTC_V_BLANK_START_END, // write32(regOffset + D1CRTC_V_BLANK_START_END,
// blankStart | (blankEnd << 16)); // blankStart | (blankEnd << 16));
/* set interlaced */ /* set interlaced */
//if (Mode->Flags & V_INTERLACE) { // if (Mode->Flags & V_INTERLACE) {
if (0) { if (0) {
write32(regOffset + D1CRTC_INTERLACE_CONTROL, 0x1); write32(regOffset + D1CRTC_INTERLACE_CONTROL, 0x1);
write32(regOffset + D1MODE_DATA_FORMAT, 0x1); write32(regOffset + D1MODE_DATA_FORMAT, 0x1);
} else { } else {
write32(regOffset + D1CRTC_INTERLACE_CONTROL, 0x0); write32(regOffset + D1CRTC_INTERLACE_CONTROL, 0x0);
write32(regOffset + D1MODE_DATA_FORMAT, 0x0); write32(regOffset + D1MODE_DATA_FORMAT, 0x0);
} }
write32(regOffset + D1CRTC_V_SYNC_A, write32(regOffset + D1CRTC_V_SYNC_A,
(displayTiming.v_sync_end - displayTiming.v_sync_start) << 16); (displayTiming.v_sync_end - displayTiming.v_sync_start) << 16);
//write32(regOffset + D1CRTC_V_SYNC_A_CNTL, Mode->Flags & V_NVSYNC); // write32(regOffset + D1CRTC_V_SYNC_A_CNTL, Mode->Flags & V_NVSYNC);
//!!!write32(regOffset + D1CRTC_V_SYNC_A_CNTL, V_NVSYNC); //! write32(regOffset + D1CRTC_V_SYNC_A_CNTL, V_NVSYNC);
/* set D1CRTC_HORZ_COUNT_BY2_EN to 0; should only be set to 1 on 30bpp DVI modes */ /* set D1CRTC_HORZ_COUNT_BY2_EN to 0;
write32AtMask(regOffset + D1CRTC_COUNT_CONTROL, 0x0, 0x1); should only be set to 1 on 30bpp DVI modes
*/
write32AtMask(regOffset + D1CRTC_COUNT_CONTROL, 0x0, 0x1);
} }
@@ -257,36 +263,36 @@ static void
DxModeScale(display_mode *mode) DxModeScale(display_mode *mode)
{ {
uint32 regOffset = D1_REG_OFFSET; uint32 regOffset = D1_REG_OFFSET;
/* D1Mode registers */
write32(regOffset + D1MODE_VIEWPORT_SIZE,
mode->timing.v_display | (mode->timing.h_display << 16));
write32(regOffset + D1MODE_VIEWPORT_START, 0);
/* write32(regOffset + D1MODE_EXT_OVERSCAN_LEFT_RIGHT, /* D1Mode registers */
write32(regOffset + D1MODE_VIEWPORT_SIZE,
mode->timing.v_display | (mode->timing.h_display << 16));
write32(regOffset + D1MODE_VIEWPORT_START, 0);
/* write32(regOffset + D1MODE_EXT_OVERSCAN_LEFT_RIGHT,
(Overscan.OverscanLeft << 16) | Overscan.OverscanRight); (Overscan.OverscanLeft << 16) | Overscan.OverscanRight);
write32(regOffset + D1MODE_EXT_OVERSCAN_TOP_BOTTOM, write32(regOffset + D1MODE_EXT_OVERSCAN_TOP_BOTTOM,
(Overscan.OverscanTop << 16) | Overscan.OverscanBottom); (Overscan.OverscanTop << 16) | Overscan.OverscanBottom);
*/ */
write32(regOffset + D1SCL_ENABLE, 0); write32(regOffset + D1SCL_ENABLE, 0);
write32(regOffset + D1SCL_TAP_CONTROL, 0); write32(regOffset + D1SCL_TAP_CONTROL, 0);
write32(regOffset + D1MODE_CENTER, 0); write32(regOffset + D1MODE_CENTER, 0);
} }
status_t status_t
radeon_set_display_mode(display_mode *mode) radeon_set_display_mode(display_mode *mode)
{ {
DxModeSet(mode); DxModeSet(mode);
DxModeScale(mode); DxModeScale(mode);
uint32 colorMode, bytesPerRow, bitsPerPixel; uint32 colorMode, bytesPerRow, bitsPerPixel;
get_color_space_format(*mode, colorMode, bytesPerRow, bitsPerPixel); get_color_space_format(*mode, colorMode, bytesPerRow, bitsPerPixel);
uint32 regOffset = D1_REG_OFFSET; uint32 regOffset = D1_REG_OFFSET;
write32AtMask(regOffset + D1GRPH_ENABLE, 1, 0x00000001); write32AtMask(regOffset + D1GRPH_ENABLE, 1, 0x00000001);
/* disable R/B swap, disable tiling, disable 16bit alpha, etc. */ /* disable R/B swap, disable tiling, disable 16bit alpha, etc. */
write32(regOffset + D1GRPH_CONTROL, 0); write32(regOffset + D1GRPH_CONTROL, 0);
@@ -306,31 +312,31 @@ radeon_set_display_mode(display_mode *mode)
default: default:
write32AtMask(regOffset + D1GRPH_CONTROL, 0x000002, 0x00000703); write32AtMask(regOffset + D1GRPH_CONTROL, 0x000002, 0x00000703);
break; break;
/* TODO: 64bpp ;p */ /* TODO: 64bpp ;p */
} }
/* Make sure that we are not swapping colours around */ /* Make sure that we are not swapping colours around */
//if (rhdPtr->ChipSet > RHD_R600) // if (rhdPtr->ChipSet > RHD_R600)
write32(regOffset + D1GRPH_SWAP_CNTL, 0); write32(regOffset + D1GRPH_SWAP_CNTL, 0);
/* R5xx - RS690 case is GRPH_CONTROL bit 16 */ /* R5xx - RS690 case is GRPH_CONTROL bit 16 */
#define R6XX_CONFIG_FB_BASE 0x542C /* AKA CONFIG_F0_BASE */ #define R6XX_CONFIG_FB_BASE 0x542C /* AKA CONFIG_F0_BASE */
uint32 fbIntAddress = read32(R6XX_CONFIG_FB_BASE); uint32 fbIntAddress = read32(R6XX_CONFIG_FB_BASE);
uint32 offset = gInfo->shared_info->frame_buffer_offset;
write32(regOffset + D1GRPH_PRIMARY_SURFACE_ADDRESS,
fbIntAddress + offset);
write32(regOffset + D1GRPH_PITCH, bytesPerRow / 4);
write32(regOffset + D1GRPH_SURFACE_OFFSET_X, 0);
write32(regOffset + D1GRPH_SURFACE_OFFSET_Y, 0);
write32(regOffset + D1GRPH_X_START, 0);
write32(regOffset + D1GRPH_Y_START, 0);
write32(regOffset + D1GRPH_X_END, mode->virtual_width);
write32(regOffset + D1GRPH_Y_END, mode->virtual_height);
/* D1Mode registers */ uint32 offset = gInfo->shared_info->frame_buffer_offset;
write32(regOffset + D1MODE_DESKTOP_HEIGHT, mode->virtual_height); write32(regOffset + D1GRPH_PRIMARY_SURFACE_ADDRESS,
fbIntAddress + offset);
write32(regOffset + D1GRPH_PITCH, bytesPerRow / 4);
write32(regOffset + D1GRPH_SURFACE_OFFSET_X, 0);
write32(regOffset + D1GRPH_SURFACE_OFFSET_Y, 0);
write32(regOffset + D1GRPH_X_START, 0);
write32(regOffset + D1GRPH_Y_START, 0);
write32(regOffset + D1GRPH_X_END, mode->virtual_width);
write32(regOffset + D1GRPH_Y_END, mode->virtual_height);
/* D1Mode registers */
write32(regOffset + D1MODE_DESKTOP_HEIGHT, mode->virtual_height);
// update shared info // update shared info
gInfo->shared_info->bytes_per_row = bytesPerRow; gInfo->shared_info->bytes_per_row = bytesPerRow;
@@ -340,7 +346,7 @@ radeon_set_display_mode(display_mode *mode)
return B_OK; return B_OK;
} }
status_t status_t
radeon_get_display_mode(display_mode *_currentMode) radeon_get_display_mode(display_mode *_currentMode)
{ {
src/add-ons/kernel/drivers/graphics/radeon_hd/device.cpp
+10 -5
View File
@@ -39,9 +39,12 @@
static status_t device_open(const char *name, uint32 flags, void **_cookie); static status_t device_open(const char *name, uint32 flags, void **_cookie);
static status_t device_close(void *data); static status_t device_close(void *data);
static status_t device_free(void *data); static status_t device_free(void *data);
static status_t device_ioctl(void *data, uint32 opcode, void *buffer, size_t length); static status_t device_ioctl(void *data, uint32 opcode,
static status_t device_read(void *data, off_t offset, void *buffer, size_t *length); void *buffer, size_t length);
static status_t device_write(void *data, off_t offset, const void *buffer, size_t *length); static status_t device_read(void *data, off_t offset,
void *buffer, size_t *length);
static status_t device_write(void *data, off_t offset,
const void *buffer, size_t *length);
device_hooks gDeviceHooks = { device_hooks gDeviceHooks = {
@@ -207,7 +210,8 @@ device_ioctl(void *data, uint32 op, void *buffer, size_t bufferLength)
static status_t static status_t
device_read(void */*data*/, off_t /*pos*/, void */*buffer*/, size_t *_length) device_read(void */*data*/, off_t /*pos*/,
void */*buffer*/, size_t *_length)
{ {
*_length = 0; *_length = 0;
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
@@ -215,7 +219,8 @@ device_read(void */*data*/, off_t /*pos*/, void */*buffer*/, size_t *_length)
static status_t static status_t
device_write(void */*data*/, off_t /*pos*/, const void */*buffer*/, size_t *_length) device_write(void */*data*/, off_t /*pos*/,
const void */*buffer*/, size_t *_length)
{ {
*_length = 0; *_length = 0;
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
src/add-ons/kernel/drivers/graphics/radeon_hd/driver.cpp
+1 -1
View File
@@ -137,7 +137,7 @@ init_hardware(void)
{ {
TRACE((DEVICE_NAME ": init_hardware()\n")); TRACE((DEVICE_NAME ": init_hardware()\n"));
status_t status = get_module(B_PCI_MODULE_NAME,(module_info **)&gPCI); status_t status = get_module(B_PCI_MODULE_NAME, (module_info **)&gPCI);
if (status != B_OK) { if (status != B_OK) {
TRACE((DEVICE_NAME ": pci module unavailable\n")); TRACE((DEVICE_NAME ": pci module unavailable\n"));
return status; return status;
src/add-ons/kernel/drivers/graphics/radeon_hd/driver.h
+2
View File
@@ -50,4 +50,6 @@ set_pci_config(pci_info* info, uint8 offset, uint8 size, uint32 value)
size, value); size, value);
} }
#endif /* DRIVER_H */ #endif /* DRIVER_H */
src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp
+7 -5
View File
@@ -42,8 +42,9 @@
status_t status_t
radeon_hd_init(radeon_info &info) radeon_hd_init(radeon_info &info)
{ {
TRACE((DEVICE_NAME ": radeon_hd_init() called\n"));
// memory mapped I/O // memory mapped I/O
AreaKeeper sharedCreator; AreaKeeper sharedCreator;
info.shared_area = sharedCreator.Create("radeon hd shared info", info.shared_area = sharedCreator.Create("radeon hd shared info",
(void **)&info.shared_info, B_ANY_KERNEL_ADDRESS, (void **)&info.shared_info, B_ANY_KERNEL_ADDRESS,
@@ -75,20 +76,21 @@ radeon_hd_init(radeon_info &info)
dprintf(DEVICE_NAME ": could not map framebuffer!\n"); dprintf(DEVICE_NAME ": could not map framebuffer!\n");
return info.framebuffer_area; return info.framebuffer_area;
} }
// Turn on write combining for the area // Turn on write combining for the area
vm_set_area_memory_type(info.framebuffer_area, vm_set_area_memory_type(info.framebuffer_area,
info.pci->u.h0.base_registers[RHD_FB_BAR], B_MTR_WC); info.pci->u.h0.base_registers[RHD_FB_BAR], B_MTR_WC);
sharedCreator.Detach(); sharedCreator.Detach();
mmioMapper.Detach(); mmioMapper.Detach();
frambufferMapper.Detach(); frambufferMapper.Detach();
info.shared_info->registers_area = info.registers_area; info.shared_info->registers_area = info.registers_area;
info.shared_info->frame_buffer_offset = 0; info.shared_info->frame_buffer_offset = 0;
info.shared_info->physical_graphics_memory = info.pci->u.h0.base_registers[RHD_FB_BAR]; info.shared_info->physical_graphics_memory
= info.pci->u.h0.base_registers[RHD_FB_BAR];
TRACE((DEVICE_NAME "radeon_hd_init() completed successfully!\n")); TRACE((DEVICE_NAME ": radeon_hd_init() completed successfully!\n"));
return B_OK; return B_OK;
} }