Message ID | 1367621884-15021-1-git-send-email-ben@bwidawsk.net (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, May 03, 2013 at 03:58:04PM -0700, Ben Widawsky wrote: > commit b7eab0f52c47c06fc5daa20d40359a97d5d5d3a7 > Author: Jesse Barnes <jbarnes@virtuousgeek.org> > Date: Thu May 2 15:30:47 2013 -0700 > > drm/i915: fix Haswell pfit power well check v2 > > The above commit got rid of the I915_WRITE making the dev_priv no longer > used. Should be squashed if not too late. > > CC: Jesse Barnes <jbarnes@virtuousgeek.org> > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> I've accidentally pushed out -fixes before squashing in the fixup, I think you've been extremely unlucky to catch -nightly in that 5 minute window. Should be fixed now. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 78e8494..c0c4dfc 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5916,7 +5916,6 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc, static void haswell_modeset_global_resources(struct drm_device *dev) { - struct drm_i915_private *dev_priv = dev->dev_private; bool enable = false; struct intel_crtc *crtc; struct intel_encoder *encoder;
commit b7eab0f52c47c06fc5daa20d40359a97d5d5d3a7 Author: Jesse Barnes <jbarnes@virtuousgeek.org> Date: Thu May 2 15:30:47 2013 -0700 drm/i915: fix Haswell pfit power well check v2 The above commit got rid of the I915_WRITE making the dev_priv no longer used. Should be squashed if not too late. CC: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> --- drivers/gpu/drm/i915/intel_display.c | 1 - 1 file changed, 1 deletion(-)