On 08/27/2015 06:44 AM, Maarten Lankhorst wrote:
> It should really use the atomic state.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_fbdev.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> index 6c9351b2e3af..6333241624c4 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -587,7 +587,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
> intel_fb_obj(crtc->primary->state->fb);
> intel_crtc = to_intel_crtc(crtc);
>
> - if (!intel_crtc->active || !obj) {
> + if (!crtc->state->active || !obj) {
> DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n",
> pipe_name(intel_crtc->pipe));
> continue;
> @@ -612,7 +612,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
>
> intel_crtc = to_intel_crtc(crtc);
>
> - if (!intel_crtc->active) {
> + if (!crtc->state->active) {
> DRM_DEBUG_KMS("pipe %c not active, skipping\n",
> pipe_name(intel_crtc->pipe));
> continue;
> @@ -675,7 +675,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
> for_each_crtc(dev, crtc) {
> intel_crtc = to_intel_crtc(crtc);
>
> - if (!intel_crtc->active)
> + if (!crtc->state->active)
> continue;
>
> WARN(!crtc->primary->fb,
>
We still have too many of these "active" states to track... Maybe we should rename one or more.
Reviewed-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
