diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv17_tv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv17_tv.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.h b/drivers/gpu/drm/nouveau/nv17_tv.h index c00977cedabd..6bf03840f9eb 100644 --- a/drivers/gpu/drm/nouveau/nv17_tv.h +++ b/drivers/gpu/drm/nouveau/nv17_tv.h | |||
@@ -127,7 +127,8 @@ void nv17_ctv_update_rescaler(struct drm_encoder *encoder); | |||
127 | 127 | ||
128 | /* TV hardware access functions */ | 128 | /* TV hardware access functions */ |
129 | 129 | ||
130 | static inline void nv_write_ptv(struct drm_device *dev, uint32_t reg, uint32_t val) | 130 | static inline void nv_write_ptv(struct drm_device *dev, uint32_t reg, |
131 | uint32_t val) | ||
131 | { | 132 | { |
132 | nv_wr32(dev, reg, val); | 133 | nv_wr32(dev, reg, val); |
133 | } | 134 | } |
@@ -137,7 +138,8 @@ static inline uint32_t nv_read_ptv(struct drm_device *dev, uint32_t reg) | |||
137 | return nv_rd32(dev, reg); | 138 | return nv_rd32(dev, reg); |
138 | } | 139 | } |
139 | 140 | ||
140 | static inline void nv_write_tv_enc(struct drm_device *dev, uint8_t reg, uint8_t val) | 141 | static inline void nv_write_tv_enc(struct drm_device *dev, uint8_t reg, |
142 | uint8_t val) | ||
141 | { | 143 | { |
142 | nv_write_ptv(dev, NV_PTV_TV_INDEX, reg); | 144 | nv_write_ptv(dev, NV_PTV_TV_INDEX, reg); |
143 | nv_write_ptv(dev, NV_PTV_TV_DATA, val); | 145 | nv_write_ptv(dev, NV_PTV_TV_DATA, val); |
@@ -149,8 +151,11 @@ static inline uint8_t nv_read_tv_enc(struct drm_device *dev, uint8_t reg) | |||
149 | return nv_read_ptv(dev, NV_PTV_TV_DATA); | 151 | return nv_read_ptv(dev, NV_PTV_TV_DATA); |
150 | } | 152 | } |
151 | 153 | ||
152 | #define nv_load_ptv(dev, state, reg) nv_write_ptv(dev, NV_PTV_OFFSET + 0x##reg, state->ptv_##reg) | 154 | #define nv_load_ptv(dev, state, reg) \ |
153 | #define nv_save_ptv(dev, state, reg) state->ptv_##reg = nv_read_ptv(dev, NV_PTV_OFFSET + 0x##reg) | 155 | nv_write_ptv(dev, NV_PTV_OFFSET + 0x##reg, state->ptv_##reg) |
154 | #define nv_load_tv_enc(dev, state, reg) nv_write_tv_enc(dev, 0x##reg, state->tv_enc[0x##reg]) | 156 | #define nv_save_ptv(dev, state, reg) \ |
157 | state->ptv_##reg = nv_read_ptv(dev, NV_PTV_OFFSET + 0x##reg) | ||
158 | #define nv_load_tv_enc(dev, state, reg) \ | ||
159 | nv_write_tv_enc(dev, 0x##reg, state->tv_enc[0x##reg]) | ||
155 | 160 | ||
156 | #endif | 161 | #endif |