|
23 | 23 | */
|
24 | 24 |
|
25 | 25 | #include "nouveau_drv.h"
|
| 26 | +#include "nouveau_bios.h" |
26 | 27 | #include "nouveau_reg.h"
|
27 | 28 | #include "dispnv04/hw.h"
|
28 | 29 | #include "nouveau_encoder.h"
|
@@ -1677,7 +1678,7 @@ apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf)
|
1677 | 1678 | */
|
1678 | 1679 | if (nv_match_device(dev, 0x0201, 0x1462, 0x8851)) {
|
1679 | 1680 | if (*conn == 0xf2005014 && *conf == 0xffffffff) {
|
1680 |
| - fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 1, 1, 1); |
| 1681 | + fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 1, 1, DCB_OUTPUT_B); |
1681 | 1682 | return false;
|
1682 | 1683 | }
|
1683 | 1684 | }
|
@@ -1763,26 +1764,26 @@ fabricate_dcb_encoder_table(struct drm_device *dev, struct nvbios *bios)
|
1763 | 1764 | #ifdef __powerpc__
|
1764 | 1765 | /* Apple iMac G4 NV17 */
|
1765 | 1766 | if (of_machine_is_compatible("PowerMac4,5")) {
|
1766 |
| - fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 0, all_heads, 1); |
1767 |
| - fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG, 1, all_heads, 2); |
| 1767 | + fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 0, all_heads, DCB_OUTPUT_B); |
| 1768 | + fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG, 1, all_heads, DCB_OUTPUT_C); |
1768 | 1769 | return;
|
1769 | 1770 | }
|
1770 | 1771 | #endif
|
1771 | 1772 |
|
1772 | 1773 | /* Make up some sane defaults */
|
1773 | 1774 | fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG,
|
1774 |
| - bios->legacy.i2c_indices.crt, 1, 1); |
| 1775 | + bios->legacy.i2c_indices.crt, 1, DCB_OUTPUT_B); |
1775 | 1776 |
|
1776 | 1777 | if (nv04_tv_identify(dev, bios->legacy.i2c_indices.tv) >= 0)
|
1777 | 1778 | fabricate_dcb_output(dcb, DCB_OUTPUT_TV,
|
1778 | 1779 | bios->legacy.i2c_indices.tv,
|
1779 |
| - all_heads, 0); |
| 1780 | + all_heads, DCB_OUTPUT_A); |
1780 | 1781 |
|
1781 | 1782 | else if (bios->tmds.output0_script_ptr ||
|
1782 | 1783 | bios->tmds.output1_script_ptr)
|
1783 | 1784 | fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS,
|
1784 | 1785 | bios->legacy.i2c_indices.panel,
|
1785 |
| - all_heads, 1); |
| 1786 | + all_heads, DCB_OUTPUT_B); |
1786 | 1787 | }
|
1787 | 1788 |
|
1788 | 1789 | static int
|
|
0 commit comments