Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/mediatek: plane: Merge mtk_plane_enable into mtk_plane_atomic_update

Browse Source 
The mtk_plane_enable is just called once by mtk_plane_atomic_update.
So, merge mtk_plane_enable into mtk_plane_atomic_update.

While we are here, also clean up the function a bit by using an fb local
variables.

Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1470279597-60453-6-git-send-email-bibby.hsieh@mediatek.com
This commit is contained in:
Daniel Kurtz 2016-08-04 10:59:55 +08:00 committed by Sean Paul
parent 903daff60f
commit f176cbf6f9
1 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/gpu/drm/mediatek/mtk_drm_plane.c
View File

@ -30,44 +30,6 @@ static const u32 formats[] = {
DRM_FORMAT_RGB565,
};
static void mtk_plane_enable(struct drm_plane *plane,
dma_addr_t addr)
{
struct mtk_plane_state *state = to_mtk_plane_state(plane->state);
unsigned int pitch, format;
bool enable;
if (WARN_ON(!plane->state))
return;
enable = state->base.visible;
if (WARN_ON(enable && !plane->state->fb))
return;
if (plane->state->fb) {
pitch = plane->state->fb->pitches[0];
format = plane->state->fb->pixel_format;
} else {
pitch = 0;
format = DRM_FORMAT_RGBA8888;
}
addr += (state->base.src.x1 >> 16) * 4;
addr += (state->base.src.y1 >> 16) * pitch;
state->pending.enable = enable;
state->pending.pitch = pitch;
state->pending.format = format;
state->pending.addr = addr;
state->pending.x = state->base.dst.x1;
state->pending.y = state->base.dst.y1;
state->pending.width = drm_rect_width(&state->base.dst);
state->pending.height = drm_rect_height(&state->base.dst);
wmb(); /* Make sure the above parameters are set before update */
state->pending.dirty = true;
}
static void mtk_plane_reset(struct drm_plane *plane)
{
struct mtk_plane_state *state;
@ -157,16 +119,35 @@ static void mtk_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *old_state)
{
struct mtk_plane_state *state = to_mtk_plane_state(plane->state);
struct drm_crtc *crtc = state->base.crtc;
struct drm_crtc *crtc = plane->state->crtc;
struct drm_framebuffer *fb = plane->state->fb;
struct drm_gem_object *gem;
struct mtk_drm_gem_obj *mtk_gem;
unsigned int pitch, format;
dma_addr_t addr;
if (!crtc)
if (!crtc || WARN_ON(!fb))
return;
gem = mtk_fb_get_gem_obj(state->base.fb);
gem = mtk_fb_get_gem_obj(fb);
mtk_gem = to_mtk_gem_obj(gem);
mtk_plane_enable(plane, mtk_gem->dma_addr);
addr = mtk_gem->dma_addr;
pitch = fb->pitches[0];
format = fb->pixel_format;
addr += (plane->state->src.x1 >> 16) * 4;
addr += (plane->state->src.y1 >> 16) * pitch;
state->pending.enable = true;
state->pending.pitch = pitch;
state->pending.format = format;
state->pending.addr = addr;
state->pending.x = plane->state->dst.x1;
state->pending.y = plane->state->dst.y1;
state->pending.width = drm_rect_width(&plane->state->dst);
state->pending.height = drm_rect_height(&plane->state->dst);
wmb(); /* Make sure the above parameters are set before update */
state->pending.dirty = true;
}
static void mtk_plane_atomic_disable(struct drm_plane *plane,