Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeon_hd: Don't pass old pixel clock to encoder

Browse Source 
* pll_set can make pixel clock adjustments.
* Anything after pll_set should use encoder pll
  to ensure adjustments are picked up.
This commit is contained in:
Alexander von Gluck IV 2012-03-24 21:08:28 -05:00
parent d8ac7e28ee
commit 5e87e39562
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/accelerants/radeon_hd/encoder.cpp
View File

@ -282,12 +282,16 @@ encoder_apply_quirks(uint8 crtcID)
void
encoder_mode_set(uint8 id, uint32 pixelClock)
encoder_mode_set(uint8 crtcID)
{
TRACE("%s\n", __func__);
radeon_shared_info &info = *gInfo->shared_info;
uint32 connectorIndex = gDisplay[id]->connectorIndex;
uint32 connectorIndex = gDisplay[crtcID]->connectorIndex;
uint16 encoderFlags = gConnector[connectorIndex]->encoder.flags;
pll_info* pll = &gConnector[connectorIndex]->encoder.pll;
// Adjusted pixel clock (*NOT* original mode pixel clock)
uint32 pixelClock = pll->pixelClock;
switch (gConnector[connectorIndex]->encoder.objectID) {
case ENCODER_OBJECT_ID_INTERNAL_DAC1:
@ -367,7 +371,7 @@ encoder_mode_set(uint8 id, uint32 pixelClock)
}
}
encoder_apply_quirks(id);
encoder_apply_quirks(crtcID);
}

2
src/add-ons/accelerants/radeon_hd/encoder.h
View File

@ -17,7 +17,7 @@ void encoder_assign_crtc(uint8 crtcID);
uint32 encoder_pick_dig(uint32 connectorIndex);
void encoder_apply_quirks(uint8 crtcID);
void encoder_mode_set(uint8 id, uint32 pixelClock);
void encoder_mode_set(uint8 crtcID);
status_t encoder_analog_setup(uint32 connectorIndex,
uint32 pixelClock, int command);
status_t encoder_digital_setup(uint32 connectorIndex,

2
src/add-ons/accelerants/radeon_hd/mode.cpp
View File

@ -193,7 +193,7 @@ radeon_set_display_mode(display_mode* mode)
display_crtc_scale(id, mode);
// *** encoder mode set
encoder_mode_set(id, mode->timing.pixel_clock);
encoder_mode_set(id);
// *** CRT controler commit
display_crtc_dpms(id, B_DPMS_ON);