diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2011-03-19 19:31:54 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-05-15 20:47:25 -0400 |
commit | 0b89a072f942412c45d00f74e7e789e019e5de2c (patch) | |
tree | dddd389b7e1dc5d1b511b58056d0964d980fa0bf /drivers | |
parent | f9ec8f6c8dea942bc4be5cc1f34c99df7a4d78ee (diff) |
drm/nouveau: Fix missing whitespace checkpatch.pl errors.
This patch fixes messages such as
ERROR: space required after that ','
ERROR: spaces required around that '='
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_grctx.h | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_reg.h | 14 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_graph.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_graph.h | 10 |
6 files changed, 22 insertions, 22 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 6b362d5a6d6f..711ee0d9627d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -883,13 +883,13 @@ extern void nouveau_channel_ref(struct nouveau_channel *chan, | |||
883 | extern void nouveau_channel_idle(struct nouveau_channel *chan); | 883 | extern void nouveau_channel_idle(struct nouveau_channel *chan); |
884 | 884 | ||
885 | /* nouveau_object.c */ | 885 | /* nouveau_object.c */ |
886 | #define NVOBJ_CLASS(d,c,e) do { \ | 886 | #define NVOBJ_CLASS(d, c, e) do { \ |
887 | int ret = nouveau_gpuobj_class_new((d), (c), NVOBJ_ENGINE_##e); \ | 887 | int ret = nouveau_gpuobj_class_new((d), (c), NVOBJ_ENGINE_##e); \ |
888 | if (ret) \ | 888 | if (ret) \ |
889 | return ret; \ | 889 | return ret; \ |
890 | } while (0) | 890 | } while (0) |
891 | 891 | ||
892 | #define NVOBJ_MTHD(d,c,m,e) do { \ | 892 | #define NVOBJ_MTHD(d, c, m, e) do { \ |
893 | int ret = nouveau_gpuobj_mthd_new((d), (c), (m), (e)); \ | 893 | int ret = nouveau_gpuobj_mthd_new((d), (c), (m), (e)); \ |
894 | if (ret) \ | 894 | if (ret) \ |
895 | return ret; \ | 895 | return ret; \ |
diff --git a/drivers/gpu/drm/nouveau/nouveau_grctx.h b/drivers/gpu/drm/nouveau/nouveau_grctx.h index 4a8ad1307fa4..86c2e374e938 100644 --- a/drivers/gpu/drm/nouveau/nouveau_grctx.h +++ b/drivers/gpu/drm/nouveau/nouveau_grctx.h | |||
@@ -87,10 +87,10 @@ _cp_bra(struct nouveau_grctx *ctx, u32 mod, int flag, int state, int name) | |||
87 | cp_out(ctx, CP_BRA | (mod << 18) | ip | flag | | 87 | cp_out(ctx, CP_BRA | (mod << 18) | ip | flag | |
88 | (state ? 0 : CP_BRA_IF_CLEAR)); | 88 | (state ? 0 : CP_BRA_IF_CLEAR)); |
89 | } | 89 | } |
90 | #define cp_bra(c,f,s,n) _cp_bra((c), 0, CP_FLAG_##f, CP_FLAG_##f##_##s, n) | 90 | #define cp_bra(c, f, s, n) _cp_bra((c), 0, CP_FLAG_##f, CP_FLAG_##f##_##s, n) |
91 | #ifdef CP_BRA_MOD | 91 | #ifdef CP_BRA_MOD |
92 | #define cp_cal(c,f,s,n) _cp_bra((c), 1, CP_FLAG_##f, CP_FLAG_##f##_##s, n) | 92 | #define cp_cal(c, f, s, n) _cp_bra((c), 1, CP_FLAG_##f, CP_FLAG_##f##_##s, n) |
93 | #define cp_ret(c,f,s) _cp_bra((c), 2, CP_FLAG_##f, CP_FLAG_##f##_##s, 0) | 93 | #define cp_ret(c, f, s) _cp_bra((c), 2, CP_FLAG_##f, CP_FLAG_##f##_##s, 0) |
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | static inline void | 96 | static inline void |
@@ -98,14 +98,14 @@ _cp_wait(struct nouveau_grctx *ctx, int flag, int state) | |||
98 | { | 98 | { |
99 | cp_out(ctx, CP_WAIT | flag | (state ? CP_WAIT_SET : 0)); | 99 | cp_out(ctx, CP_WAIT | flag | (state ? CP_WAIT_SET : 0)); |
100 | } | 100 | } |
101 | #define cp_wait(c,f,s) _cp_wait((c), CP_FLAG_##f, CP_FLAG_##f##_##s) | 101 | #define cp_wait(c, f, s) _cp_wait((c), CP_FLAG_##f, CP_FLAG_##f##_##s) |
102 | 102 | ||
103 | static inline void | 103 | static inline void |
104 | _cp_set(struct nouveau_grctx *ctx, int flag, int state) | 104 | _cp_set(struct nouveau_grctx *ctx, int flag, int state) |
105 | { | 105 | { |
106 | cp_out(ctx, CP_SET | flag | (state ? CP_SET_1 : 0)); | 106 | cp_out(ctx, CP_SET | flag | (state ? CP_SET_1 : 0)); |
107 | } | 107 | } |
108 | #define cp_set(c,f,s) _cp_set((c), CP_FLAG_##f, CP_FLAG_##f##_##s) | 108 | #define cp_set(c, f, s) _cp_set((c), CP_FLAG_##f, CP_FLAG_##f##_##s) |
109 | 109 | ||
110 | static inline void | 110 | static inline void |
111 | cp_pos(struct nouveau_grctx *ctx, int offset) | 111 | cp_pos(struct nouveau_grctx *ctx, int offset) |
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index be07a4bc4aae..e177a62967e0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c | |||
@@ -600,7 +600,7 @@ nouveau_mem_timing_init(struct drm_device *dev) | |||
600 | /* Get "some number" from the timing reg for NV_40 | 600 | /* Get "some number" from the timing reg for NV_40 |
601 | * Used in calculations later */ | 601 | * Used in calculations later */ |
602 | if (dev_priv->card_type == NV_40) { | 602 | if (dev_priv->card_type == NV_40) { |
603 | magic_number = (nv_rd32(dev,0x100228) & 0x0f000000) >> 24; | 603 | magic_number = (nv_rd32(dev, 0x100228) & 0x0f000000) >> 24; |
604 | } | 604 | } |
605 | 605 | ||
606 | entry = mem + mem[1]; | 606 | entry = mem + mem[1]; |
@@ -668,7 +668,7 @@ nouveau_mem_timing_init(struct drm_device *dev) | |||
668 | tUNK_13 << 8 | tUNK_13); | 668 | tUNK_13 << 8 | tUNK_13); |
669 | 669 | ||
670 | timing->reg_100234 = (tRAS << 24 | tRC); | 670 | timing->reg_100234 = (tRAS << 24 | tRC); |
671 | timing->reg_100234 += max(tUNK_10,tUNK_11) << 16; | 671 | timing->reg_100234 += max(tUNK_10, tUNK_11) << 16; |
672 | 672 | ||
673 | if (dev_priv->chipset < 0xa3) { | 673 | if (dev_priv->chipset < 0xa3) { |
674 | timing->reg_100234 |= (tUNK_2 + 2) << 8; | 674 | timing->reg_100234 |= (tUNK_2 + 2) << 8; |
diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h index 04e8fb795269..f18cdfc3400f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_reg.h +++ b/drivers/gpu/drm/nouveau/nouveau_reg.h | |||
@@ -639,9 +639,9 @@ | |||
639 | # define NV50_PCONNECTOR_I2C_PORT_4 0x0000e240 | 639 | # define NV50_PCONNECTOR_I2C_PORT_4 0x0000e240 |
640 | # define NV50_PCONNECTOR_I2C_PORT_5 0x0000e258 | 640 | # define NV50_PCONNECTOR_I2C_PORT_5 0x0000e258 |
641 | 641 | ||
642 | #define NV50_AUXCH_DATA_OUT(i,n) ((n) * 4 + (i) * 0x50 + 0x0000e4c0) | 642 | #define NV50_AUXCH_DATA_OUT(i, n) ((n) * 4 + (i) * 0x50 + 0x0000e4c0) |
643 | #define NV50_AUXCH_DATA_OUT__SIZE 4 | 643 | #define NV50_AUXCH_DATA_OUT__SIZE 4 |
644 | #define NV50_AUXCH_DATA_IN(i,n) ((n) * 4 + (i) * 0x50 + 0x0000e4d0) | 644 | #define NV50_AUXCH_DATA_IN(i, n) ((n) * 4 + (i) * 0x50 + 0x0000e4d0) |
645 | #define NV50_AUXCH_DATA_IN__SIZE 4 | 645 | #define NV50_AUXCH_DATA_IN__SIZE 4 |
646 | #define NV50_AUXCH_ADDR(i) ((i) * 0x50 + 0x0000e4e0) | 646 | #define NV50_AUXCH_ADDR(i) ((i) * 0x50 + 0x0000e4e0) |
647 | #define NV50_AUXCH_CTRL(i) ((i) * 0x50 + 0x0000e4e4) | 647 | #define NV50_AUXCH_CTRL(i) ((i) * 0x50 + 0x0000e4e4) |
@@ -829,7 +829,7 @@ | |||
829 | #define NV50_PDISPLAY_SOR_BACKLIGHT 0x0061c084 | 829 | #define NV50_PDISPLAY_SOR_BACKLIGHT 0x0061c084 |
830 | #define NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE 0x80000000 | 830 | #define NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE 0x80000000 |
831 | #define NV50_PDISPLAY_SOR_BACKLIGHT_LEVEL 0x00000fff | 831 | #define NV50_PDISPLAY_SOR_BACKLIGHT_LEVEL 0x00000fff |
832 | #define NV50_SOR_DP_CTRL(i,l) (0x0061c10c + (i) * 0x800 + (l) * 0x80) | 832 | #define NV50_SOR_DP_CTRL(i, l) (0x0061c10c + (i) * 0x800 + (l) * 0x80) |
833 | #define NV50_SOR_DP_CTRL_ENABLED 0x00000001 | 833 | #define NV50_SOR_DP_CTRL_ENABLED 0x00000001 |
834 | #define NV50_SOR_DP_CTRL_ENHANCED_FRAME_ENABLED 0x00004000 | 834 | #define NV50_SOR_DP_CTRL_ENHANCED_FRAME_ENABLED 0x00004000 |
835 | #define NV50_SOR_DP_CTRL_LANE_MASK 0x001f0000 | 835 | #define NV50_SOR_DP_CTRL_LANE_MASK 0x001f0000 |
@@ -841,10 +841,10 @@ | |||
841 | #define NV50_SOR_DP_CTRL_TRAINING_PATTERN_DISABLED 0x00000000 | 841 | #define NV50_SOR_DP_CTRL_TRAINING_PATTERN_DISABLED 0x00000000 |
842 | #define NV50_SOR_DP_CTRL_TRAINING_PATTERN_1 0x01000000 | 842 | #define NV50_SOR_DP_CTRL_TRAINING_PATTERN_1 0x01000000 |
843 | #define NV50_SOR_DP_CTRL_TRAINING_PATTERN_2 0x02000000 | 843 | #define NV50_SOR_DP_CTRL_TRAINING_PATTERN_2 0x02000000 |
844 | #define NV50_SOR_DP_UNK118(i,l) (0x0061c118 + (i) * 0x800 + (l) * 0x80) | 844 | #define NV50_SOR_DP_UNK118(i, l) (0x0061c118 + (i) * 0x800 + (l) * 0x80) |
845 | #define NV50_SOR_DP_UNK120(i,l) (0x0061c120 + (i) * 0x800 + (l) * 0x80) | 845 | #define NV50_SOR_DP_UNK120(i, l) (0x0061c120 + (i) * 0x800 + (l) * 0x80) |
846 | #define NV50_SOR_DP_UNK128(i,l) (0x0061c128 + (i) * 0x800 + (l) * 0x80) | 846 | #define NV50_SOR_DP_UNK128(i, l) (0x0061c128 + (i) * 0x800 + (l) * 0x80) |
847 | #define NV50_SOR_DP_UNK130(i,l) (0x0061c130 + (i) * 0x800 + (l) * 0x80) | 847 | #define NV50_SOR_DP_UNK130(i, l) (0x0061c130 + (i) * 0x800 + (l) * 0x80) |
848 | 848 | ||
849 | #define NV50_PDISPLAY_USER(i) ((i) * 0x1000 + 0x00640000) | 849 | #define NV50_PDISPLAY_USER(i) ((i) * 0x1000 + 0x00640000) |
850 | #define NV50_PDISPLAY_USER_PUT(i) ((i) * 0x1000 + 0x00640000) | 850 | #define NV50_PDISPLAY_USER_PUT(i) ((i) * 0x1000 + 0x00640000) |
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index 7289cbac05b2..7950bac8123a 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c | |||
@@ -662,7 +662,7 @@ nv50_pgraph_mp_trap(struct drm_device *dev, int tpid, int display) | |||
662 | nv_rd32(dev, addr + 0x20); | 662 | nv_rd32(dev, addr + 0x20); |
663 | pc = nv_rd32(dev, addr + 0x24); | 663 | pc = nv_rd32(dev, addr + 0x24); |
664 | oplow = nv_rd32(dev, addr + 0x70); | 664 | oplow = nv_rd32(dev, addr + 0x70); |
665 | ophigh= nv_rd32(dev, addr + 0x74); | 665 | ophigh = nv_rd32(dev, addr + 0x74); |
666 | NV_INFO(dev, "PGRAPH_TRAP_MP_EXEC - " | 666 | NV_INFO(dev, "PGRAPH_TRAP_MP_EXEC - " |
667 | "TP %d MP %d: ", tpid, i); | 667 | "TP %d MP %d: ", tpid, i); |
668 | nouveau_enum_print(nv50_mp_exec_error_names, status); | 668 | nouveau_enum_print(nv50_mp_exec_error_names, status); |
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.h b/drivers/gpu/drm/nouveau/nvc0_graph.h index 93c8777a8dcd..d32b38594a31 100644 --- a/drivers/gpu/drm/nouveau/nvc0_graph.h +++ b/drivers/gpu/drm/nouveau/nvc0_graph.h | |||
@@ -28,11 +28,11 @@ | |||
28 | #define GPC_MAX 4 | 28 | #define GPC_MAX 4 |
29 | #define TP_MAX 32 | 29 | #define TP_MAX 32 |
30 | 30 | ||
31 | #define ROP_BCAST(r) (0x408800 + (r)) | 31 | #define ROP_BCAST(r) (0x408800 + (r)) |
32 | #define ROP_UNIT(u,r) (0x410000 + (u) * 0x400 + (r)) | 32 | #define ROP_UNIT(u, r) (0x410000 + (u) * 0x400 + (r)) |
33 | #define GPC_BCAST(r) (0x418000 + (r)) | 33 | #define GPC_BCAST(r) (0x418000 + (r)) |
34 | #define GPC_UNIT(t,r) (0x500000 + (t) * 0x8000 + (r)) | 34 | #define GPC_UNIT(t, r) (0x500000 + (t) * 0x8000 + (r)) |
35 | #define TP_UNIT(t,m,r) (0x504000 + (t) * 0x8000 + (m) * 0x800 + (r)) | 35 | #define TP_UNIT(t, m, r) (0x504000 + (t) * 0x8000 + (m) * 0x800 + (r)) |
36 | 36 | ||
37 | struct nvc0_graph_priv { | 37 | struct nvc0_graph_priv { |
38 | u8 gpc_nr; | 38 | u8 gpc_nr; |