dt-bindings: display: Add ingenic,ipu.yaml

[mirror_ubuntu-jammy-kernel.git] / drivers / gpu / drm / ingenic / ingenic-drm.c

diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c b/drivers/gpu/drm/ingenic/ingenic-drm.c
index 55b49a31729bf180b924cd742a810f355d8e8039..606d8acb095469e8cd18e2aec6dfee37ef18941d 100644 (file)
--- a/drivers/gpu/drm/ingenic/ingenic-drm.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm.c
@@ -386,7 +386,7 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
                addr = drm_fb_cma_get_gem_addr(state->fb, state, 0);
                width = state->src_w >> 16;
                height = state->src_h >> 16;
-               cpp = state->fb->format->cpp[plane->index];
+               cpp = state->fb->format->cpp[0];
 
                priv->dma_hwdesc->addr = addr;
                priv->dma_hwdesc->cmd = width * height * cpp / 4;
@@ -419,7 +419,7 @@ static void ingenic_drm_encoder_atomic_mode_set(struct drm_encoder *encoder,
                cfg |= JZ_LCD_CFG_VSYNC_ACTIVE_LOW;
        if (info->bus_flags & DRM_BUS_FLAG_DE_LOW)
                cfg |= JZ_LCD_CFG_DE_ACTIVE_LOW;
-       if (info->bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
+       if (info->bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
                cfg |= JZ_LCD_CFG_PCLK_FALLING_EDGE;
 
        if (!priv->panel_is_sharp) {
@@ -519,18 +519,7 @@ static struct drm_driver ingenic_drm_driver_data = {
        .patchlevel             = 0,
 
        .fops                   = &ingenic_drm_fops,
-
-       .dumb_create            = drm_gem_cma_dumb_create,
-       .gem_free_object_unlocked = drm_gem_cma_free_object,
-       .gem_vm_ops             = &drm_gem_cma_vm_ops,
-
-       .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
-       .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
-       .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
-       .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
-       .gem_prime_vmap         = drm_gem_cma_prime_vmap,
-       .gem_prime_vunmap       = drm_gem_cma_prime_vunmap,
-       .gem_prime_mmap         = drm_gem_cma_prime_mmap,
+       DRM_GEM_CMA_DRIVER_OPS,
 
        .irq_handler            = ingenic_drm_irq_handler,
 };