Skip to content

Commit

Permalink
drm/i915: Remove references to crtc->active from intel_fbdev.c
Browse files Browse the repository at this point in the history
It should really use the atomic state.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Maarten Lankhorst authored and Daniel Vetter committed Sep 14, 2015
1 parent 44522d8 commit d551599
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/intel_fbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,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;
Expand All @@ -575,7 +575,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;
Expand Down Expand Up @@ -638,7 +638,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,
Expand Down

0 comments on commit d551599

Please sign in to comment.