diff options
| author | Maxime Jourdan | 2019-03-11 11:51:44 +0100 |
|---|---|---|
| committer | Neil Armstrong | 2019-03-20 09:28:39 +0100 |
| commit | 2bf6b5b0e374fccda724ca208e8d5433b869246a (patch) | |
| tree | 009626f9871905bcd97c1b29b815577b593d520e /drivers/gpu/drm/meson/meson_overlay.c | |
| parent | dt-bindings: display: amlogic, meson-vpu: exclusively use amlogic, canvas (diff) | |
| download | kernel-qcow2-linux-2bf6b5b0e374fccda724ca208e8d5433b869246a.tar.gz kernel-qcow2-linux-2bf6b5b0e374fccda724ca208e8d5433b869246a.tar.xz kernel-qcow2-linux-2bf6b5b0e374fccda724ca208e8d5433b869246a.zip | |
drm/meson: exclusively use the canvas provider module
Now that the DMC register range is no longer in the bindings, remove any
mention towards it and exclusively use the meson-canvas module.
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190311105144.7276-3-mjourdan@baylibre.com
Diffstat (limited to 'drivers/gpu/drm/meson/meson_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/meson/meson_overlay.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/meson_overlay.c index 691a9fd16b36..b54a22e483b9 100644 --- a/drivers/gpu/drm/meson/meson_overlay.c +++ b/drivers/gpu/drm/meson/meson_overlay.c @@ -22,7 +22,6 @@ #include "meson_overlay.h" #include "meson_vpp.h" #include "meson_viu.h" -#include "meson_canvas.h" #include "meson_registers.h" /* VD1_IF0_GEN_REG */ @@ -350,13 +349,6 @@ static void meson_overlay_atomic_update(struct drm_plane *plane, DRM_DEBUG_DRIVER("\n"); - /* Fallback is canvas provider is not available */ - if (!priv->canvas) { - priv->canvas_id_vd1_0 = MESON_CANVAS_ID_VD1_0; - priv->canvas_id_vd1_1 = MESON_CANVAS_ID_VD1_1; - priv->canvas_id_vd1_2 = MESON_CANVAS_ID_VD1_2; - } - interlace_mode = state->crtc->mode.flags & DRM_MODE_FLAG_INTERLACE; spin_lock_irqsave(&priv->drm->event_lock, flags); |