Skip to content

Commit

Permalink
gma500: Fix Poulsbo suspend/resume crash on devices with SDVO ports
Browse files Browse the repository at this point in the history
Reported-by: Guillaume Clément <guillaume@baobob.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Alan Cox authored and Dave Airlie committed May 22, 2012
1 parent bc79482 commit 7beff62
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/gma500/psb_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ static int psb_save_display_registers(struct drm_device *dev)
}

list_for_each_entry(connector, &dev->mode_config.connector_list, head)
connector->funcs->save(connector);
if (connector->funcs->save)
connector->funcs->save(connector);

mutex_unlock(&dev->mode_config.mutex);
return 0;
Expand Down Expand Up @@ -235,7 +236,8 @@ static int psb_restore_display_registers(struct drm_device *dev)
crtc->funcs->restore(crtc);

list_for_each_entry(connector, &dev->mode_config.connector_list, head)
connector->funcs->restore(connector);
if (connector->funcs->restore)
connector->funcs->restore(connector);

mutex_unlock(&dev->mode_config.mutex);
return 0;
Expand Down

0 comments on commit 7beff62

Please sign in to comment.