diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dss.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index b473aff466d7..14ffe23b5ecf 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c | |||
| @@ -1552,9 +1552,6 @@ static void dss_shutdown(struct platform_device *pdev) | |||
| 1552 | DSSDBG("shutdown\n"); | 1552 | DSSDBG("shutdown\n"); |
| 1553 | 1553 | ||
| 1554 | for_each_dss_display(dssdev) { | 1554 | for_each_dss_display(dssdev) { |
| 1555 | if (!dssdev->driver) | ||
| 1556 | continue; | ||
| 1557 | |||
| 1558 | if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) | 1555 | if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) |
| 1559 | dssdev->driver->disable(dssdev); | 1556 | dssdev->driver->disable(dssdev); |
| 1560 | } | 1557 | } |
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index f2a69cfb6ebf..d0f6929857bb 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
| @@ -723,9 +723,6 @@ static int omap_drm_suspend_all_displays(struct drm_device *ddev) | |||
| 723 | for (i = 0; i < priv->num_pipes; i++) { | 723 | for (i = 0; i < priv->num_pipes; i++) { |
| 724 | struct omap_dss_device *display = priv->pipes[i].display; | 724 | struct omap_dss_device *display = priv->pipes[i].display; |
| 725 | 725 | ||
| 726 | if (!display->driver) | ||
| 727 | continue; | ||
| 728 | |||
| 729 | if (display->state == OMAP_DSS_DISPLAY_ACTIVE) { | 726 | if (display->state == OMAP_DSS_DISPLAY_ACTIVE) { |
| 730 | display->driver->disable(display); | 727 | display->driver->disable(display); |
| 731 | display->activate_after_resume = true; | 728 | display->activate_after_resume = true; |
| @@ -745,9 +742,6 @@ static int omap_drm_resume_all_displays(struct drm_device *ddev) | |||
| 745 | for (i = 0; i < priv->num_pipes; i++) { | 742 | for (i = 0; i < priv->num_pipes; i++) { |
| 746 | struct omap_dss_device *display = priv->pipes[i].display; | 743 | struct omap_dss_device *display = priv->pipes[i].display; |
| 747 | 744 | ||
| 748 | if (!display->driver) | ||
| 749 | continue; | ||
| 750 | |||
| 751 | if (display->activate_after_resume) { | 745 | if (display->activate_after_resume) { |
| 752 | display->driver->enable(display); | 746 | display->driver->enable(display); |
| 753 | display->activate_after_resume = false; | 747 | display->activate_after_resume = false; |
