diff options
author | Dave Airlie <airlied@redhat.com> | 2016-06-09 22:17:46 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-06-09 22:17:46 -0400 |
commit | 7ff6977be8e3c7e6f5ae1ee56bc1535c5ca653b1 (patch) | |
tree | 9adb745063b6e6b29459aa4c9bf74e286141dd26 | |
parent | 29ccf7590ec49647b3442b6b2c64c4406a931c80 (diff) | |
parent | ce492b3b8f99cf9d2f807ec22d8805c996a09503 (diff) |
Merge branch 'fixes-for-v4.7-rc3' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-fixes
* 'fixes-for-v4.7-rc3' of http://git.agner.ch/git/linux-drm-fsl-dcu:
drm/fsl-dcu: use flat regmap cache
-rw-r--r-- | drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 0ec1ad961e0d..dc723f7ead7d 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | |||
@@ -42,9 +42,10 @@ static const struct regmap_config fsl_dcu_regmap_config = { | |||
42 | .reg_bits = 32, | 42 | .reg_bits = 32, |
43 | .reg_stride = 4, | 43 | .reg_stride = 4, |
44 | .val_bits = 32, | 44 | .val_bits = 32, |
45 | .cache_type = REGCACHE_RBTREE, | 45 | .cache_type = REGCACHE_FLAT, |
46 | 46 | ||
47 | .volatile_reg = fsl_dcu_drm_is_volatile_reg, | 47 | .volatile_reg = fsl_dcu_drm_is_volatile_reg, |
48 | .max_register = 0x11fc, | ||
48 | }; | 49 | }; |
49 | 50 | ||
50 | static int fsl_dcu_drm_irq_init(struct drm_device *dev) | 51 | static int fsl_dcu_drm_irq_init(struct drm_device *dev) |