On Mon, Nov 10, 2014 at 07:15:04PM +0200, Ville Syrjälä wrote: > On Mon, Nov 10, 2014 at 02:47:30PM -0200, Paulo Zanoni wrote: > > From: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > > > > Commit "drm/i915: create a prepare phase for sprite plane updates" > > changed the old_obj pointer we use when committing sprite planes, > > which caused a WARN() and a BUG() to be triggered. Later, commit > > "drm/i915: use intel_fb_obj() macros to assign gem objects" introduced > > the same problem to function intel_commit_sprite_plane(). > > > > Regression introduced by: > > commit ec82cb793c9224e0692eed904f43490cf70e8258 > > Author: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx> > > Date: Fri Oct 24 14:51:32 2014 +0100 > > drm/i915: create a prepare phase for sprite plane updates > > and: > > commit 77cde95217484e845743818691df026cec2534f4 > > Author: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx> > > Date: Fri Oct 24 14:51:33 2014 +0100 > > drm/i915: use intel_fb_obj() macros to assign gem objects > > > > Credits to Imre Deak for pointing out the exact lines that were wrong. > > > > v2: Also fix intel_commit_sprite_plane() (Ville) > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85634 > > Testcase: igt/pm_rpm/legacy-planes > > Testcase: igt/pm_rpm/legacy-planes-dpms > > Testcase: igt/pm_rpm/universal-planes > > Testcase: igt/pm_rpm/universal-planes-dpms > > Credits-to: Imre Deak <imre.deak@xxxxxxxxx> > > Cc: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx> > > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > > Yep, I believe that should do it. > > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
