aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-11-11 12:11:29 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-11-24 05:47:38 -0500
commit1eb83451ba55d7a8c82b76b1591894ff2d4a95f2 (patch)
tree9e6d333c68f31bbba6ddada85e899adf1f47cf0f /drivers/gpu/drm/omapdrm
parentcc344980c76748e57c9c03100c2a14d36ab00334 (diff)
drm: Pass the user drm_mode_fb_cmd2 as const to .fb_create()
Drivers shouldn't clobber the passed in addfb ioctl parameters. i915 was doing just that. To prevent it from happening again, pass the struct around as const, starting all the way from internal_framebuffer_create(). Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.h6
-rw-r--r--drivers/gpu/drm/omapdrm/omap_fb.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 5c367aad8a6e..130fca70bfd7 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -172,9 +172,9 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings,
172uint32_t omap_framebuffer_get_formats(uint32_t *pixel_formats, 172uint32_t omap_framebuffer_get_formats(uint32_t *pixel_formats,
173 uint32_t max_formats, enum omap_color_mode supported_modes); 173 uint32_t max_formats, enum omap_color_mode supported_modes);
174struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev, 174struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
175 struct drm_file *file, struct drm_mode_fb_cmd2 *mode_cmd); 175 struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd);
176struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, 176struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
177 struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos); 177 const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos);
178struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p); 178struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p);
179int omap_framebuffer_pin(struct drm_framebuffer *fb); 179int omap_framebuffer_pin(struct drm_framebuffer *fb);
180void omap_framebuffer_unpin(struct drm_framebuffer *fb); 180void omap_framebuffer_unpin(struct drm_framebuffer *fb);
@@ -248,7 +248,7 @@ struct omap_dss_device *omap_encoder_get_dssdev(struct drm_encoder *encoder);
248 248
249static inline int objects_lookup(struct drm_device *dev, 249static inline int objects_lookup(struct drm_device *dev,
250 struct drm_file *filp, uint32_t pixel_format, 250 struct drm_file *filp, uint32_t pixel_format,
251 struct drm_gem_object **bos, uint32_t *handles) 251 struct drm_gem_object **bos, const uint32_t *handles)
252{ 252{
253 int i, n = drm_format_num_planes(pixel_format); 253 int i, n = drm_format_num_planes(pixel_format);
254 254
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 636a1f921569..ad202dfc1a49 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -364,7 +364,7 @@ void omap_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m)
364#endif 364#endif
365 365
366struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev, 366struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
367 struct drm_file *file, struct drm_mode_fb_cmd2 *mode_cmd) 367 struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd)
368{ 368{
369 struct drm_gem_object *bos[4]; 369 struct drm_gem_object *bos[4];
370 struct drm_framebuffer *fb; 370 struct drm_framebuffer *fb;
@@ -386,7 +386,7 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
386} 386}
387 387
388struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, 388struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
389 struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos) 389 const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos)
390{ 390{
391 struct omap_framebuffer *omap_fb = NULL; 391 struct omap_framebuffer *omap_fb = NULL;
392 struct drm_framebuffer *fb = NULL; 392 struct drm_framebuffer *fb = NULL;