| intel_display.c (280183) | intel_display.c (283291) |
|---|---|
| 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 280183 2015-03-17 18:50:33Z dumbbell $"); | 28__FBSDID("$FreeBSD: head/sys/dev/drm2/i915/intel_display.c 283291 2015-05-22 17:05:21Z jkim $"); |
| 29 30#include <dev/drm2/drmP.h> 31#include <dev/drm2/drm.h> 32#include <dev/drm2/i915/i915_drm.h> 33#include <dev/drm2/i915/i915_drv.h> 34#include <dev/drm2/i915/intel_drv.h> 35#include <dev/drm2/drm_edid.h> 36#include <dev/drm2/drm_dp_helper.h> --- 6407 unchanged lines hidden (view full) --- 6444 intel_helper_funcs.prepare = i9xx_crtc_prepare; 6445 intel_helper_funcs.commit = i9xx_crtc_commit; 6446 } 6447 6448 drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); 6449 6450 intel_crtc->busy = false; 6451 | 29 30#include <dev/drm2/drmP.h> 31#include <dev/drm2/drm.h> 32#include <dev/drm2/i915/i915_drm.h> 33#include <dev/drm2/i915/i915_drv.h> 34#include <dev/drm2/i915/intel_drv.h> 35#include <dev/drm2/drm_edid.h> 36#include <dev/drm2/drm_dp_helper.h> --- 6407 unchanged lines hidden (view full) --- 6444 intel_helper_funcs.prepare = i9xx_crtc_prepare; 6445 intel_helper_funcs.commit = i9xx_crtc_commit; 6446 } 6447 6448 drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); 6449 6450 intel_crtc->busy = false; 6451 |
| 6452 callout_init(&intel_crtc->idle_callout, CALLOUT_MPSAFE); | 6452 callout_init(&intel_crtc->idle_callout, 1); |
| 6453} 6454 6455int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, 6456 struct drm_file *file) 6457{ 6458 struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data; 6459 struct drm_mode_object *drmmode_obj; 6460 struct intel_crtc *crtc; --- 572 unchanged lines hidden (view full) --- 7033 7034 intel_pch_pll_init(dev); 7035 7036 /* Just disable it once at startup */ 7037 i915_disable_vga(dev); 7038 intel_setup_outputs(dev); 7039 7040 TASK_INIT(&dev_priv->idle_task, 0, intel_idle_update, dev_priv); | 6453} 6454 6455int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, 6456 struct drm_file *file) 6457{ 6458 struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data; 6459 struct drm_mode_object *drmmode_obj; 6460 struct intel_crtc *crtc; --- 572 unchanged lines hidden (view full) --- 7033 7034 intel_pch_pll_init(dev); 7035 7036 /* Just disable it once at startup */ 7037 i915_disable_vga(dev); 7038 intel_setup_outputs(dev); 7039 7040 TASK_INIT(&dev_priv->idle_task, 0, intel_idle_update, dev_priv); |
| 7041 callout_init(&dev_priv->idle_callout, CALLOUT_MPSAFE); | 7041 callout_init(&dev_priv->idle_callout, 1); |
| 7042} 7043 7044void intel_modeset_gem_init(struct drm_device *dev) 7045{ 7046 intel_modeset_init_hw(dev); 7047 7048 intel_setup_overlay(dev); 7049} --- 200 unchanged lines hidden --- | 7042} 7043 7044void intel_modeset_gem_init(struct drm_device *dev) 7045{ 7046 intel_modeset_init_hw(dev); 7047 7048 intel_setup_overlay(dev); 7049} --- 200 unchanged lines hidden --- |