Commit 8bc20f65 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Stop consulting plane->fb 



We want to get rid of plane->fb on atomic drivers. Stop looking at it.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180322152313.6561-10-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent a36c027d

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -2824,7 +2824,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc, 
			continue;



		if (intel_plane_ggtt_offset(state) == plane_config->base) {

			fb = c->primary->fb;

			fb = state->base.fb;

			drm_framebuffer_get(fb);

			goto valid_fb;

		}

drivers/gpu/drm/i915/intel_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, 
		if (!crtc->state->active)

			continue;



		WARN(!crtc->primary->fb,

		WARN(!crtc->primary->state->fb,

		     "re-used BIOS config but lost an fb on crtc %d\n",

		     crtc->base.id);

	}