summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-09-08 15:47:08 +0300
committerLinus Walleij <linus.walleij@linaro.org>2017-09-11 00:58:35 +0300
commitad86ebe71cba5fa06e1a96e41769c793b498fa75 (patch)
treea1e15a10f105ad73665e9e394fca6ebe278e4286 /drivers/gpu
parent52289a07a09d131a0981966aa8f2ab2a252a3c53 (diff)
downloadlinux-ad86ebe71cba5fa06e1a96e41769c793b498fa75.tar.xz
drm/pl111: Add optional variant display en/disable callbacks
The silcon and components around the PL111 may require some variants to perform special set-up of the display. Add two callbacks to manage this. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20170908124709.4758-6-linus.walleij@linaro.org
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/pl111/pl111_display.c6
-rw-r--r--drivers/gpu/drm/pl111/pl111_drm.h3
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c
index 3091fb4559cf..29148ff380d8 100644
--- a/drivers/gpu/drm/pl111/pl111_display.c
+++ b/drivers/gpu/drm/pl111/pl111_display.c
@@ -208,6 +208,9 @@ static void pl111_display_enable(struct drm_simple_display_pipe *pipe,
*/
msleep(20);
+ if (priv->variant_display_enable)
+ priv->variant_display_enable(drm, fb->format->format);
+
/* Power Up */
cntl |= CNTL_LCDPWR;
writel(cntl, priv->regs + priv->ctrl);
@@ -237,6 +240,9 @@ void pl111_display_disable(struct drm_simple_display_pipe *pipe)
*/
msleep(20);
+ if (priv->variant_display_disable)
+ priv->variant_display_disable(drm);
+
/* Disable */
writel(0, priv->regs + priv->ctrl);
diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h
index b380a7b4fb58..440f53ebee8c 100644
--- a/drivers/gpu/drm/pl111/pl111_drm.h
+++ b/drivers/gpu/drm/pl111/pl111_drm.h
@@ -26,6 +26,7 @@
#include <drm/drm_panel.h>
#include <drm/drm_bridge.h>
#include <linux/clk-provider.h>
+#include <linux/interrupt.h>
#define CLCD_IRQ_NEXTBASE_UPDATE BIT(2)
@@ -66,6 +67,8 @@ struct pl111_drm_dev_private {
*/
spinlock_t tim2_lock;
const struct pl111_variant_data *variant;
+ void (*variant_display_enable) (struct drm_device *drm, u32 format);
+ void (*variant_display_disable) (struct drm_device *drm);
};
int pl111_display_init(struct drm_device *dev);