Re: [Intel-gfx] 4.17-rc2: Could not determine valid watermarks for inherited state

[Dave Jones <davej@codemonkey.org.uk>]

On Thu, Apr 26, 2018 at 06:25:13PM +0300, Ville Syrjälä wrote:
 > On Thu, Apr 26, 2018 at 06:16:41PM +0300, Ville Syrjälä wrote:
 > > On Thu, Apr 26, 2018 at 05:56:14PM +0300, Ville Syrjälä wrote:
 > > > On Thu, Apr 26, 2018 at 10:27:19AM -0400, Dave Jones wrote:
 > > > > [    1.176131] [drm:i9xx_get_initial_plane_config] pipe A/primary A with fb: size=800x600@32, offset=0, pitch 3200, size 0x1d4c00
 > > > > [    1.176161] [drm:i915_gem_object_create_stolen_for_preallocated] creating preallocated stolen object: stolen_offset=0x0000000000000000, gtt_offset=0x0000000000000000, size=0x00000000001d5000
 > > > > [    1.176312] [drm:intel_alloc_initial_plane_obj.isra.127] initial plane fb obj         (ptrval)
 > > > > [    1.176351] [drm:intel_modeset_init] pipe A active planes 0x1
 > > > > [    1.176456] [drm:drm_atomic_helper_check_plane_state] Plane must cover entire CRTC
 > > > > [    1.176481] [drm:drm_rect_debug_print] dst: 800x600+0+0
 > > > > [    1.176494] [drm:drm_rect_debug_print] clip: 1366x768+0+0
 > > > 
 > > > OK, so that's the problem right there. The fb we took over from the
 > > > BIOS was 800x600, but now we're trying to set up a 1366x768 mode.
 > > > 
 > > > We seem to be missing checks to make sure the initial fb is actually
 > > > big enough for the mode we're currently using :(
 > > 
 > Hmm. Or maybe we should just stick to the pipe src size.
 > 
 > I'm curious whether this fixes the problem?
 > 
 > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
 > index 0f8c7389e87d..30824beedef7 100644
 > --- a/drivers/gpu/drm/i915/intel_display.c
 > +++ b/drivers/gpu/drm/i915/intel_display.c
 > @@ -15284,6 +15284,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
 >  		memset(&crtc->base.mode, 0, sizeof(crtc->base.mode));
 >  		if (crtc_state->base.active) {
 >  			intel_mode_from_pipe_config(&crtc->base.mode, crtc_state);
 > +			crtc->base.mode.hdisplay = crtc_state->pipe_src_w;
 > +			crtc->base.mode.vdisplay = crtc_state->pipe_src_h;
 >  			intel_mode_from_pipe_config(&crtc_state->base.adjusted_mode, crtc_state);
 >  			WARN_ON(drm_atomic_set_mode_for_crtc(crtc->base.state, &crtc->base.mode));
 > 

It does!

Feel free to throw a Tested-by: Dave Jones <davej@codemonkey.org.uk> in there.

	Dave