src/via_outputs.c | 176 ------------------------------------------------------ 1 file changed, 176 deletions(-)
New commits: commit babf51f887554743a46a5078832fe4013f02a018 Author: Kevin Brace <kevinbr...@gmx.com> Date: Thu Mar 10 02:47:40 2016 -0800 Removing via_dp_* functions Removing via_dp_* functions inside via_outputs.c. These functions are not really doing anything useful, so they will be deleted. Apparently, they were originally meant for CX700, VX800, VX855, and VX900 chipsets. via_lvds_* functions are already handling integrated TMDS and LVDS transmitters for the above chipsets. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_outputs.c b/src/via_outputs.c index f6fc2ad..9e715fc 100644 --- a/src/via_outputs.c +++ b/src/via_outputs.c @@ -520,172 +520,6 @@ via_tv_init(ScrnInfoPtr pScrn) return TRUE; } -static void -via_dp_create_resources(xf86OutputPtr output) -{ -} - -#ifdef RANDR_12_INTERFACE -static Bool -via_dp_set_property(xf86OutputPtr output, Atom property, - RRPropertyValuePtr value) -{ - return TRUE; -} - -static Bool -via_dp_get_property(xf86OutputPtr output, Atom property) -{ - return FALSE; -} -#endif - -static void -via_dp_dpms(xf86OutputPtr output, int mode) -{ - ScrnInfoPtr pScrn = output->scrn; - - switch (mode) { - case DPMSModeOn: - ViaDFPPower(pScrn, TRUE); - break; - - case DPMSModeStandby: - case DPMSModeSuspend: - case DPMSModeOff: - ViaDFPPower(pScrn, FALSE); - break; - } -} - -static void -via_dp_save(xf86OutputPtr output) -{ -} - -static void -via_dp_restore(xf86OutputPtr output) -{ -} - -static int -via_dp_mode_valid(xf86OutputPtr output, DisplayModePtr pMode) -{ - ScrnInfoPtr pScrn = output->scrn; - - if (!ViaModeDotClockTranslate(pScrn, pMode)) - return MODE_NOCLOCK; - return MODE_OK; -} - -static Bool -via_dp_mode_fixup(xf86OutputPtr output, DisplayModePtr mode, - DisplayModePtr adjusted_mode) -{ - return TRUE; -} - -static void -via_dp_prepare(xf86OutputPtr output) -{ -} - -static void -via_dp_commit(xf86OutputPtr output) -{ -} - -static void -via_dp_mode_set(xf86OutputPtr output, DisplayModePtr mode, - DisplayModePtr adjusted_mode) -{ - ScrnInfoPtr pScrn = output->scrn; - - if (output->crtc) { - drmmode_crtc_private_ptr iga = output->crtc->driver_private; - CARD8 value = 0x00; /* Value for IGA 1 */ - vgaHWPtr hwp = VGAHWPTR(pScrn); - - /* IGA 2 */ - if (iga->index) - value = 0x10; - ViaSeqMask(hwp, 0x99, value, 0x10); - } - ViaDFPPower(pScrn, TRUE); -} - -static xf86OutputStatus -via_dp_detect(xf86OutputPtr output) -{ - xf86OutputStatus status = XF86OutputStatusDisconnected; - ScrnInfoPtr pScrn = output->scrn; - VIAPtr pVia = VIAPTR(pScrn); - xf86MonPtr mon; - - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Entered via_dp_detect.\n")); - - mon = xf86OutputGetEDID(output, pVia->pI2CBus2); - if (mon && DIGITAL(mon->features.input_type)) { - xf86OutputSetEDID(output, mon); - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, - "I2C Bus 2 detected a DP.\n"); - status = XF86OutputStatusConnected; - } - - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Exiting via_dp_detect.\n")); - return status; -} - -static void -via_dp_destroy(xf86OutputPtr output) -{ -} - -static const xf86OutputFuncsRec via_dp_funcs = { - .create_resources = via_dp_create_resources, -#ifdef RANDR_12_INTERFACE - .set_property = via_dp_set_property, -#endif -#ifdef RANDR_13_INTERFACE - .get_property = via_dp_get_property, -#endif - .dpms = via_dp_dpms, - .save = via_dp_save, - .restore = via_dp_restore, - .mode_valid = via_dp_mode_valid, - .mode_fixup = via_dp_mode_fixup, - .prepare = via_dp_prepare, - .commit = via_dp_commit, - .mode_set = via_dp_mode_set, - .detect = via_dp_detect, - .get_modes = xf86OutputGetEDIDModes, - .destroy = via_dp_destroy, -}; - -void -via_dp_init(ScrnInfoPtr pScrn) -{ - VIAPtr pVia = VIAPTR(pScrn); - xf86OutputPtr output = NULL; - - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Entered via_dp_init.\n")); - - if (pVia->pI2CBus2) - output = xf86OutputCreate(pScrn, &via_dp_funcs, "DP-1"); - if (output) { - output->possible_crtcs = 0x1; - output->possible_clones = 0; - output->interlaceAllowed = TRUE; - output->doubleScanAllowed = FALSE; - } - - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Exiting via_dp_init.\n")); -} - /* * Enables CRT using DPMS registers. */ @@ -1188,16 +1022,6 @@ ViaOutputsDetect(ScrnInfoPtr pScrn) via_dvi_init(pScrn); - if (pVia->ActiveDevice & VIA_DEVICE_DFP) { - switch (pVia->Chipset) { - case VIA_CX700: - case VIA_VX800: - case VIA_VX855: - case VIA_VX900: - via_dp_init(pScrn); - break; - } - } } #ifdef HAVE_DEBUG _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel