| From f1ecaf8f9c9924badd4c8f690e39632d31edb500 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Thu, 14 Jan 2016 14:53:34 +0200 |
| Subject: drm/i915: Start WM computation from scratch on ILK-BDW |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| |
| commit f1ecaf8f9c9924badd4c8f690e39632d31edb500 upstream. |
| |
| 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 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -2281,6 +2281,7 @@ static int ilk_compute_pipe_wm(struct in |
| 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, |
