aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-05-17 07:27:23 -0400
committerDave Airlie <airlied@redhat.com>2012-05-22 05:35:07 -0400
commite6ecefaadfcdb03db8ac9e739b4ba7a93a8811b3 (patch)
treec24f4b93e492437d4ec88f00b65b3d400bfb5aee
parent78b68556a964e74fb803b08c5b2d9c6ba3ec3787 (diff)
drm: Constify drm_mode_config_funcs pointer
The DRM mode config functions structure declared by drivers and pointed to by the drm_mode_config funcs field is never modified. Make it a const pointer. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Inki Dae <inki.dae@samsung.com> Cc: Alan Cox <alan@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Thomas Hellstrom <thellstrom@vmware.com> Cc: Rob Clark <rob.clark@linaro.org> Reviwed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fb.c2
-rw-r--r--drivers/gpu/drm/gma500/framebuffer.c2
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_display.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_display.c2
-rw-r--r--drivers/gpu/drm/udl/udl_modeset.c2
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_kms.c2
-rw-r--r--drivers/staging/omapdrm/omap_drv.c2
-rw-r--r--include/drm/drm_crtc.h2
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index c38c8f468fa..f82a299553f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -191,7 +191,7 @@ static void exynos_drm_output_poll_changed(struct drm_device *dev)
191 drm_fb_helper_hotplug_event(fb_helper); 191 drm_fb_helper_hotplug_event(fb_helper);
192} 192}
193 193
194static struct drm_mode_config_funcs exynos_drm_mode_config_funcs = { 194static const struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {
195 .fb_create = exynos_user_fb_create, 195 .fb_create = exynos_user_fb_create,
196 .output_poll_changed = exynos_drm_output_poll_changed, 196 .output_poll_changed = exynos_drm_output_poll_changed,
197}; 197};
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 09cd23cc05a..5732b5702e1 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -782,7 +782,7 @@ void psb_modeset_init(struct drm_device *dev)
782 dev->mode_config.min_width = 0; 782 dev->mode_config.min_width = 0;
783 dev->mode_config.min_height = 0; 783 dev->mode_config.min_height = 0;
784 784
785 dev->mode_config.funcs = (void *) &psb_mode_funcs; 785 dev->mode_config.funcs = &psb_mode_funcs;
786 786
787 /* set memory base */ 787 /* set memory base */
788 /* Oaktrail and Poulsbo should use BAR 2*/ 788 /* Oaktrail and Poulsbo should use BAR 2*/
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3c71850ddf2..ee61ad1e642 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6941,7 +6941,7 @@ void intel_modeset_init(struct drm_device *dev)
6941 dev->mode_config.preferred_depth = 24; 6941 dev->mode_config.preferred_depth = 24;
6942 dev->mode_config.prefer_shadow = 1; 6942 dev->mode_config.prefer_shadow = 1;
6943 6943
6944 dev->mode_config.funcs = (void *)&intel_mode_funcs; 6944 dev->mode_config.funcs = &intel_mode_funcs;
6945 6945
6946 intel_init_quirks(dev); 6946 intel_init_quirks(dev);
6947 6947
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index a85e112863d..4b1cf745798 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -300,7 +300,7 @@ nouveau_display_create(struct drm_device *dev)
300 disp->color_vibrance_property->values[1] = 200; /* -100..+100 */ 300 disp->color_vibrance_property->values[1] = 200; /* -100..+100 */
301 } 301 }
302 302
303 dev->mode_config.funcs = (void *)&nouveau_mode_config_funcs; 303 dev->mode_config.funcs = &nouveau_mode_config_funcs;
304 dev->mode_config.fb_base = pci_resource_start(dev->pdev, 1); 304 dev->mode_config.fb_base = pci_resource_start(dev->pdev, 1);
305 305
306 dev->mode_config.min_width = 0; 306 dev->mode_config.min_width = 0;
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index da3fe8a68f8..64a008d1449 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1320,7 +1320,7 @@ int radeon_modeset_init(struct radeon_device *rdev)
1320 drm_mode_config_init(rdev->ddev); 1320 drm_mode_config_init(rdev->ddev);
1321 rdev->mode_info.mode_config_initialized = true; 1321 rdev->mode_info.mode_config_initialized = true;
1322 1322
1323 rdev->ddev->mode_config.funcs = (void *)&radeon_mode_funcs; 1323 rdev->ddev->mode_config.funcs = &radeon_mode_funcs;
1324 1324
1325 if (ASIC_IS_DCE5(rdev)) { 1325 if (ASIC_IS_DCE5(rdev)) {
1326 rdev->ddev->mode_config.max_width = 16384; 1326 rdev->ddev->mode_config.max_width = 16384;
diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
index b3ecb3d12a1..0d7816789da 100644
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c
@@ -395,7 +395,7 @@ int udl_modeset_init(struct drm_device *dev)
395 dev->mode_config.prefer_shadow = 0; 395 dev->mode_config.prefer_shadow = 0;
396 dev->mode_config.preferred_depth = 24; 396 dev->mode_config.preferred_depth = 24;
397 397
398 dev->mode_config.funcs = (void *)&udl_mode_funcs; 398 dev->mode_config.funcs = &udl_mode_funcs;
399 399
400 drm_mode_create_dirty_info_property(dev); 400 drm_mode_create_dirty_info_property(dev);
401 401
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 2286d47e502..6b0078ffa76 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1178,7 +1178,7 @@ err_out:
1178 return &vfb->base; 1178 return &vfb->base;
1179} 1179}
1180 1180
1181static struct drm_mode_config_funcs vmw_kms_funcs = { 1181static const struct drm_mode_config_funcs vmw_kms_funcs = {
1182 .fb_create = vmw_kms_fb_create, 1182 .fb_create = vmw_kms_fb_create,
1183}; 1183};
1184 1184
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
index 071c7702d05..1edbd777bf4 100644
--- a/drivers/staging/omapdrm/omap_drv.c
+++ b/drivers/staging/omapdrm/omap_drv.c
@@ -58,7 +58,7 @@ static void omap_fb_output_poll_changed(struct drm_device *dev)
58 } 58 }
59} 59}
60 60
61static struct drm_mode_config_funcs omap_mode_config_funcs = { 61static const struct drm_mode_config_funcs omap_mode_config_funcs = {
62 .fb_create = omap_framebuffer_create, 62 .fb_create = omap_framebuffer_create,
63 .output_poll_changed = omap_fb_output_poll_changed, 63 .output_poll_changed = omap_fb_output_poll_changed,
64}; 64};
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 3ecee192db0..b88b28f45f9 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -767,7 +767,7 @@ struct drm_mode_config {
767 767
768 int min_width, min_height; 768 int min_width, min_height;
769 int max_width, max_height; 769 int max_width, max_height;
770 struct drm_mode_config_funcs *funcs; 770 const struct drm_mode_config_funcs *funcs;
771 resource_size_t fb_base; 771 resource_size_t fb_base;
772 772
773 /* output poll support */ 773 /* output poll support */