diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-09-08 19:59:02 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-09-08 19:59:02 +0100 |
| commit | 8fdd98562a2c95a6aa6be146d82db9186209c16f (patch) | |
| tree | 90ca02a69ccde22312977a9dc9dde7bbcaba5398 | |
| parent | bfe0ba6570493af4b8a8539be780fb1c542dba85 (diff) | |
| parent | 7c20c5d71e973a4242202e8e32b796760789fed7 (diff) | |
Merge branch 'tracking-armlt-hdlcd' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20150912.0tracking-integration-linaro-vexpress-ll-20150911.0tracking-integration-linaro-vexpress-ll-20150909.0
| -rw-r--r-- | drivers/gpu/drm/arm/hdlcd_drv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 54fb313816b6..140eb3f234cf 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -115,6 +115,12 @@ static int hdlcd_load(struct drm_device *dev, unsigned long flags) (version & HDLCD_VERSION_MAJOR_MASK) >> 8, version & HDLCD_VERSION_MINOR_MASK); + /* Make sure hardware is in a safe reset state */ + hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0); + hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, 0); + hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR,~0); + hdlcd_write(hdlcd, HDLCD_REG_INT_RAWSTAT, 0); + /* Get the optional coherent memory resource */ res = platform_get_resource(pdev, IORESOURCE_MEM, 1); if (res) { |