Hi,
On 13 July 2015 at 15:30, Maarten Lankhorst
<maarten.lankhorst@xxxxxxxxxxxxxxx> wrote:
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 037a85f1b127..e4d8acc63823 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15204,7 +15204,9 @@ void intel_modeset_init(struct drm_device *dev)
> drm_modeset_unlock_all(dev);
>
> for_each_intel_crtc(dev, crtc) {
> - if (!crtc->active)
> + struct intel_initial_plane_config plane_config;
> +
> + if (!crtc->base.state->active)
Unrelated change from crtc->active to crtc->base.state->active - can
we do this in one of the later patches?
> + plane_config.fb = NULL;
memset to 0 instead?
> @@ -15713,6 +15716,8 @@ void intel_modeset_gem_init(struct drm_device *dev)
> if (ret) {
> DRM_ERROR("failed to pin boot fb on pipe %d\n",
> to_intel_crtc(c)->pipe);
> + obj->frontbuffer_bits &=
> + ~to_intel_plane(c->primary)->frontbuffer_bit;
> drm_framebuffer_unreference(c->primary->fb);
> c->primary->fb = NULL;
> c->primary->crtc = c->primary->state->crtc = NULL;
Unrelated change?
Otherwise:
Reviewed-by: Daniel Stone <daniels@xxxxxxxxxxxxx>
Cheers,
Daniel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
