diff options
| author | Eric Anholt <[email protected]> | 2016-07-08 01:53:53 +0000 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2016-07-08 01:53:53 +0000 |
| commit | 9f4e62f1520de97c302d65486b146b51c6ffde7c (patch) | |
| tree | 194fac093ff5a1a159b250cad654d8ff8d804cb5 /drivers/gpu/drm/vc4/vc4_regs.h | |
| parent | gpu: drm: vc4_hdmi: add missing of_node_put after calling of_parse_phandle (diff) | |
| parent | drm/vc4: Make pageflip completion handling more robust. (diff) | |
| download | kernel-9f4e62f1520de97c302d65486b146b51c6ffde7c.tar.gz kernel-9f4e62f1520de97c302d65486b146b51c6ffde7c.zip | |
Merge tag 'drm-vc4-fixes-2016-06-06' into drm-vc4-next
Merge Mario's get_vblank_counter fix forward to prevent conflicts with
his followon patch to add precise vblank timestamping.
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_regs.h')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_regs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h index 6163b95c5411..f99eece4cc97 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -341,6 +341,10 @@ #define SCALER_DISPLACT0 0x00000030 #define SCALER_DISPLACT1 0x00000034 #define SCALER_DISPLACT2 0x00000038 +#define SCALER_DISPLACTX(x) (SCALER_DISPLACT0 + \ + (x) * (SCALER_DISPLACT1 - \ + SCALER_DISPLACT0)) + #define SCALER_DISPCTRL0 0x00000040 # define SCALER_DISPCTRLX_ENABLE BIT(31) # define SCALER_DISPCTRLX_RESET BIT(30) |