| intel_display.c (298955) | intel_display.c (300050) |
|---|---|
| 1/* 2 * Copyright �� 2006-2007 Intel Corporation 3 * 4 * Permission is hereby granted, free of charge, to any person obtaining a 5 * copy of this software and associated documentation files (the "Software"), 6 * to deal in the Software without restriction, including without limitation 7 * the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 * and/or sell copies of the Software, and to permit persons to whom the --- 11 unchanged lines hidden (view full) --- 20 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 21 * DEALINGS IN THE SOFTWARE. 22 * 23 * Authors: 24 * Eric Anholt <eric@anholt.net> 25 */ 26 27#include <sys/cdefs.h> | 1/* 2 * Copyright �� 2006-2007 Intel Corporation 3 * 4 * Permission is hereby granted, free of charge, to any person obtaining a 5 * copy of this software and associated documentation files (the "Software"), 6 * to deal in the Software without restriction, including without limitation 7 * the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 * and/or sell copies of the Software, and to permit persons to whom the --- 11 unchanged lines hidden (view full) --- 20 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 21 * DEALINGS IN THE SOFTWARE. 22 * 23 * Authors: 24 * Eric Anholt <eric@anholt.net> 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/dev/drm2/i915/intel_display.c 298955 2016-05-03 03:41:25Z pfg $"); | 28__FBSDID("$FreeBSD: head/sys/dev/drm2/i915/intel_display.c 300050 2016-05-17 12:52:31Z eadler $"); |
| 29 30#include <dev/drm2/drmP.h> 31#include <dev/drm2/drm_edid.h> 32#include <dev/drm2/i915/intel_drv.h> 33#include <dev/drm2/i915/i915_drm.h> 34#include <dev/drm2/i915/i915_drv.h> 35#include <dev/drm2/drm_dp_helper.h> 36#include <dev/drm2/drm_crtc_helper.h> --- 7929 unchanged lines hidden (view full) --- 7966 7967 /* crtc->mode is already used by the ->mode_set callbacks, hence we need 7968 * to set it here already despite that we pass it down the callchain. 7969 */ 7970 if (modeset_pipes) 7971 crtc->mode = *mode; 7972 7973 /* Only after disabling all output pipelines that will be changed can we | 29 30#include <dev/drm2/drmP.h> 31#include <dev/drm2/drm_edid.h> 32#include <dev/drm2/i915/intel_drv.h> 33#include <dev/drm2/i915/i915_drm.h> 34#include <dev/drm2/i915/i915_drv.h> 35#include <dev/drm2/drm_dp_helper.h> 36#include <dev/drm2/drm_crtc_helper.h> --- 7929 unchanged lines hidden (view full) --- 7966 7967 /* crtc->mode is already used by the ->mode_set callbacks, hence we need 7968 * to set it here already despite that we pass it down the callchain. 7969 */ 7970 if (modeset_pipes) 7971 crtc->mode = *mode; 7972 7973 /* Only after disabling all output pipelines that will be changed can we |
| 7974 * update the the output configuration. */ | 7974 * update the output configuration. */ |
| 7975 intel_modeset_update_state(dev, prepare_pipes); 7976 7977 if (dev_priv->display.modeset_global_resources) 7978 dev_priv->display.modeset_global_resources(dev); 7979 7980 /* Set up the DPLL and any encoders state that needs to adjust or depend 7981 * on the DPLL. 7982 */ --- 1578 unchanged lines hidden --- | 7975 intel_modeset_update_state(dev, prepare_pipes); 7976 7977 if (dev_priv->display.modeset_global_resources) 7978 dev_priv->display.modeset_global_resources(dev); 7979 7980 /* Set up the DPLL and any encoders state that needs to adjust or depend 7981 * on the DPLL. 7982 */ --- 1578 unchanged lines hidden --- |