diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2011-01-06 21:19:29 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-01-06 23:11:38 -0500 |
commit | 58c2e9f02ad09b4375eb11c1f65565a83310deca (patch) | |
tree | b313fef8113ed3932c7d91d13b44caf5e33843d4 /drivers/gpu/drm | |
parent | ff5b8562d965687261968d02762f9ae73e80a948 (diff) |
drm/radeon/kms: add ni_reg.h
This adds some new NI (northern islands) specific display
register defines.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/radeon/ni_reg.h | 86 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_reg.h | 1 |
2 files changed, 87 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni_reg.h b/drivers/gpu/drm/radeon/ni_reg.h new file mode 100644 index 000000000000..5db7b7d6feb0 --- /dev/null +++ b/drivers/gpu/drm/radeon/ni_reg.h | |||
@@ -0,0 +1,86 @@ | |||
1 | /* | ||
2 | * Copyright 2010 Advanced Micro Devices, Inc. | ||
3 | * | ||
4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | * copy of this software and associated documentation files (the "Software"), | ||
6 | * to deal in the Software without restriction, including without limitation | ||
7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
9 | * Software is furnished to do so, subject to the following conditions: | ||
10 | * | ||
11 | * The above copyright notice and this permission notice shall be included in | ||
12 | * all copies or substantial portions of the Software. | ||
13 | * | ||
14 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
18 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
19 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
20 | * OTHER DEALINGS IN THE SOFTWARE. | ||
21 | * | ||
22 | * Authors: Alex Deucher | ||
23 | */ | ||
24 | #ifndef __NI_REG_H__ | ||
25 | #define __NI_REG_H__ | ||
26 | |||
27 | /* northern islands - DCE5 */ | ||
28 | |||
29 | #define NI_INPUT_GAMMA_CONTROL 0x6840 | ||
30 | # define NI_GRPH_INPUT_GAMMA_MODE(x) (((x) & 0x3) << 0) | ||
31 | # define NI_INPUT_GAMMA_USE_LUT 0 | ||
32 | # define NI_INPUT_GAMMA_BYPASS 1 | ||
33 | # define NI_INPUT_GAMMA_SRGB_24 2 | ||
34 | # define NI_INPUT_GAMMA_XVYCC_222 3 | ||
35 | # define NI_OVL_INPUT_GAMMA_MODE(x) (((x) & 0x3) << 4) | ||
36 | |||
37 | #define NI_PRESCALE_GRPH_CONTROL 0x68b4 | ||
38 | # define NI_GRPH_PRESCALE_BYPASS (1 << 4) | ||
39 | |||
40 | #define NI_PRESCALE_OVL_CONTROL 0x68c4 | ||
41 | # define NI_OVL_PRESCALE_BYPASS (1 << 4) | ||
42 | |||
43 | #define NI_INPUT_CSC_CONTROL 0x68d4 | ||
44 | # define NI_INPUT_CSC_GRPH_MODE(x) (((x) & 0x3) << 0) | ||
45 | # define NI_INPUT_CSC_BYPASS 0 | ||
46 | # define NI_INPUT_CSC_PROG_COEFF 1 | ||
47 | # define NI_INPUT_CSC_PROG_SHARED_MATRIXA 2 | ||
48 | # define NI_INPUT_CSC_OVL_MODE(x) (((x) & 0x3) << 4) | ||
49 | |||
50 | #define NI_OUTPUT_CSC_CONTROL 0x68f0 | ||
51 | # define NI_OUTPUT_CSC_GRPH_MODE(x) (((x) & 0x7) << 0) | ||
52 | # define NI_OUTPUT_CSC_BYPASS 0 | ||
53 | # define NI_OUTPUT_CSC_TV_RGB 1 | ||
54 | # define NI_OUTPUT_CSC_YCBCR_601 2 | ||
55 | # define NI_OUTPUT_CSC_YCBCR_709 3 | ||
56 | # define NI_OUTPUT_CSC_PROG_COEFF 4 | ||
57 | # define NI_OUTPUT_CSC_PROG_SHARED_MATRIXB 5 | ||
58 | # define NI_OUTPUT_CSC_OVL_MODE(x) (((x) & 0x7) << 4) | ||
59 | |||
60 | #define NI_DEGAMMA_CONTROL 0x6960 | ||
61 | # define NI_GRPH_DEGAMMA_MODE(x) (((x) & 0x3) << 0) | ||
62 | # define NI_DEGAMMA_BYPASS 0 | ||
63 | # define NI_DEGAMMA_SRGB_24 1 | ||
64 | # define NI_DEGAMMA_XVYCC_222 2 | ||
65 | # define NI_OVL_DEGAMMA_MODE(x) (((x) & 0x3) << 4) | ||
66 | # define NI_ICON_DEGAMMA_MODE(x) (((x) & 0x3) << 8) | ||
67 | # define NI_CURSOR_DEGAMMA_MODE(x) (((x) & 0x3) << 12) | ||
68 | |||
69 | #define NI_GAMUT_REMAP_CONTROL 0x6964 | ||
70 | # define NI_GRPH_GAMUT_REMAP_MODE(x) (((x) & 0x3) << 0) | ||
71 | # define NI_GAMUT_REMAP_BYPASS 0 | ||
72 | # define NI_GAMUT_REMAP_PROG_COEFF 1 | ||
73 | # define NI_GAMUT_REMAP_PROG_SHARED_MATRIXA 2 | ||
74 | # define NI_GAMUT_REMAP_PROG_SHARED_MATRIXB 3 | ||
75 | # define NI_OVL_GAMUT_REMAP_MODE(x) (((x) & 0x3) << 4) | ||
76 | |||
77 | #define NI_REGAMMA_CONTROL 0x6a80 | ||
78 | # define NI_GRPH_REGAMMA_MODE(x) (((x) & 0x7) << 0) | ||
79 | # define NI_REGAMMA_BYPASS 0 | ||
80 | # define NI_REGAMMA_SRGB_24 1 | ||
81 | # define NI_REGAMMA_XVYCC_222 2 | ||
82 | # define NI_REGAMMA_PROG_A 3 | ||
83 | # define NI_REGAMMA_PROG_B 4 | ||
84 | # define NI_OVL_REGAMMA_MODE(x) (((x) & 0x7) << 4) | ||
85 | |||
86 | #endif | ||
diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h index 3369ce984af1..3cd4dace57c7 100644 --- a/drivers/gpu/drm/radeon/radeon_reg.h +++ b/drivers/gpu/drm/radeon/radeon_reg.h | |||
@@ -55,6 +55,7 @@ | |||
55 | #include "r500_reg.h" | 55 | #include "r500_reg.h" |
56 | #include "r600_reg.h" | 56 | #include "r600_reg.h" |
57 | #include "evergreen_reg.h" | 57 | #include "evergreen_reg.h" |
58 | #include "ni_reg.h" | ||
58 | 59 | ||
59 | #define RADEON_MC_AGP_LOCATION 0x014c | 60 | #define RADEON_MC_AGP_LOCATION 0x014c |
60 | #define RADEON_MC_AGP_START_MASK 0x0000FFFF | 61 | #define RADEON_MC_AGP_START_MASK 0x0000FFFF |