|
@@ -2438,8 +2438,10 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc,
|
|
|
if (!intel_crtc->base.primary->fb)
|
|
|
return;
|
|
|
|
|
|
- if (intel_alloc_plane_obj(intel_crtc, plane_config))
|
|
|
+ if (intel_alloc_plane_obj(intel_crtc, plane_config)) {
|
|
|
+ update_state_fb(intel_crtc->base.primary);
|
|
|
return;
|
|
|
+ }
|
|
|
|
|
|
kfree(intel_crtc->base.primary->fb);
|
|
|
intel_crtc->base.primary->fb = NULL;
|
|
@@ -6663,7 +6665,6 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
|
|
|
plane_config->size);
|
|
|
|
|
|
crtc->base.primary->fb = fb;
|
|
|
- update_state_fb(crtc->base.primary);
|
|
|
}
|
|
|
|
|
|
static void chv_crtc_clock_get(struct intel_crtc *crtc,
|
|
@@ -7704,7 +7705,6 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
|
|
|
plane_config->size);
|
|
|
|
|
|
crtc->base.primary->fb = fb;
|
|
|
- update_state_fb(crtc->base.primary);
|
|
|
return;
|
|
|
|
|
|
error:
|
|
@@ -7798,7 +7798,6 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc,
|
|
|
plane_config->size);
|
|
|
|
|
|
crtc->base.primary->fb = fb;
|
|
|
- update_state_fb(crtc->base.primary);
|
|
|
}
|
|
|
|
|
|
static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
|