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

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.comReviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent a36c027d
...@@ -2824,7 +2824,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc, ...@@ -2824,7 +2824,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
continue; continue;
if (intel_plane_ggtt_offset(state) == plane_config->base) { if (intel_plane_ggtt_offset(state) == plane_config->base) {
fb = c->primary->fb; fb = state->base.fb;
drm_framebuffer_get(fb); drm_framebuffer_get(fb);
goto valid_fb; goto valid_fb;
} }
......
...@@ -640,7 +640,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, ...@@ -640,7 +640,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
if (!crtc->state->active) if (!crtc->state->active)
continue; continue;
WARN(!crtc->primary->fb, WARN(!crtc->primary->state->fb,
"re-used BIOS config but lost an fb on crtc %d\n", "re-used BIOS config but lost an fb on crtc %d\n",
crtc->base.id); crtc->base.id);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment