Commit d5515991 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

drm/i915: Remove references to crtc->active from intel_fbdev.c

It should really use the atomic state.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 44522d85
...@@ -550,7 +550,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, ...@@ -550,7 +550,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
intel_fb_obj(crtc->primary->state->fb); intel_fb_obj(crtc->primary->state->fb);
intel_crtc = to_intel_crtc(crtc); 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", DRM_DEBUG_KMS("pipe %c not active or no fb, skipping\n",
pipe_name(intel_crtc->pipe)); pipe_name(intel_crtc->pipe));
continue; continue;
...@@ -575,7 +575,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, ...@@ -575,7 +575,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
intel_crtc = to_intel_crtc(crtc); intel_crtc = to_intel_crtc(crtc);
if (!intel_crtc->active) { if (!crtc->state->active) {
DRM_DEBUG_KMS("pipe %c not active, skipping\n", DRM_DEBUG_KMS("pipe %c not active, skipping\n",
pipe_name(intel_crtc->pipe)); pipe_name(intel_crtc->pipe));
continue; continue;
...@@ -638,7 +638,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, ...@@ -638,7 +638,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
for_each_crtc(dev, crtc) { for_each_crtc(dev, crtc) {
intel_crtc = to_intel_crtc(crtc); intel_crtc = to_intel_crtc(crtc);
if (!intel_crtc->active) if (!crtc->state->active)
continue; continue;
WARN(!crtc->primary->fb, WARN(!crtc->primary->fb,
......
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