Hi 2013/4/17 Daniel Vetter <daniel at ffwll.ch>: > On Wed, Apr 17, 2013 at 03:43:54PM +0100, Chris Wilson wrote: >> On Wed, Apr 17, 2013 at 03:31:44PM +0200, Daniel Vetter wrote: >> > For a bunch of reason we need to more accurately track this: >> > - hw pipe state readout for Haswell needs the cpu transcoder. >> > - We need to know the right cpu transcoder in a bunch of places in >> > ->disable and other modeset callbacks. >> > >> > In the future we need to add hw state readout&check support, too. But >> > to avoid ugly merge conflicts do the rote sed job now without any >> > functional changes. >> > >> > Cc: Paulo Zanoni <przanoni at gmail.com> >> > Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch> >> >> A rogue piece of whitespace crept into the end of struct pipe_config. > > Killed. > >> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk> > The patch looks correct and I was going to give a "Reviewed-by" tag too, but then I decided to test it. There's new stuff in dmesg now: [ 16.172092] ------------[ cut here ]------------ [ 16.172139] WARNING: at drivers/gpu/drm/i915/intel_display.c:3944 intel_modeset_check_state+0xac/0x5d0 [i915]() [ 16.172144] Hardware name: Shark Bay Client platform [ 16.172147] wrong connector dpms state [ 16.172484] ------------[ cut here ]------------ [ 16.172506] WARNING: at drivers/gpu/drm/i915/intel_display.c:3946 intel_modeset_check_state+0xcf/0x5d0 [i915]() [ 16.172509] Hardware name: Shark Bay Client platform [ 16.172511] active connector not linked to encoder [ 16.172818] ------------[ cut here ]------------ [ 16.172839] WARNING: at drivers/gpu/drm/i915/intel_display.c:3948 intel_modeset_check_state+0xf0/0x5d0 [i915]() [ 16.172842] Hardware name: Shark Bay Client platform [ 16.172844] encoder->connectors_active not set [ 16.173150] ------------[ cut here ]------------ [ 16.173170] WARNING: at drivers/gpu/drm/i915/intel_display.c:3952 intel_modeset_check_state+0x13b/0x5d0 [i915]() [ 16.173173] Hardware name: Shark Bay Client platform [ 16.173481] ------------[ cut here ]------------ [ 16.173501] WARNING: at drivers/gpu/drm/i915/intel_display.c:8363 intel_modeset_check_state+0x34b/0x5d0 [i915]() [ 16.173505] Hardware name: Shark Bay Client platform [ 16.173507] encoder's hw state doesn't match sw tracking (expected 0, found 1) [ 16.182789] ------------[ cut here ]------------ [ 16.182809] WARNING: at drivers/gpu/drm/i915/intel_display.c:6284 haswell_crtc_mode_set+0x159/0x475 [i915]() [ 16.182810] Hardware name: Shark Bay Client platform [ 16.183055] ------------[ cut here ]------------ [ 16.183073] WARNING: at drivers/gpu/drm/i915/intel_display.c:6286 haswell_crtc_mode_set+0x18f/0x475 [i915]() [ 16.183074] Hardware name: Shark Bay Client platform > Picked up for -fixes, thanks for the review. > -Daniel > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch > _______________________________________________ > Intel-gfx mailing list > Intel-gfx at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni
