diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2018-06-17 12:39:30 -0500 |
|---|---|---|
| committer | Connor Behan <connor.behan@gmail.com> | 2018-06-25 13:30:16 -0400 |
| commit | dc218b45075ff1ffe497e25b34c528c5259ef398 (patch) | |
| tree | f567ec6e5dbe6f81cf4d75d3cedac9385846c505 /src | |
| parent | e9564ed077af772dc3f82f15ac4c507ee1c16415 (diff) | |
Move R128RestoreCrtcRegisters to r128_crtc.c
r128_crtc.c is the more logical place this function should be located.
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/r128_crtc.c | 20 | ||||
| -rw-r--r-- | src/r128_driver.c | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/r128_crtc.c b/src/r128_crtc.c index d65c5b7..779a691 100644 --- a/src/r128_crtc.c +++ b/src/r128_crtc.c @@ -239,6 +239,26 @@ Bool R128InitCrtc2Registers(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr m return TRUE; } +/* Write CRTC registers. */ +void R128RestoreCrtcRegisters(ScrnInfoPtr pScrn, R128SavePtr restore) +{ + R128InfoPtr info = R128PTR(pScrn); + unsigned char *R128MMIO = info->MMIO; + + OUTREG(R128_CRTC_GEN_CNTL, restore->crtc_gen_cntl); + + OUTREGP(R128_CRTC_EXT_CNTL, restore->crtc_ext_cntl, + R128_CRTC_VSYNC_DIS | R128_CRTC_HSYNC_DIS | R128_CRTC_DISPLAY_DIS); + + OUTREG(R128_CRTC_H_TOTAL_DISP, restore->crtc_h_total_disp); + OUTREG(R128_CRTC_H_SYNC_STRT_WID, restore->crtc_h_sync_strt_wid); + OUTREG(R128_CRTC_V_TOTAL_DISP, restore->crtc_v_total_disp); + OUTREG(R128_CRTC_V_SYNC_STRT_WID, restore->crtc_v_sync_strt_wid); + OUTREG(R128_CRTC_OFFSET, restore->crtc_offset); + OUTREG(R128_CRTC_OFFSET_CNTL, restore->crtc_offset_cntl); + OUTREG(R128_CRTC_PITCH, restore->crtc_pitch); +} + static Bool R128InitCrtcBase(xf86CrtcPtr crtc, R128SavePtr save, int x, int y) { ScrnInfoPtr pScrn = crtc->scrn; diff --git a/src/r128_driver.c b/src/r128_driver.c index 312353d..3c4d08b 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -2144,26 +2144,6 @@ void R128RestoreCommonRegisters(ScrnInfoPtr pScrn, R128SavePtr restore) OUTREG(R128_CONFIG_CNTL, restore->config_cntl); } -/* Write CRTC registers. */ -void R128RestoreCrtcRegisters(ScrnInfoPtr pScrn, R128SavePtr restore) -{ - R128InfoPtr info = R128PTR(pScrn); - unsigned char *R128MMIO = info->MMIO; - - OUTREG(R128_CRTC_GEN_CNTL, restore->crtc_gen_cntl); - - OUTREGP(R128_CRTC_EXT_CNTL, restore->crtc_ext_cntl, - R128_CRTC_VSYNC_DIS | R128_CRTC_HSYNC_DIS | R128_CRTC_DISPLAY_DIS); - - OUTREG(R128_CRTC_H_TOTAL_DISP, restore->crtc_h_total_disp); - OUTREG(R128_CRTC_H_SYNC_STRT_WID, restore->crtc_h_sync_strt_wid); - OUTREG(R128_CRTC_V_TOTAL_DISP, restore->crtc_v_total_disp); - OUTREG(R128_CRTC_V_SYNC_STRT_WID, restore->crtc_v_sync_strt_wid); - OUTREG(R128_CRTC_OFFSET, restore->crtc_offset); - OUTREG(R128_CRTC_OFFSET_CNTL, restore->crtc_offset_cntl); - OUTREG(R128_CRTC_PITCH, restore->crtc_pitch); -} - /* Write CRTC2 registers. */ void R128RestoreCrtc2Registers(ScrnInfoPtr pScrn, R128SavePtr restore) { |