|
@@ -62,38 +62,13 @@ static int exynos_plane_get_size(int start, unsigned length, unsigned last)
|
|
|
return size;
|
|
|
}
|
|
|
|
|
|
-int exynos_check_plane(struct drm_plane *plane, struct drm_framebuffer *fb)
|
|
|
-{
|
|
|
- struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
|
|
|
- int nr;
|
|
|
- int i;
|
|
|
-
|
|
|
- if (!fb)
|
|
|
- return 0;
|
|
|
-
|
|
|
- nr = exynos_drm_fb_get_buf_cnt(fb);
|
|
|
- for (i = 0; i < nr; i++) {
|
|
|
- struct exynos_drm_gem_buf *buffer = exynos_drm_fb_buffer(fb, i);
|
|
|
-
|
|
|
- if (!buffer) {
|
|
|
- DRM_DEBUG_KMS("buffer is null\n");
|
|
|
- return -EFAULT;
|
|
|
- }
|
|
|
-
|
|
|
- exynos_plane->dma_addr[i] = buffer->dma_addr + fb->offsets[i];
|
|
|
-
|
|
|
- DRM_DEBUG_KMS("buffer: %d, dma_addr = 0x%lx\n",
|
|
|
- i, (unsigned long)exynos_plane->dma_addr[i]);
|
|
|
- }
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
-void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc,
|
|
|
- struct drm_framebuffer *fb, int crtc_x, int crtc_y,
|
|
|
- unsigned int crtc_w, unsigned int crtc_h,
|
|
|
- uint32_t src_x, uint32_t src_y,
|
|
|
- uint32_t src_w, uint32_t src_h)
|
|
|
+static void exynos_plane_mode_set(struct drm_plane *plane,
|
|
|
+ struct drm_crtc *crtc,
|
|
|
+ struct drm_framebuffer *fb,
|
|
|
+ int crtc_x, int crtc_y,
|
|
|
+ unsigned int crtc_w, unsigned int crtc_h,
|
|
|
+ uint32_t src_x, uint32_t src_y,
|
|
|
+ uint32_t src_w, uint32_t src_h)
|
|
|
{
|
|
|
struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
|
|
|
struct drm_display_mode *mode = &crtc->state->adjusted_mode;
|
|
@@ -149,24 +124,6 @@ void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc,
|
|
|
plane->crtc = crtc;
|
|
|
}
|
|
|
|
|
|
-void
|
|
|
-exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
|
|
|
- struct drm_framebuffer *fb, int crtc_x, int crtc_y,
|
|
|
- unsigned int crtc_w, unsigned int crtc_h,
|
|
|
- uint32_t src_x, uint32_t src_y,
|
|
|
- uint32_t src_w, uint32_t src_h)
|
|
|
-{
|
|
|
- struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
|
|
|
- struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
|
|
|
-
|
|
|
- exynos_plane_mode_set(plane, crtc, fb, crtc_x, crtc_y,
|
|
|
- crtc_w, crtc_h, src_x >> 16, src_y >> 16,
|
|
|
- src_w >> 16, src_h >> 16);
|
|
|
-
|
|
|
- if (exynos_crtc->ops->win_commit)
|
|
|
- exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos);
|
|
|
-}
|
|
|
-
|
|
|
static struct drm_plane_funcs exynos_plane_funcs = {
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
@@ -179,22 +136,51 @@ static struct drm_plane_funcs exynos_plane_funcs = {
|
|
|
static int exynos_plane_atomic_check(struct drm_plane *plane,
|
|
|
struct drm_plane_state *state)
|
|
|
{
|
|
|
- return exynos_check_plane(plane, state->fb);
|
|
|
+ struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
|
|
|
+ int nr;
|
|
|
+ int i;
|
|
|
+
|
|
|
+ if (!state->fb)
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ nr = exynos_drm_fb_get_buf_cnt(state->fb);
|
|
|
+ for (i = 0; i < nr; i++) {
|
|
|
+ struct exynos_drm_gem_buf *buffer =
|
|
|
+ exynos_drm_fb_buffer(state->fb, i);
|
|
|
+
|
|
|
+ if (!buffer) {
|
|
|
+ DRM_DEBUG_KMS("buffer is null\n");
|
|
|
+ return -EFAULT;
|
|
|
+ }
|
|
|
+
|
|
|
+ exynos_plane->dma_addr[i] = buffer->dma_addr +
|
|
|
+ state->fb->offsets[i];
|
|
|
+
|
|
|
+ DRM_DEBUG_KMS("buffer: %d, dma_addr = 0x%lx\n",
|
|
|
+ i, (unsigned long)exynos_plane->dma_addr[i]);
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static void exynos_plane_atomic_update(struct drm_plane *plane,
|
|
|
struct drm_plane_state *old_state)
|
|
|
{
|
|
|
struct drm_plane_state *state = plane->state;
|
|
|
+ struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(state->crtc);
|
|
|
+ struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
|
|
|
|
|
|
if (!state->crtc)
|
|
|
return;
|
|
|
|
|
|
- exynos_update_plane(plane, state->crtc, state->fb,
|
|
|
- state->crtc_x, state->crtc_y,
|
|
|
- state->crtc_w, state->crtc_h,
|
|
|
- state->src_x, state->src_y,
|
|
|
- state->src_w, state->src_h);
|
|
|
+ exynos_plane_mode_set(plane, state->crtc, state->fb,
|
|
|
+ state->crtc_x, state->crtc_y,
|
|
|
+ state->crtc_w, state->crtc_h,
|
|
|
+ state->src_x >> 16, state->src_y >> 16,
|
|
|
+ state->src_w >> 16, state->src_h >> 16);
|
|
|
+
|
|
|
+ if (exynos_crtc->ops->win_commit)
|
|
|
+ exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos);
|
|
|
}
|
|
|
|
|
|
static void exynos_plane_atomic_disable(struct drm_plane *plane,
|