Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1eb83451 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent cc344980

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+2 −2
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { 
int

amdgpu_framebuffer_init(struct drm_device *dev,

			struct amdgpu_framebuffer *rfb,

			struct drm_mode_fb_cmd2 *mode_cmd,

			const struct drm_mode_fb_cmd2 *mode_cmd,

			struct drm_gem_object *obj)

{

	int ret;
@@ -498,7 +498,7 @@ amdgpu_framebuffer_init(struct drm_device *dev, 
static struct drm_framebuffer *

amdgpu_user_framebuffer_create(struct drm_device *dev,

			       struct drm_file *file_priv,

			       struct drm_mode_fb_cmd2 *mode_cmd)

			       const struct drm_mode_fb_cmd2 *mode_cmd)

{

	struct drm_gem_object *obj;

	struct amdgpu_framebuffer *amdgpu_fb;

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, 


int amdgpu_framebuffer_init(struct drm_device *dev,

			     struct amdgpu_framebuffer *rfb,

			     struct drm_mode_fb_cmd2 *mode_cmd,

			     const struct drm_mode_fb_cmd2 *mode_cmd,

			     struct drm_gem_object *obj);



int amdgpufb_remove(struct drm_device *dev, struct drm_framebuffer *fb);

drivers/gpu/drm/armada/armada_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static const struct drm_framebuffer_funcs armada_fb_funcs = { 
};



struct armada_framebuffer *armada_framebuffer_create(struct drm_device *dev,

	struct drm_mode_fb_cmd2 *mode, struct armada_gem_object *obj)

	const struct drm_mode_fb_cmd2 *mode, struct armada_gem_object *obj)

{

	struct armada_framebuffer *dfb;

	uint8_t format, config;
@@ -101,7 +101,7 @@ struct armada_framebuffer *armada_framebuffer_create(struct drm_device *dev, 
}



static struct drm_framebuffer *armada_fb_create(struct drm_device *dev,

	struct drm_file *dfile, struct drm_mode_fb_cmd2 *mode)

	struct drm_file *dfile, const struct drm_mode_fb_cmd2 *mode)

{

	struct armada_gem_object *obj;

	struct armada_framebuffer *dfb;

drivers/gpu/drm/armada/armada_fb.h

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ struct armada_framebuffer { 
#define drm_fb_obj(fb) drm_fb_to_armada_fb(fb)->obj



struct armada_framebuffer *armada_framebuffer_create(struct drm_device *,

	struct drm_mode_fb_cmd2 *, struct armada_gem_object *);

	const struct drm_mode_fb_cmd2 *, struct armada_gem_object *);



#endif

drivers/gpu/drm/ast/ast_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ extern void ast_mode_fini(struct drm_device *dev); 


int ast_framebuffer_init(struct drm_device *dev,

			 struct ast_framebuffer *ast_fb,

			 struct drm_mode_fb_cmd2 *mode_cmd,

			 const struct drm_mode_fb_cmd2 *mode_cmd,

			 struct drm_gem_object *obj);



int ast_fbdev_init(struct drm_device *dev);