diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-01-14 14:53:34 +0200 |
|---|---|---|
| committer | Matt Roper <matthew.d.roper@intel.com> | 2016-01-14 18:33:25 -0800 |
| commit | f1ecaf8f9c9924badd4c8f690e39632d31edb500 (patch) | |
| tree | 386a94552b10ba3229c3b49451a9f0cd8db257a7 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | 87ad321287ae99a8932af1a19ac99849284a62bd (diff) | |
| download | op-kernel-dev-f1ecaf8f9c9924badd4c8f690e39632d31edb500.zip op-kernel-dev-f1ecaf8f9c9924badd4c8f690e39632d31edb500.tar.gz | |
drm/i915: Start WM computation from scratch on ILK-BDW
ilk_compute_pipe_wm() assumes as zeroed pipe_wm structure when it
starts. We used to pass such a zeroed struct in, but this got broken
when the pipe_wm structure got embedded in the crtc state.
To fix it without too much fuzz, we need to resort to a memset().
Fixes: 4e0963c7663b ("drm/i915: Calculate pipe watermarks into CRTC state (v3)")
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1452776015-22076-1-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 465ca76..966c4c2 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2317,6 +2317,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc *intel_crtc, return PTR_ERR(cstate); pipe_wm = &cstate->wm.optimal.ilk; + memset(pipe_wm, 0, sizeof(*pipe_wm)); for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) { ps = drm_atomic_get_plane_state(state, |
