diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-09-08 19:13:08 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-09-08 19:13:08 +0100 |
| commit | 59f76c990fb298722fd3ab3e3a8c00f187a2dfb5 (patch) | |
| tree | ead75c3545c01fc95324bbbcd7ca5069b0bd3273 | |
| parent | c989233776ad3354369bd6540590d3786c3cd015 (diff) | |
| parent | 98d7f6cf13fc8fedb644dd978c6ba27e1fcc73ca (diff) | |
Merge branch 'lsk-3.18-armlt-hdlcd' into integration-lsk-3.18-armlt-androidlsk-3.18-armlt-20150908
| -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) { |