On Tue, Aug 16, 2016 at 02:04:21PM +0300, Jani Nikula wrote:
>
> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Applied to drm-misc, thanks.
-Daniel
>
>
> On Mon, 15 Aug 2016, Eric Engestrom <eric.engestrom@xxxxxxxxxx> wrote:
> > Signed-off-by: Eric Engestrom <eric.engestrom@xxxxxxxxxx>
> > ---
> > 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);
> > DRM_DEBUG_KMS("bad framebuffer format %s\n", format_name);
> > kfree(format_name);
> > return ret;
> > diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> > index 38216a1..41d06d6 100644
> > --- a/drivers/gpu/drm/drm_fourcc.c
> > +++ b/drivers/gpu/drm/drm_fourcc.c
> > @@ -42,7 +42,7 @@ static char printable_char(int c)
> > * Note that the buffer returned by this function is owned by the caller
> > * and will need to be freed.
> > */
> > -const char *drm_get_format_name(uint32_t format)
> > +char *drm_get_format_name(uint32_t format)
> > {
> > char *buf = kmalloc(32, GFP_KERNEL);
> >
> > @@ -71,7 +71,7 @@ EXPORT_SYMBOL(drm_get_format_name);
> > void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
> > int *bpp)
> > {
> > - const char *format_name;
> > + char *format_name;
> >
> > switch (format) {
> > case DRM_FORMAT_C8:
> > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> > index ac7fa02..eaa3df7 100644
> > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> > @@ -608,7 +608,7 @@ static void ade_rdma_set(void __iomem *base, struct drm_framebuffer *fb,
> > u32 ch, u32 y, u32 in_h, u32 fmt)
> > {
> > struct drm_gem_cma_object *obj = drm_fb_cma_get_gem_obj(fb, 0);
> > - const char *format_name;
> > + char *format_name;
> > u32 reg_ctrl, reg_addr, reg_size, reg_stride, reg_space, reg_en;
> > u32 stride = fb->pitches[0];
> > u32 addr = (u32)obj->paddr + y * stride;
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > index 904720b..e5cddea 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -3109,7 +3109,7 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc)
> > for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
> > struct drm_plane_state *state;
> > struct drm_plane *plane = &intel_plane->base;
> > - const char *format_name;
> > + char *format_name;
> >
> > if (!plane->state) {
> > seq_puts(m, "plane->state is NULL!\n");
> > diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
> > index e06131a..28fe00d 100644
> > --- a/drivers/gpu/drm/i915/intel_atomic_plane.c
> > +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
> > @@ -157,7 +157,7 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
> > crtc_state->base.enable ? crtc_state->pipe_src_h : 0;
> >
> > if (state->fb && intel_rotation_90_or_270(state->rotation)) {
> > - const char *format_name;
> > + char *format_name;
> > if (!(state->fb->modifier[0] == I915_FORMAT_MOD_Y_TILED ||
> > state->fb->modifier[0] == I915_FORMAT_MOD_Yf_TILED)) {
> > DRM_DEBUG_KMS("Y/Yf tiling required for 90/270!\n");
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index aaada15..b1d701f 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -12264,7 +12264,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
> >
> > DRM_DEBUG_KMS("planes on this crtc\n");
> > list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
> > - const char *format_name;
> > + char *format_name;
> > intel_plane = to_intel_plane(plane);
> > if (intel_plane->pipe != crtc->pipe)
> > continue;
> > @@ -14922,7 +14922,7 @@ static int intel_framebuffer_init(struct drm_device *dev,
> > unsigned int aligned_height;
> > int ret;
> > u32 pitch_limit, stride_alignment;
> > - const char *format_name;
> > + char *format_name;
> >
> > WARN_ON(!mutex_is_locked(&dev->struct_mutex));
> >
> > diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
> > index 981ca3f..a89c480 100644
> > --- a/drivers/gpu/drm/radeon/atombios_crtc.c
> > +++ b/drivers/gpu/drm/radeon/atombios_crtc.c
> > @@ -1154,7 +1154,7 @@ static int dce4_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) {
> > @@ -1471,7 +1471,7 @@ static int avivo_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/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
> > index 030d22d..b106337 100644
> > --- a/include/drm/drm_fourcc.h
> > +++ b/include/drm/drm_fourcc.h
> > @@ -32,6 +32,6 @@ int drm_format_horz_chroma_subsampling(uint32_t format);
> > int drm_format_vert_chroma_subsampling(uint32_t format);
> > int drm_format_plane_width(int width, uint32_t format, int plane);
> > int drm_format_plane_height(int height, uint32_t format, int plane);
> > -const char *drm_get_format_name(uint32_t format) __malloc;
> > +char *drm_get_format_name(uint32_t format) __malloc;
> >
> > #endif /* __DRM_FOURCC_H__ */
>
> --
> Jani Nikula, Intel Open Source Technology Center
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
