Re: [Intel-gfx] [FIXUP] drm: remove `const` attribute to hint at caller that they now own the memory
On Tue, Aug 16, 2016 at 02:04:21PM +0300, Jani Nikula wrote: > > Reviewed-by: Jani Nikula Applied to drm-misc, thanks. -Daniel > > > On Mon, 15 Aug 2016, Eric Engestrom wrote: > > Signed-off-by: Eric Engestrom > > --- > > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- > > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- > > drivers/gpu/drm/drm_atomic.c| 2 +- > > drivers/gpu/drm/drm_crtc.c | 8 > > drivers/gpu/drm/drm_fourcc.c| 4 ++-- > > drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- > > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > > drivers/gpu/drm/i915/intel_atomic_plane.c | 2 +- > > drivers/gpu/drm/i915/intel_display.c| 4 ++-- > > drivers/gpu/drm/radeon/atombios_crtc.c | 4 ++-- > > include/drm/drm_fourcc.h| 2 +- > > 12 files changed, 18 insertions(+), 18 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > > b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > > index 0bf8959..741da36 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > > @@ -2071,7 +2071,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc > > *crtc, > > u32 tmp, viewport_w, viewport_h; > > int r; > > bool bypass_lut = false; > > - const char *format_name; > > + char *format_name; > > > > /* no fb bound */ > > if (!atomic && !crtc->primary->fb) { > > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > > b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > > index 1558a97..2282eb6 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > > @@ -2046,7 +2046,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc > > *crtc, > > u32 tmp, viewport_w, viewport_h; > > int r; > > bool bypass_lut = false; > > - const char *format_name; > > + char *format_name; > > > > /* no fb bound */ > > if (!atomic && !crtc->primary->fb) { > > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > > b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > > index 71a0375..8b7ad34 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > > @@ -1952,7 +1952,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc > > *crtc, > > u32 viewport_w, viewport_h; > > int r; > > bool bypass_lut = false; > > - const char *format_name; > > + char *format_name; > > > > /* no fb bound */ > > if (!atomic && !crtc->primary->fb) { > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > > index 087391f..5cb2e22 100644 > > --- a/drivers/gpu/drm/drm_atomic.c > > +++ b/drivers/gpu/drm/drm_atomic.c > > @@ -837,7 +837,7 @@ static int drm_atomic_plane_check(struct drm_plane > > *plane, > > /* Check whether this plane supports the fb pixel format. */ > > ret = drm_plane_check_pixel_format(plane, state->fb->pixel_format); > > if (ret) { > > - const char *format_name = > > drm_get_format_name(state->fb->pixel_format); > > + char *format_name = > > drm_get_format_name(state->fb->pixel_format); > > DRM_DEBUG_ATOMIC("Invalid pixel format %s\n", format_name); > > kfree(format_name); > > return ret; > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > > index 7da5d33..30ab28b 100644 > > --- a/drivers/gpu/drm/drm_crtc.c > > +++ b/drivers/gpu/drm/drm_crtc.c > > @@ -2592,7 +2592,7 @@ static int __setplane_internal(struct drm_plane > > *plane, > > /* Check whether this plane supports the fb pixel format. */ > > ret = drm_plane_check_pixel_format(plane, fb->pixel_format); > > if (ret) { > > - const char *format_name = drm_get_format_name(fb->pixel_format); > > + char *format_name = drm_get_format_name(fb->pixel_format); > > DRM_DEBUG_KMS("Invalid pixel format %s\n", format_name); > > kfree(format_name); > > goto out; > > @@ -2903,7 +2903,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void > > *data, > > ret = drm_plane_check_pixel_format(crtc->primary, > >fb->pixel_format); > > if (ret) { > > - const char *format_name = > > drm_get_format_name(fb->pixel_format); > > + char *format_name = > > drm_get_format_name(fb->pixel_format); > > DRM_DEBUG_KMS("Invalid pixel format %s\n", > > format_name); > > kfree(format_name); > > goto out; > > @@ -3281,7 +3281,7 @@ int drm_mode_addfb(struct drm_device *dev, > > static int format_check(const struct drm_mode_fb_cmd2 *r) > > { > > uint32_t format = r->pixel_format & ~DRM_FORMAT_B
Re: [Intel-gfx] [FIXUP] drm: remove `const` attribute to hint at caller that they now own the memory
Reviewed-by: Jani Nikula On Mon, 15 Aug 2016, Eric Engestrom wrote: > Signed-off-by: Eric Engestrom > --- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- > drivers/gpu/drm/drm_atomic.c| 2 +- > drivers/gpu/drm/drm_crtc.c | 8 > drivers/gpu/drm/drm_fourcc.c| 4 ++-- > drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > drivers/gpu/drm/i915/intel_atomic_plane.c | 2 +- > drivers/gpu/drm/i915/intel_display.c| 4 ++-- > drivers/gpu/drm/radeon/atombios_crtc.c | 4 ++-- > include/drm/drm_fourcc.h| 2 +- > 12 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > index 0bf8959..741da36 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > @@ -2071,7 +2071,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc > *crtc, > u32 tmp, viewport_w, viewport_h; > int r; > bool bypass_lut = false; > - const char *format_name; > + char *format_name; > > /* no fb bound */ > if (!atomic && !crtc->primary->fb) { > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > index 1558a97..2282eb6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > @@ -2046,7 +2046,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc > *crtc, > u32 tmp, viewport_w, viewport_h; > int r; > bool bypass_lut = false; > - const char *format_name; > + char *format_name; > > /* no fb bound */ > if (!atomic && !crtc->primary->fb) { > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > index 71a0375..8b7ad34 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > @@ -1952,7 +1952,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc > *crtc, > u32 viewport_w, viewport_h; > int r; > bool bypass_lut = false; > - const char *format_name; > + char *format_name; > > /* no fb bound */ > if (!atomic && !crtc->primary->fb) { > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 087391f..5cb2e22 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -837,7 +837,7 @@ static int drm_atomic_plane_check(struct drm_plane *plane, > /* Check whether this plane supports the fb pixel format. */ > ret = drm_plane_check_pixel_format(plane, state->fb->pixel_format); > if (ret) { > - const char *format_name = > drm_get_format_name(state->fb->pixel_format); > + char *format_name = > drm_get_format_name(state->fb->pixel_format); > DRM_DEBUG_ATOMIC("Invalid pixel format %s\n", format_name); > kfree(format_name); > return ret; > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 7da5d33..30ab28b 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -2592,7 +2592,7 @@ static int __setplane_internal(struct drm_plane *plane, > /* Check whether this plane supports the fb pixel format. */ > ret = drm_plane_check_pixel_format(plane, fb->pixel_format); > if (ret) { > - const char *format_name = drm_get_format_name(fb->pixel_format); > + char *format_name = drm_get_format_name(fb->pixel_format); > DRM_DEBUG_KMS("Invalid pixel format %s\n", format_name); > kfree(format_name); > goto out; > @@ -2903,7 +2903,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, > ret = drm_plane_check_pixel_format(crtc->primary, > fb->pixel_format); > if (ret) { > - const char *format_name = > drm_get_format_name(fb->pixel_format); > + char *format_name = > drm_get_format_name(fb->pixel_format); > DRM_DEBUG_KMS("Invalid pixel format %s\n", > format_name); > kfree(format_name); > goto out; > @@ -3281,7 +3281,7 @@ int drm_mode_addfb(struct drm_device *dev, > static int format_check(const struct drm_mode_fb_cmd2 *r) > { > uint32_t format = r->pixel_format & ~DRM_FORMAT_BIG_ENDIAN; > - const char *format_name; > + char *format_name; > > switch (format) { > case DRM_FORMAT_C8: > @@ -3359,7 +3359,7 @@ static int framebuffer_check(const struct > drm_mode_fb_cmd2 *r) > > ret = format
[Intel-gfx] [FIXUP] drm: remove `const` attribute to hint at caller that they now own the memory
Signed-off-by: Eric Engestrom --- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/drm_atomic.c| 2 +- drivers/gpu/drm/drm_crtc.c | 8 drivers/gpu/drm/drm_fourcc.c| 4 ++-- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 2 +- drivers/gpu/drm/i915/intel_display.c| 4 ++-- drivers/gpu/drm/radeon/atombios_crtc.c | 4 ++-- include/drm/drm_fourcc.h| 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index 0bf8959..741da36 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -2071,7 +2071,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc, u32 tmp, viewport_w, viewport_h; int r; bool bypass_lut = false; - const char *format_name; + char *format_name; /* no fb bound */ if (!atomic && !crtc->primary->fb) { diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index 1558a97..2282eb6 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -2046,7 +2046,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc, u32 tmp, viewport_w, viewport_h; int r; bool bypass_lut = false; - const char *format_name; + char *format_name; /* no fb bound */ if (!atomic && !crtc->primary->fb) { diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index 71a0375..8b7ad34 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -1952,7 +1952,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc, u32 viewport_w, viewport_h; int r; bool bypass_lut = false; - const char *format_name; + char *format_name; /* no fb bound */ if (!atomic && !crtc->primary->fb) { diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 087391f..5cb2e22 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -837,7 +837,7 @@ static int drm_atomic_plane_check(struct drm_plane *plane, /* Check whether this plane supports the fb pixel format. */ ret = drm_plane_check_pixel_format(plane, state->fb->pixel_format); if (ret) { - const char *format_name = drm_get_format_name(state->fb->pixel_format); + char *format_name = drm_get_format_name(state->fb->pixel_format); DRM_DEBUG_ATOMIC("Invalid pixel format %s\n", format_name); kfree(format_name); return ret; diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 7da5d33..30ab28b 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2592,7 +2592,7 @@ static int __setplane_internal(struct drm_plane *plane, /* Check whether this plane supports the fb pixel format. */ ret = drm_plane_check_pixel_format(plane, fb->pixel_format); if (ret) { - const char *format_name = drm_get_format_name(fb->pixel_format); + char *format_name = drm_get_format_name(fb->pixel_format); DRM_DEBUG_KMS("Invalid pixel format %s\n", format_name); kfree(format_name); goto out; @@ -2903,7 +2903,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, ret = drm_plane_check_pixel_format(crtc->primary, fb->pixel_format); if (ret) { - const char *format_name = drm_get_format_name(fb->pixel_format); + char *format_name = drm_get_format_name(fb->pixel_format); DRM_DEBUG_KMS("Invalid pixel format %s\n", format_name); kfree(format_name); goto out; @@ -3281,7 +3281,7 @@ int drm_mode_addfb(struct drm_device *dev, static int format_check(const struct drm_mode_fb_cmd2 *r) { uint32_t format = r->pixel_format & ~DRM_FORMAT_BIG_ENDIAN; - const char *format_name; + char *format_name; switch (format) { case DRM_FORMAT_C8: @@ -3359,7 +3359,7 @@ static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) ret = format_check(r); if (ret) { - const char *format_name = drm_get_format_name(r->pixel_format); + char *format_name = drm_get_format_name(r->pixel_format);