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

radeon_hd: Style cleanup of display.cpp

Browse Source 
* These errors slipped in from an external patch
* No functional change
This commit is contained in:
Alexander von Gluck IV 2013-09-25 20:45:44 -05:00
parent e813a15846
commit e1d4323c6c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/add-ons/accelerants/radeon_hd/display.cpp
View File

@ -611,8 +611,8 @@ display_dce45_crtc_load_lut(uint8 crtcID)
if (info.dceMajor >= 5) { if (info.dceMajor >= 5) {
Write32(OUT, NI_INPUT_CSC_CONTROL + regs->crtcOffset, Write32(OUT, NI_INPUT_CSC_CONTROL + regs->crtcOffset,
(NI_INPUT_CSC_GRPH_MODE(NI_INPUT_CSC_BYPASS) | (NI_INPUT_CSC_GRPH_MODE(NI_INPUT_CSC_BYPASS)
NI_INPUT_CSC_OVL_MODE(NI_INPUT_CSC_BYPASS))); | NI_INPUT_CSC_OVL_MODE(NI_INPUT_CSC_BYPASS)));
Write32(OUT, NI_PRESCALE_GRPH_CONTROL + regs->crtcOffset, Write32(OUT, NI_PRESCALE_GRPH_CONTROL + regs->crtcOffset,
NI_GRPH_PRESCALE_BYPASS); NI_GRPH_PRESCALE_BYPASS);
Write32(OUT, NI_PRESCALE_OVL_CONTROL + regs->crtcOffset, Write32(OUT, NI_PRESCALE_OVL_CONTROL + regs->crtcOffset,
@ -638,17 +638,15 @@ display_dce45_crtc_load_lut(uint8 crtcID)
Write32(OUT, EVERGREEN_DC_LUT_RW_INDEX, 0); Write32(OUT, EVERGREEN_DC_LUT_RW_INDEX, 0);
for (int i = 0; i < 256; i++) { for (int i = 0; i < 256; i++) {
Write32(OUT, EVERGREEN_DC_LUT_30_COLOR + regs->crtcOffset, Write32(OUT, EVERGREEN_DC_LUT_30_COLOR + regs->crtcOffset,
(r[i] << 20) | (r[i] << 20) | (g[i] << 10) | (b[i] << 0));
(g[i] << 10) |
(b[i] << 0));
} }
if (info.dceMajor >= 5) { if (info.dceMajor >= 5) {
Write32(OUT, NI_DEGAMMA_CONTROL + regs->crtcOffset, Write32(OUT, NI_DEGAMMA_CONTROL + regs->crtcOffset,
(NI_GRPH_DEGAMMA_MODE(NI_DEGAMMA_BYPASS) | (NI_GRPH_DEGAMMA_MODE(NI_DEGAMMA_BYPASS)
NI_OVL_DEGAMMA_MODE(NI_DEGAMMA_BYPASS) | | NI_OVL_DEGAMMA_MODE(NI_DEGAMMA_BYPASS)
NI_ICON_DEGAMMA_MODE(NI_DEGAMMA_BYPASS) | | NI_ICON_DEGAMMA_MODE(NI_DEGAMMA_BYPASS)
NI_CURSOR_DEGAMMA_MODE(NI_DEGAMMA_BYPASS))); | NI_CURSOR_DEGAMMA_MODE(NI_DEGAMMA_BYPASS)));
Write32(OUT, NI_GAMUT_REMAP_CONTROL + regs->crtcOffset, Write32(OUT, NI_GAMUT_REMAP_CONTROL + regs->crtcOffset,
(NI_GRPH_GAMUT_REMAP_MODE(NI_GAMUT_REMAP_BYPASS) | (NI_GRPH_GAMUT_REMAP_MODE(NI_GAMUT_REMAP_BYPASS) |
NI_OVL_GAMUT_REMAP_MODE(NI_GAMUT_REMAP_BYPASS))); NI_OVL_GAMUT_REMAP_MODE(NI_GAMUT_REMAP_BYPASS)));
@ -693,9 +691,7 @@ display_avivo_crtc_load_lut(uint8 crtcID)
Write32(OUT, AVIVO_DC_LUT_RW_INDEX, 0); Write32(OUT, AVIVO_DC_LUT_RW_INDEX, 0);
for (int i = 0; i < 256; i++) { for (int i = 0; i < 256; i++) {
Write32(OUT, AVIVO_DC_LUT_30_COLOR, Write32(OUT, AVIVO_DC_LUT_30_COLOR,
(r[i] << 20) | (r[i] << 20) | (g[i] << 10) | (b[i] << 0));
(g[i] << 10) |
(b[i] << 0));
} }
Write32(OUT, AVIVO_D1GRPH_LUT_SEL + regs->crtcOffset, crtcID); Write32(OUT, AVIVO_D1GRPH_LUT_SEL + regs->crtcOffset, crtcID);