diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-01-10 17:02:07 -0500 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-03-20 08:30:15 -0400 |
| commit | 222025e42d7f77133b8c3a2355d20a6004096c4b (patch) | |
| tree | 01a780f9584c2c8e58bb0247424c1d346626d2c7 /drivers/gpu/drm/omapdrm | |
| parent | 6b94aea01d4f96235e947892f6c39f837045e741 (diff) | |
drm: omapdrm: Fix indentation of structure and array initializers
Indenting by one tab is enough.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_crtc.c | 26 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 106 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 20 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_plane.c | 24 |
5 files changed, 96 insertions, 96 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index b0566a1ca28f..b9c3d8f830e8 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c | |||
| @@ -174,15 +174,15 @@ static void omap_crtc_unregister_framedone_handler( | |||
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | static const struct dss_mgr_ops mgr_ops = { | 176 | static const struct dss_mgr_ops mgr_ops = { |
| 177 | .connect = omap_crtc_connect, | 177 | .connect = omap_crtc_connect, |
| 178 | .disconnect = omap_crtc_disconnect, | 178 | .disconnect = omap_crtc_disconnect, |
| 179 | .start_update = omap_crtc_start_update, | 179 | .start_update = omap_crtc_start_update, |
| 180 | .enable = omap_crtc_enable, | 180 | .enable = omap_crtc_enable, |
| 181 | .disable = omap_crtc_disable, | 181 | .disable = omap_crtc_disable, |
| 182 | .set_timings = omap_crtc_set_timings, | 182 | .set_timings = omap_crtc_set_timings, |
| 183 | .set_lcd_config = omap_crtc_set_lcd_config, | 183 | .set_lcd_config = omap_crtc_set_lcd_config, |
| 184 | .register_framedone_handler = omap_crtc_register_framedone_handler, | 184 | .register_framedone_handler = omap_crtc_register_framedone_handler, |
| 185 | .unregister_framedone_handler = omap_crtc_unregister_framedone_handler, | 185 | .unregister_framedone_handler = omap_crtc_unregister_framedone_handler, |
| 186 | }; | 186 | }; |
| 187 | 187 | ||
| 188 | /* | 188 | /* |
| @@ -658,10 +658,10 @@ void omap_crtc_flush(struct drm_crtc *crtc) | |||
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | static const char *channel_names[] = { | 660 | static const char *channel_names[] = { |
| 661 | [OMAP_DSS_CHANNEL_LCD] = "lcd", | 661 | [OMAP_DSS_CHANNEL_LCD] = "lcd", |
| 662 | [OMAP_DSS_CHANNEL_DIGIT] = "tv", | 662 | [OMAP_DSS_CHANNEL_DIGIT] = "tv", |
| 663 | [OMAP_DSS_CHANNEL_LCD2] = "lcd2", | 663 | [OMAP_DSS_CHANNEL_LCD2] = "lcd2", |
| 664 | [OMAP_DSS_CHANNEL_LCD3] = "lcd3", | 664 | [OMAP_DSS_CHANNEL_LCD3] = "lcd3", |
| 665 | }; | 665 | }; |
| 666 | 666 | ||
| 667 | void omap_crtc_pre_init(void) | 667 | void omap_crtc_pre_init(void) |
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c index 56c60552abba..b4476859c1ad 100644 --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | |||
| @@ -58,19 +58,19 @@ static const struct { | |||
| 58 | uint32_t slot_w; /* width of each slot (in pixels) */ | 58 | uint32_t slot_w; /* width of each slot (in pixels) */ |
| 59 | uint32_t slot_h; /* height of each slot (in pixels) */ | 59 | uint32_t slot_h; /* height of each slot (in pixels) */ |
| 60 | } geom[TILFMT_NFORMATS] = { | 60 | } geom[TILFMT_NFORMATS] = { |
| 61 | [TILFMT_8BIT] = GEOM(0, 0, 1), | 61 | [TILFMT_8BIT] = GEOM(0, 0, 1), |
| 62 | [TILFMT_16BIT] = GEOM(0, 1, 2), | 62 | [TILFMT_16BIT] = GEOM(0, 1, 2), |
| 63 | [TILFMT_32BIT] = GEOM(1, 1, 4), | 63 | [TILFMT_32BIT] = GEOM(1, 1, 4), |
| 64 | [TILFMT_PAGE] = GEOM(SLOT_WIDTH_BITS, SLOT_HEIGHT_BITS, 1), | 64 | [TILFMT_PAGE] = GEOM(SLOT_WIDTH_BITS, SLOT_HEIGHT_BITS, 1), |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | 67 | ||
| 68 | /* lookup table for registers w/ per-engine instances */ | 68 | /* lookup table for registers w/ per-engine instances */ |
| 69 | static const uint32_t reg[][4] = { | 69 | static const uint32_t reg[][4] = { |
| 70 | [PAT_STATUS] = {DMM_PAT_STATUS__0, DMM_PAT_STATUS__1, | 70 | [PAT_STATUS] = {DMM_PAT_STATUS__0, DMM_PAT_STATUS__1, |
| 71 | DMM_PAT_STATUS__2, DMM_PAT_STATUS__3}, | 71 | DMM_PAT_STATUS__2, DMM_PAT_STATUS__3}, |
| 72 | [PAT_DESCR] = {DMM_PAT_DESCR__0, DMM_PAT_DESCR__1, | 72 | [PAT_DESCR] = {DMM_PAT_DESCR__0, DMM_PAT_DESCR__1, |
| 73 | DMM_PAT_DESCR__2, DMM_PAT_DESCR__3}, | 73 | DMM_PAT_DESCR__2, DMM_PAT_DESCR__3}, |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | /* simple allocator to grab next 16 byte aligned memory from txn */ | 76 | /* simple allocator to grab next 16 byte aligned memory from txn */ |
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 8241ed9b353c..642748cb7a4e 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
| @@ -610,55 +610,55 @@ static const struct vm_operations_struct omap_gem_vm_ops = { | |||
| 610 | }; | 610 | }; |
| 611 | 611 | ||
| 612 | static const struct file_operations omapdriver_fops = { | 612 | static const struct file_operations omapdriver_fops = { |
| 613 | .owner = THIS_MODULE, | 613 | .owner = THIS_MODULE, |
| 614 | .open = drm_open, | 614 | .open = drm_open, |
| 615 | .unlocked_ioctl = drm_ioctl, | 615 | .unlocked_ioctl = drm_ioctl, |
| 616 | .release = drm_release, | 616 | .release = drm_release, |
| 617 | .mmap = omap_gem_mmap, | 617 | .mmap = omap_gem_mmap, |
| 618 | .poll = drm_poll, | 618 | .poll = drm_poll, |
| 619 | .read = drm_read, | 619 | .read = drm_read, |
| 620 | .llseek = noop_llseek, | 620 | .llseek = noop_llseek, |
| 621 | }; | 621 | }; |
| 622 | 622 | ||
| 623 | static struct drm_driver omap_drm_driver = { | 623 | static struct drm_driver omap_drm_driver = { |
| 624 | .driver_features = | 624 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM |
| 625 | DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, | 625 | | DRIVER_PRIME, |
| 626 | .load = dev_load, | 626 | .load = dev_load, |
| 627 | .unload = dev_unload, | 627 | .unload = dev_unload, |
| 628 | .open = dev_open, | 628 | .open = dev_open, |
| 629 | .lastclose = dev_lastclose, | 629 | .lastclose = dev_lastclose, |
| 630 | .preclose = dev_preclose, | 630 | .preclose = dev_preclose, |
| 631 | .postclose = dev_postclose, | 631 | .postclose = dev_postclose, |
| 632 | .set_busid = drm_platform_set_busid, | 632 | .set_busid = drm_platform_set_busid, |
| 633 | .get_vblank_counter = drm_vblank_count, | 633 | .get_vblank_counter = drm_vblank_count, |
| 634 | .enable_vblank = omap_irq_enable_vblank, | 634 | .enable_vblank = omap_irq_enable_vblank, |
| 635 | .disable_vblank = omap_irq_disable_vblank, | 635 | .disable_vblank = omap_irq_disable_vblank, |
| 636 | .irq_preinstall = omap_irq_preinstall, | 636 | .irq_preinstall = omap_irq_preinstall, |
| 637 | .irq_postinstall = omap_irq_postinstall, | 637 | .irq_postinstall = omap_irq_postinstall, |
| 638 | .irq_uninstall = omap_irq_uninstall, | 638 | .irq_uninstall = omap_irq_uninstall, |
| 639 | .irq_handler = omap_irq_handler, | 639 | .irq_handler = omap_irq_handler, |
| 640 | #ifdef CONFIG_DEBUG_FS | 640 | #ifdef CONFIG_DEBUG_FS |
| 641 | .debugfs_init = omap_debugfs_init, | 641 | .debugfs_init = omap_debugfs_init, |
| 642 | .debugfs_cleanup = omap_debugfs_cleanup, | 642 | .debugfs_cleanup = omap_debugfs_cleanup, |
| 643 | #endif | 643 | #endif |
| 644 | .prime_handle_to_fd = drm_gem_prime_handle_to_fd, | 644 | .prime_handle_to_fd = drm_gem_prime_handle_to_fd, |
| 645 | .prime_fd_to_handle = drm_gem_prime_fd_to_handle, | 645 | .prime_fd_to_handle = drm_gem_prime_fd_to_handle, |
| 646 | .gem_prime_export = omap_gem_prime_export, | 646 | .gem_prime_export = omap_gem_prime_export, |
| 647 | .gem_prime_import = omap_gem_prime_import, | 647 | .gem_prime_import = omap_gem_prime_import, |
| 648 | .gem_free_object = omap_gem_free_object, | 648 | .gem_free_object = omap_gem_free_object, |
| 649 | .gem_vm_ops = &omap_gem_vm_ops, | 649 | .gem_vm_ops = &omap_gem_vm_ops, |
| 650 | .dumb_create = omap_gem_dumb_create, | 650 | .dumb_create = omap_gem_dumb_create, |
| 651 | .dumb_map_offset = omap_gem_dumb_map_offset, | 651 | .dumb_map_offset = omap_gem_dumb_map_offset, |
| 652 | .dumb_destroy = drm_gem_dumb_destroy, | 652 | .dumb_destroy = drm_gem_dumb_destroy, |
| 653 | .ioctls = ioctls, | 653 | .ioctls = ioctls, |
| 654 | .num_ioctls = DRM_OMAP_NUM_IOCTLS, | 654 | .num_ioctls = DRM_OMAP_NUM_IOCTLS, |
| 655 | .fops = &omapdriver_fops, | 655 | .fops = &omapdriver_fops, |
| 656 | .name = DRIVER_NAME, | 656 | .name = DRIVER_NAME, |
| 657 | .desc = DRIVER_DESC, | 657 | .desc = DRIVER_DESC, |
| 658 | .date = DRIVER_DATE, | 658 | .date = DRIVER_DATE, |
| 659 | .major = DRIVER_MAJOR, | 659 | .major = DRIVER_MAJOR, |
| 660 | .minor = DRIVER_MINOR, | 660 | .minor = DRIVER_MINOR, |
| 661 | .patchlevel = DRIVER_PATCHLEVEL, | 661 | .patchlevel = DRIVER_PATCHLEVEL, |
| 662 | }; | 662 | }; |
| 663 | 663 | ||
| 664 | static int pdev_suspend(struct platform_device *pDevice, pm_message_t state) | 664 | static int pdev_suspend(struct platform_device *pDevice, pm_message_t state) |
| @@ -716,17 +716,17 @@ static const struct dev_pm_ops omapdrm_pm_ops = { | |||
| 716 | #endif | 716 | #endif |
| 717 | 717 | ||
| 718 | static struct platform_driver pdev = { | 718 | static struct platform_driver pdev = { |
| 719 | .driver = { | 719 | .driver = { |
| 720 | .name = DRIVER_NAME, | 720 | .name = DRIVER_NAME, |
| 721 | #ifdef CONFIG_PM | 721 | #ifdef CONFIG_PM |
| 722 | .pm = &omapdrm_pm_ops, | 722 | .pm = &omapdrm_pm_ops, |
| 723 | #endif | 723 | #endif |
| 724 | }, | 724 | }, |
| 725 | .probe = pdev_probe, | 725 | .probe = pdev_probe, |
| 726 | .remove = pdev_remove, | 726 | .remove = pdev_remove, |
| 727 | .suspend = pdev_suspend, | 727 | .suspend = pdev_suspend, |
| 728 | .resume = pdev_resume, | 728 | .resume = pdev_resume, |
| 729 | .shutdown = pdev_shutdown, | 729 | .shutdown = pdev_shutdown, |
| 730 | }; | 730 | }; |
| 731 | 731 | ||
| 732 | static int __init omap_drm_init(void) | 732 | static int __init omap_drm_init(void) |
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c index a2dbfb1737b4..b46dabd9faf7 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | |||
| @@ -156,16 +156,16 @@ static int omap_gem_dmabuf_mmap(struct dma_buf *buffer, | |||
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | static struct dma_buf_ops omap_dmabuf_ops = { | 158 | static struct dma_buf_ops omap_dmabuf_ops = { |
| 159 | .map_dma_buf = omap_gem_map_dma_buf, | 159 | .map_dma_buf = omap_gem_map_dma_buf, |
| 160 | .unmap_dma_buf = omap_gem_unmap_dma_buf, | 160 | .unmap_dma_buf = omap_gem_unmap_dma_buf, |
| 161 | .release = omap_gem_dmabuf_release, | 161 | .release = omap_gem_dmabuf_release, |
| 162 | .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access, | 162 | .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access, |
| 163 | .end_cpu_access = omap_gem_dmabuf_end_cpu_access, | 163 | .end_cpu_access = omap_gem_dmabuf_end_cpu_access, |
| 164 | .kmap_atomic = omap_gem_dmabuf_kmap_atomic, | 164 | .kmap_atomic = omap_gem_dmabuf_kmap_atomic, |
| 165 | .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic, | 165 | .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic, |
| 166 | .kmap = omap_gem_dmabuf_kmap, | 166 | .kmap = omap_gem_dmabuf_kmap, |
| 167 | .kunmap = omap_gem_dmabuf_kunmap, | 167 | .kunmap = omap_gem_dmabuf_kunmap, |
| 168 | .mmap = omap_gem_dmabuf_mmap, | 168 | .mmap = omap_gem_dmabuf_mmap, |
| 169 | }; | 169 | }; |
| 170 | 170 | ||
| 171 | struct dma_buf *omap_gem_prime_export(struct drm_device *dev, | 171 | struct dma_buf *omap_gem_prime_export(struct drm_device *dev, |
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c index ee8e2b3a117e..a418fa7e5d0e 100644 --- a/drivers/gpu/drm/omapdrm/omap_plane.c +++ b/drivers/gpu/drm/omapdrm/omap_plane.c | |||
| @@ -353,10 +353,10 @@ int omap_plane_set_property(struct drm_plane *plane, | |||
| 353 | } | 353 | } |
| 354 | 354 | ||
| 355 | static const struct drm_plane_funcs omap_plane_funcs = { | 355 | static const struct drm_plane_funcs omap_plane_funcs = { |
| 356 | .update_plane = omap_plane_update, | 356 | .update_plane = omap_plane_update, |
| 357 | .disable_plane = omap_plane_disable, | 357 | .disable_plane = omap_plane_disable, |
| 358 | .destroy = omap_plane_destroy, | 358 | .destroy = omap_plane_destroy, |
| 359 | .set_property = omap_plane_set_property, | 359 | .set_property = omap_plane_set_property, |
| 360 | }; | 360 | }; |
| 361 | 361 | ||
| 362 | static void omap_plane_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus) | 362 | static void omap_plane_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus) |
| @@ -367,17 +367,17 @@ static void omap_plane_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus) | |||
| 367 | } | 367 | } |
| 368 | 368 | ||
| 369 | static const char *plane_names[] = { | 369 | static const char *plane_names[] = { |
| 370 | [OMAP_DSS_GFX] = "gfx", | 370 | [OMAP_DSS_GFX] = "gfx", |
| 371 | [OMAP_DSS_VIDEO1] = "vid1", | 371 | [OMAP_DSS_VIDEO1] = "vid1", |
| 372 | [OMAP_DSS_VIDEO2] = "vid2", | 372 | [OMAP_DSS_VIDEO2] = "vid2", |
| 373 | [OMAP_DSS_VIDEO3] = "vid3", | 373 | [OMAP_DSS_VIDEO3] = "vid3", |
| 374 | }; | 374 | }; |
| 375 | 375 | ||
| 376 | static const uint32_t error_irqs[] = { | 376 | static const uint32_t error_irqs[] = { |
| 377 | [OMAP_DSS_GFX] = DISPC_IRQ_GFX_FIFO_UNDERFLOW, | 377 | [OMAP_DSS_GFX] = DISPC_IRQ_GFX_FIFO_UNDERFLOW, |
| 378 | [OMAP_DSS_VIDEO1] = DISPC_IRQ_VID1_FIFO_UNDERFLOW, | 378 | [OMAP_DSS_VIDEO1] = DISPC_IRQ_VID1_FIFO_UNDERFLOW, |
| 379 | [OMAP_DSS_VIDEO2] = DISPC_IRQ_VID2_FIFO_UNDERFLOW, | 379 | [OMAP_DSS_VIDEO2] = DISPC_IRQ_VID2_FIFO_UNDERFLOW, |
| 380 | [OMAP_DSS_VIDEO3] = DISPC_IRQ_VID3_FIFO_UNDERFLOW, | 380 | [OMAP_DSS_VIDEO3] = DISPC_IRQ_VID3_FIFO_UNDERFLOW, |
| 381 | }; | 381 | }; |
| 382 | 382 | ||
| 383 | /* initialize plane */ | 383 | /* initialize plane */ |
