diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-06-14 20:40:57 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-08-09 17:17:51 -0400 |
commit | 38b62fb3808e6b57dbd7728e897e4f7674d1c998 (patch) | |
tree | a7760bbc61584cfe400a2d44e49c5350ba27bacd | |
parent | a5f0ef593c4a130f5f5cd4cd506af946e32dd509 (diff) |
drm/rcar-du: Add support for DEFR8 register
The R8A7790 DU has a new extended function control register. Support it.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_drv.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_group.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 8694a4648860..f8785357b599 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c | |||
@@ -222,7 +222,8 @@ static const struct rcar_du_device_info rcar_du_r8a7779_info = { | |||
222 | }; | 222 | }; |
223 | 223 | ||
224 | static const struct rcar_du_device_info rcar_du_r8a7790_info = { | 224 | static const struct rcar_du_device_info rcar_du_r8a7790_info = { |
225 | .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_ALIGN_128B, | 225 | .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_ALIGN_128B |
226 | | RCAR_DU_FEATURE_DEFR8, | ||
226 | .num_crtcs = 3, | 227 | .num_crtcs = 3, |
227 | }; | 228 | }; |
228 | 229 | ||
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index 160e5eb8f29d..70c335f51136 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h | |||
@@ -27,6 +27,7 @@ struct rcar_du_device; | |||
27 | 27 | ||
28 | #define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK (1 << 0) /* Per-CRTC IRQ and clock */ | 28 | #define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK (1 << 0) /* Per-CRTC IRQ and clock */ |
29 | #define RCAR_DU_FEATURE_ALIGN_128B (1 << 1) /* Align pitches to 128 bytes */ | 29 | #define RCAR_DU_FEATURE_ALIGN_128B (1 << 1) /* Align pitches to 128 bytes */ |
30 | #define RCAR_DU_FEATURE_DEFR8 (1 << 2) /* Has DEFR8 register */ | ||
30 | 31 | ||
31 | /* | 32 | /* |
32 | * struct rcar_du_device_info - DU model-specific information | 33 | * struct rcar_du_device_info - DU model-specific information |
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c index 0eb106efffc9..f3ba0ca845e2 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_group.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c | |||
@@ -51,6 +51,8 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp) | |||
51 | rcar_du_group_write(rgrp, DEFR3, DEFR3_CODE | DEFR3_DEFE3); | 51 | rcar_du_group_write(rgrp, DEFR3, DEFR3_CODE | DEFR3_DEFE3); |
52 | rcar_du_group_write(rgrp, DEFR4, DEFR4_CODE); | 52 | rcar_du_group_write(rgrp, DEFR4, DEFR4_CODE); |
53 | rcar_du_group_write(rgrp, DEFR5, DEFR5_CODE | DEFR5_DEFE5); | 53 | rcar_du_group_write(rgrp, DEFR5, DEFR5_CODE | DEFR5_DEFE5); |
54 | if (rcar_du_has(rgrp->dev, RCAR_DU_FEATURE_DEFR8)) | ||
55 | rcar_du_group_write(rgrp, DEFR8, DEFR8_CODE | DEFR8_DEFE8); | ||
54 | 56 | ||
55 | /* Use DS1PR and DS2PR to configure planes priorities and connects the | 57 | /* Use DS1PR and DS2PR to configure planes priorities and connects the |
56 | * superposition 0 to DU0 pins. DU1 pins will be configured dynamically. | 58 | * superposition 0 to DU0 pins. DU1 pins will be configured dynamically. |