X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fgpu%2Fdrm%2Frockchip%2Frockchip_drm_fb.c;h=56e29bff7af0526a01ee93679f034974217eca50;hb=d92c3432594085fd46d8c1a4317c8b10429ebc25;hp=002645bb5bbf9b83f30c0f383050c817d8e43dbc;hpb=352712274507645b6f82b8763977ad87321919a3;p=firefly-linux-kernel-4.4.55.git diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 002645bb5bbf..56e29bff7af0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -15,30 +15,42 @@ #include #include #include +#include #include #include +#include +#include #include "rockchip_drm_drv.h" #include "rockchip_drm_gem.h" +#include "rockchip_drm_backlight.h" #define to_rockchip_fb(x) container_of(x, struct rockchip_drm_fb, fb) struct rockchip_drm_fb { struct drm_framebuffer fb; + dma_addr_t dma_addr[ROCKCHIP_MAX_FB_BUFFER]; struct drm_gem_object *obj[ROCKCHIP_MAX_FB_BUFFER]; + struct rockchip_logo *logo; }; -struct drm_gem_object *rockchip_fb_get_gem_obj(struct drm_framebuffer *fb, - unsigned int plane) +bool rockchip_fb_is_logo(struct drm_framebuffer *fb) { struct rockchip_drm_fb *rk_fb = to_rockchip_fb(fb); - if (plane >= ROCKCHIP_MAX_FB_BUFFER) - return NULL; + return rk_fb && rk_fb->logo; +} - return rk_fb->obj[plane]; +dma_addr_t rockchip_fb_get_dma_addr(struct drm_framebuffer *fb, + unsigned int plane) +{ + struct rockchip_drm_fb *rk_fb = to_rockchip_fb(fb); + + if (WARN_ON(plane >= ROCKCHIP_MAX_FB_BUFFER)) + return 0; + + return rk_fb->dma_addr[plane]; } -EXPORT_SYMBOL_GPL(rockchip_fb_get_gem_obj); static void rockchip_drm_fb_destroy(struct drm_framebuffer *fb) { @@ -52,6 +64,13 @@ static void rockchip_drm_fb_destroy(struct drm_framebuffer *fb) drm_gem_object_unreference_unlocked(obj); } +#ifndef MODULE + if (rockchip_fb->logo) + rockchip_free_loader_memory(fb->dev); +#else + WARN_ON(rockchip_fb->logo); +#endif + drm_framebuffer_cleanup(fb); kfree(rockchip_fb); } @@ -66,17 +85,19 @@ static int rockchip_drm_fb_create_handle(struct drm_framebuffer *fb, rockchip_fb->obj[0], handle); } -static struct drm_framebuffer_funcs rockchip_drm_fb_funcs = { +static const struct drm_framebuffer_funcs rockchip_drm_fb_funcs = { .destroy = rockchip_drm_fb_destroy, .create_handle = rockchip_drm_fb_create_handle, }; -static struct rockchip_drm_fb * +struct drm_framebuffer * rockchip_fb_alloc(struct drm_device *dev, struct drm_mode_fb_cmd2 *mode_cmd, - struct drm_gem_object **obj, unsigned int num_planes) + struct drm_gem_object **obj, struct rockchip_logo *logo, + unsigned int num_planes) { struct rockchip_drm_fb *rockchip_fb; - int ret; + struct rockchip_gem_object *rk_obj; + int ret = 0; int i; rockchip_fb = kzalloc(sizeof(*rockchip_fb), GFP_KERNEL); @@ -85,26 +106,48 @@ rockchip_fb_alloc(struct drm_device *dev, struct drm_mode_fb_cmd2 *mode_cmd, drm_helper_mode_fill_fb_struct(&rockchip_fb->fb, mode_cmd); - for (i = 0; i < num_planes; i++) - rockchip_fb->obj[i] = obj[i]; - ret = drm_framebuffer_init(dev, &rockchip_fb->fb, &rockchip_drm_fb_funcs); if (ret) { dev_err(dev->dev, "Failed to initialize framebuffer: %d\n", ret); - kfree(rockchip_fb); - return ERR_PTR(ret); + goto err_free_fb; + } + + if (obj) { + for (i = 0; i < num_planes; i++) + rockchip_fb->obj[i] = obj[i]; + + for (i = 0; i < num_planes; i++) { + rk_obj = to_rockchip_obj(obj[i]); + rockchip_fb->dma_addr[i] = rk_obj->dma_addr; + } +#ifndef MODULE + } else if (logo) { + rockchip_fb->dma_addr[0] = logo->dma_addr; + rockchip_fb->logo = logo; + logo->count++; +#endif + } else { + ret = -EINVAL; + dev_err(dev->dev, "Failed to find available buffer\n"); + goto err_deinit_drm_fb; } - return rockchip_fb; + return &rockchip_fb->fb; + +err_deinit_drm_fb: + drm_framebuffer_cleanup(&rockchip_fb->fb); +err_free_fb: + kfree(rockchip_fb); + return ERR_PTR(ret); } static struct drm_framebuffer * rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, struct drm_mode_fb_cmd2 *mode_cmd) { - struct rockchip_drm_fb *rockchip_fb; + struct drm_framebuffer *fb; struct drm_gem_object *objs[ROCKCHIP_MAX_FB_BUFFER]; struct drm_gem_object *obj; unsigned int hsub; @@ -122,6 +165,8 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, unsigned int width = mode_cmd->width / (i ? hsub : 1); unsigned int height = mode_cmd->height / (i ? vsub : 1); unsigned int min_size; + unsigned int bpp = + drm_format_plane_bpp(mode_cmd->pixel_format, i); obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[i]); @@ -132,9 +177,7 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, } min_size = (height - 1) * mode_cmd->pitches[i] + - mode_cmd->offsets[i] + - width * drm_format_plane_cpp(mode_cmd->pixel_format, i); - + mode_cmd->offsets[i] + roundup(width * bpp, 8) / 8; if (obj->size < min_size) { drm_gem_object_unreference_unlocked(obj); ret = -EINVAL; @@ -143,13 +186,13 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, objs[i] = obj; } - rockchip_fb = rockchip_fb_alloc(dev, mode_cmd, objs, i); - if (IS_ERR(rockchip_fb)) { - ret = PTR_ERR(rockchip_fb); + fb = rockchip_fb_alloc(dev, mode_cmd, objs, NULL, i); + if (IS_ERR(fb)) { + ret = PTR_ERR(fb); goto err_gem_object_unreference; } - return &rockchip_fb->fb; + return fb; err_gem_object_unreference: for (i--; i >= 0; i--) @@ -160,15 +203,96 @@ err_gem_object_unreference: static void rockchip_drm_output_poll_changed(struct drm_device *dev) { struct rockchip_drm_private *private = dev->dev_private; - struct drm_fb_helper *fb_helper = &private->fbdev_helper; + struct drm_fb_helper *fb_helper = private->fbdev_helper; if (fb_helper) drm_fb_helper_hotplug_event(fb_helper); } +static void +rockchip_atomic_commit_complete(struct rockchip_atomic_commit *commit) +{ + struct drm_atomic_state *state = commit->state; + struct drm_device *dev = commit->dev; + + /* + * TODO: do fence wait here. + */ + + /* + * Rockchip crtc support runtime PM, can't update display planes + * when crtc is disabled. + * + * drm_atomic_helper_commit comments detail that: + * For drivers supporting runtime PM the recommended sequence is + * + * drm_atomic_helper_commit_modeset_disables(dev, state); + * + * drm_atomic_helper_commit_modeset_enables(dev, state); + * + * drm_atomic_helper_commit_planes(dev, state, true); + * + * See the kerneldoc entries for these three functions for more details. + */ + drm_atomic_helper_commit_modeset_disables(dev, state); + + drm_atomic_helper_commit_modeset_enables(dev, state); + + rockchip_drm_backlight_update(dev); + + drm_atomic_helper_commit_planes(dev, state, true); + + drm_atomic_helper_wait_for_vblanks(dev, state); + + drm_atomic_helper_cleanup_planes(dev, state); + + drm_atomic_state_free(state); +} + +void rockchip_drm_atomic_work(struct work_struct *work) +{ + struct rockchip_atomic_commit *commit = container_of(work, + struct rockchip_atomic_commit, work); + + rockchip_atomic_commit_complete(commit); +} + +int rockchip_drm_atomic_commit(struct drm_device *dev, + struct drm_atomic_state *state, + bool async) +{ + struct rockchip_drm_private *private = dev->dev_private; + struct rockchip_atomic_commit *commit = &private->commit; + int ret; + + ret = drm_atomic_helper_prepare_planes(dev, state); + if (ret) + return ret; + + /* serialize outstanding asynchronous commits */ + mutex_lock(&commit->lock); + flush_work(&commit->work); + + drm_atomic_helper_swap_state(dev, state); + + commit->dev = dev; + commit->state = state; + + if (async) + schedule_work(&commit->work); + else + rockchip_atomic_commit_complete(commit); + + mutex_unlock(&commit->lock); + + return 0; +} + static const struct drm_mode_config_funcs rockchip_drm_mode_config_funcs = { .fb_create = rockchip_user_fb_create, .output_poll_changed = rockchip_drm_output_poll_changed, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = rockchip_drm_atomic_commit, }; struct drm_framebuffer * @@ -176,13 +300,13 @@ rockchip_drm_framebuffer_init(struct drm_device *dev, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj) { - struct rockchip_drm_fb *rockchip_fb; + struct drm_framebuffer *fb; - rockchip_fb = rockchip_fb_alloc(dev, mode_cmd, &obj, 1); - if (IS_ERR(rockchip_fb)) + fb = rockchip_fb_alloc(dev, mode_cmd, &obj, NULL, 1); + if (IS_ERR(fb)) return NULL; - return &rockchip_fb->fb; + return fb; } void rockchip_drm_mode_config_init(struct drm_device *dev) @@ -195,8 +319,8 @@ void rockchip_drm_mode_config_init(struct drm_device *dev) * this value would be used to check framebuffer size limitation * at drm_mode_addfb(). */ - dev->mode_config.max_width = 4096; - dev->mode_config.max_height = 4096; + dev->mode_config.max_width = 8192; + dev->mode_config.max_height = 8192; dev->mode_config.funcs = &rockchip_drm_mode_config_funcs; }