diff options
| author | Tvrtko Ursulin | 2016-01-19 16:25:17 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin | 2016-01-20 11:08:54 +0100 |
| commit | 3f36b93797bd773eb27e31cf53e3d1f9e64c77ab (patch) | |
| tree | bd5214b9e34fc730aa842fb88a50091d999536ca /drivers/gpu/drm/i915/intel_drv.h | |
| parent | Revert "drm/i915: Add two-stage ILK-style watermark programming (v10)" (diff) | |
| download | kernel-qcow2-linux-3f36b93797bd773eb27e31cf53e3d1f9e64c77ab.tar.gz kernel-qcow2-linux-3f36b93797bd773eb27e31cf53e3d1f9e64c77ab.tar.xz kernel-qcow2-linux-3f36b93797bd773eb27e31cf53e3d1f9e64c77ab.zip | |
drm/i915: Do not put big intel_crtc_state on the stack
Having this on stack triggers the -Wframe-larger-than=1024 and
is not nice to put such big things on the kernel stack anyway.
This required a little bit of refactoring to handle the new
failure path from vlv_force_pll_on.
v2: Corrected some whitespace.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: John Harrison <john.c.harrison@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1453217117-26125-1-git-send-email-tvrtko.ursulin@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 15917e3a3352..bc970125ec76 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1154,8 +1154,8 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv, struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc, struct intel_crtc_state *state); -void vlv_force_pll_on(struct drm_device *dev, enum pipe pipe, - const struct dpll *dpll); +int vlv_force_pll_on(struct drm_device *dev, enum pipe pipe, + const struct dpll *dpll); void vlv_force_pll_off(struct drm_device *dev, enum pipe pipe); /* modesetting asserts */ |