- refactor i915/snd-hda interaction to use the component framework (Imre) - psr cleanups and small fixes (Rodrigo) - a few perf w/a from Ken Graunke - switch to atomic plane helpers (Matt Roper) - wc mmap support (Chris Wilson & Akash Goel) - smaller things all over * tag 'drm-intel-next-2015-01-17' of git://anongit.freedesktop.org/drm-intel: (40 commits) drm/i915: Update DRIVER_DATE to 20150117 i915: reuse %ph to dump small buffers drm/i915: Ensure the HiZ RAW Stall Optimization is on for Cherryview. drm/i915: Enable the HiZ RAW Stall Optimization on Broadwell. drm/i915: PSR link standby at debugfs drm/i915: group link_standby setup and let this info visible everywhere. drm/i915: Add missing vbt check. drm/i915: PSR HSW/BDW: Fix inverted logic at sink main_link_active bit. drm/i915: PSR VLV/CHV: Remove condition checks that only applies to Haswell. drm/i915: VLV/CHV PSR needs to exit PSR on every flush. drm/i915: Fix kerneldoc for i915 atomic plane code drm/i915: Don't pretend SDVO hotplug works on 915 drm/i915: Don't register HDMI connectors for eDP ports on VLV/CHV drm/i915: Remove I915_HAS_HOTPLUG() check from i915_hpd_irq_setup() drm/i915: Make hpd arrays big enough to avoid out of bounds access Revert "drm/i915/chv: Use timeout mode for RC6 on chv" drm/i915: Improve HiZ throughput on Cherryview. drm/i915: Reset CSB read pointer in ring init drm/i915: Drop unused position fields (v2) drm/i915: Move to atomic plane helpers (v9) ...
Showing the changes to include/drm (2 of 33 files). Show all
Unified · Split
| @@ -0,0 +1,38 @@ | ||
| 1 | +/* | |
| 2 | + * Copyright © 2014 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 | |
| 9 | + * Software is furnished to do so, subject to the following conditions: | |
| 10 | + * | |
| 11 | + * The above copyright notice and this permission notice (including the next | |
| 12 | + * paragraph) shall be included in all copies or substantial portions of the | |
| 13 | + * Software. | |
| 14 | + * | |
| 15 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 16 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 17 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | |
| 18 | + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
| 19 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | |
| 20 | + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | |
| 21 | + * IN THE SOFTWARE. | |
| 22 | + */ | |
| 23 | + | |
| 24 | +#ifndef _I915_COMPONENT_H_ | |
| 25 | +#define _I915_COMPONENT_H_ | |
| 26 | + | |
| 27 | +struct i915_audio_component { | |
| 28 | + struct device *dev; | |
| 29 | + | |
| 30 | + const struct i915_audio_component_ops { | |
| 31 | + struct module *owner; | |
| 32 | + void (*get_power)(struct device *); | |
| 33 | + void (*put_power)(struct device *); | |
| 34 | + int (*get_cdclk_freq)(struct device *); | |
| 35 | + } *ops; | |
| 36 | +}; | |
| 37 | + | |
| 38 | +#endif /* _I915_COMPONENT_H_ */ | |
| @@ -1,37 +0,0 @@ | ||
| 1 | −/************************************************************************** | |
| 2 | − * | |
| 3 | − * Copyright 2013 Intel Inc. | |
| 4 | − * All Rights Reserved. | |
| 5 | − * | |
| 6 | − * Permission is hereby granted, free of charge, to any person obtaining a | |
| 7 | − * copy of this software and associated documentation files (the | |
| 8 | − * "Software"), to deal in the Software without restriction, including | |
| 9 | − * without limitation the rights to use, copy, modify, merge, publish, | |
| 10 | − * distribute, sub license, and/or sell copies of the Software, and to | |
| 11 | − * permit persons to whom the Software is furnished to do so, subject to | |
| 12 | − * the following conditions: | |
| 13 | − * | |
| 14 | − * The above copyright notice and this permission notice (including the | |
| 15 | − * next paragraph) shall be included in all copies or substantial portions | |
| 16 | − * of the Software. | |
| 17 | − * | |
| 18 | − * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 19 | − * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 20 | − * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL | |
| 21 | − * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, | |
| 22 | − * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | |
| 23 | − * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE | |
| 24 | − * USE OR OTHER DEALINGS IN THE SOFTWARE. | |
| 25 | − * | |
| 26 | − * | |
| 27 | − **************************************************************************/ | |
| 28 | − | |
| 29 | −#ifndef _I915_POWERWELL_H_ | |
| 30 | −#define _I915_POWERWELL_H_ | |
| 31 | − | |
| 32 | −/* For use by hda_i915 driver */ | |
| 33 | −extern int i915_request_power_well(void); | |
| 34 | −extern int i915_release_power_well(void); | |
| 35 | −extern int i915_get_cdclk_freq(void); | |
| 36 | − | |
| 37 | −#endif /* _I915_POWERWELL_H_ */ | |