diff options
| author | Darren Etheridge <detheridge@ti.com> | 2013-06-21 14:52:26 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-27 19:12:46 -0400 |
| commit | f7b4575601dafb3cf3c568465ec6980de6d09b94 (patch) | |
| tree | 8e7e6aaa8de0c4b9d33d642b1f114524a88eeaa0 | |
| parent | e1c5d0a819e495a79cf76a8c63c5a30c327a89a5 (diff) | |
drm/tilcdc: whitespace fixes and tidyup
keeping checkpatch happy.
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c index 1d296707ceda..43120fa3b6e9 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c | |||
| @@ -42,7 +42,8 @@ struct tilcdc_crtc { | |||
| 42 | 42 | ||
| 43 | static void unref_worker(struct work_struct *work) | 43 | static void unref_worker(struct work_struct *work) |
| 44 | { | 44 | { |
| 45 | struct tilcdc_crtc *tilcdc_crtc = container_of(work, struct tilcdc_crtc, work); | 45 | struct tilcdc_crtc *tilcdc_crtc = |
| 46 | container_of(work, struct tilcdc_crtc, work); | ||
| 46 | struct drm_device *dev = tilcdc_crtc->base.dev; | 47 | struct drm_device *dev = tilcdc_crtc->base.dev; |
| 47 | struct drm_framebuffer *fb; | 48 | struct drm_framebuffer *fb; |
| 48 | 49 | ||
| @@ -55,10 +56,12 @@ static void unref_worker(struct work_struct *work) | |||
| 55 | static void set_scanout(struct drm_crtc *crtc, int n) | 56 | static void set_scanout(struct drm_crtc *crtc, int n) |
| 56 | { | 57 | { |
| 57 | static const uint32_t base_reg[] = { | 58 | static const uint32_t base_reg[] = { |
| 58 | LCDC_DMA_FB_BASE_ADDR_0_REG, LCDC_DMA_FB_BASE_ADDR_1_REG, | 59 | LCDC_DMA_FB_BASE_ADDR_0_REG, |
| 60 | LCDC_DMA_FB_BASE_ADDR_1_REG, | ||
| 59 | }; | 61 | }; |
| 60 | static const uint32_t ceil_reg[] = { | 62 | static const uint32_t ceil_reg[] = { |
| 61 | LCDC_DMA_FB_CEILING_ADDR_0_REG, LCDC_DMA_FB_CEILING_ADDR_1_REG, | 63 | LCDC_DMA_FB_CEILING_ADDR_0_REG, |
| 64 | LCDC_DMA_FB_CEILING_ADDR_1_REG, | ||
| 62 | }; | 65 | }; |
| 63 | static const uint32_t stat[] = { | 66 | static const uint32_t stat[] = { |
| 64 | LCDC_END_OF_FRAME0, LCDC_END_OF_FRAME1, | 67 | LCDC_END_OF_FRAME0, LCDC_END_OF_FRAME1, |
| @@ -194,7 +197,8 @@ static void tilcdc_crtc_dpms(struct drm_crtc *crtc, int mode) | |||
| 194 | tilcdc_crtc->frame_done = false; | 197 | tilcdc_crtc->frame_done = false; |
| 195 | stop(crtc); | 198 | stop(crtc); |
| 196 | 199 | ||
| 197 | /* if necessary wait for framedone irq which will still come | 200 | /* |
| 201 | * if necessary wait for framedone irq which will still come | ||
| 198 | * before putting things to sleep.. | 202 | * before putting things to sleep.. |
| 199 | */ | 203 | */ |
| 200 | if (priv->rev == 2) { | 204 | if (priv->rev == 2) { |
| @@ -499,7 +503,7 @@ int tilcdc_crtc_mode_valid(struct drm_crtc *crtc, struct drm_display_mode *mode) | |||
| 499 | * configured from the DT | 503 | * configured from the DT |
| 500 | */ | 504 | */ |
| 501 | if (mode->clock > priv->max_pixelclock) { | 505 | if (mode->clock > priv->max_pixelclock) { |
| 502 | DBG("Pruning mode, pixel clock too high"); | 506 | DBG("Pruning mode: pixel clock too high"); |
| 503 | return MODE_CLOCK_HIGH; | 507 | return MODE_CLOCK_HIGH; |
| 504 | } | 508 | } |
| 505 | 509 | ||
| @@ -514,7 +518,7 @@ int tilcdc_crtc_mode_valid(struct drm_crtc *crtc, struct drm_display_mode *mode) | |||
| 514 | bandwidth = mode->hdisplay * mode->vdisplay * | 518 | bandwidth = mode->hdisplay * mode->vdisplay * |
| 515 | drm_mode_vrefresh(mode); | 519 | drm_mode_vrefresh(mode); |
| 516 | if (bandwidth > priv->max_bandwidth) { | 520 | if (bandwidth > priv->max_bandwidth) { |
| 517 | DBG("Pruning mode, exceeds defined bandwidth limit"); | 521 | DBG("Pruning mode: exceeds defined bandwidth limit"); |
| 518 | return MODE_BAD; | 522 | return MODE_BAD; |
| 519 | } | 523 | } |
| 520 | 524 | ||
