Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit fff6386766fc846f19d5628878a4638fa7ece0a4

Authored by Ville Syrjälä
Committed by Daniel Vetter
1 parent ec9ed1976c
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

drm/i915: Don't cast away const from infoframe buffer 

We don't modify the packed infoframe data, so we should keep the
const qualifier in place. Just pass the buffer as 'const void *'
instead of 'const uint8_t *' and we can drop the cast entirely.

v2: Do intel_sdvo_write_infoframe() as well

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Showing 3 changed files with 12 additions and 12 deletions Side-by-side Diff

drivers/gpu/drm/i915/intel_drv.h
Diff comments   View file @ fff6386
... ... @@ -455,7 +455,7 @@
455 455 bool rgb_quant_range_selectable;
456 456 void (*write_infoframe)(struct drm_encoder *encoder,
457 457 enum hdmi_infoframe_type type,
458   - const uint8_t *frame, ssize_t len);
  458 + const void *frame, ssize_t len);
459 459 void (*set_infoframes)(struct drm_encoder *encoder,
460 460 struct drm_display_mode *adjusted_mode);
461 461 };
drivers/gpu/drm/i915/intel_hdmi.c
Diff comments   View file @ fff6386
... ... @@ -130,9 +130,9 @@
130 130  
131 131 static void g4x_write_infoframe(struct drm_encoder *encoder,
132 132 enum hdmi_infoframe_type type,
133   - const uint8_t *frame, ssize_t len)
  133 + const void *frame, ssize_t len)
134 134 {
135   - uint32_t *data = (uint32_t *)frame;
  135 + const uint32_t *data = frame;
136 136 struct drm_device *dev = encoder->dev;
137 137 struct drm_i915_private *dev_priv = dev->dev_private;
138 138 u32 val = I915_READ(VIDEO_DIP_CTL);
139 139  
... ... @@ -167,9 +167,9 @@
167 167  
168 168 static void ibx_write_infoframe(struct drm_encoder *encoder,
169 169 enum hdmi_infoframe_type type,
170   - const uint8_t *frame, ssize_t len)
  170 + const void *frame, ssize_t len)
171 171 {
172   - uint32_t *data = (uint32_t *)frame;
  172 + const uint32_t *data = frame;
173 173 struct drm_device *dev = encoder->dev;
174 174 struct drm_i915_private *dev_priv = dev->dev_private;
175 175 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
176 176  
... ... @@ -205,9 +205,9 @@
205 205  
206 206 static void cpt_write_infoframe(struct drm_encoder *encoder,
207 207 enum hdmi_infoframe_type type,
208   - const uint8_t *frame, ssize_t len)
  208 + const void *frame, ssize_t len)
209 209 {
210   - uint32_t *data = (uint32_t *)frame;
  210 + const uint32_t *data = frame;
211 211 struct drm_device *dev = encoder->dev;
212 212 struct drm_i915_private *dev_priv = dev->dev_private;
213 213 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
214 214  
... ... @@ -246,9 +246,9 @@
246 246  
247 247 static void vlv_write_infoframe(struct drm_encoder *encoder,
248 248 enum hdmi_infoframe_type type,
249   - const uint8_t *frame, ssize_t len)
  249 + const void *frame, ssize_t len)
250 250 {
251   - uint32_t *data = (uint32_t *)frame;
  251 + const uint32_t *data = frame;
252 252 struct drm_device *dev = encoder->dev;
253 253 struct drm_i915_private *dev_priv = dev->dev_private;
254 254 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
255 255  
... ... @@ -284,9 +284,9 @@
284 284  
285 285 static void hsw_write_infoframe(struct drm_encoder *encoder,
286 286 enum hdmi_infoframe_type type,
287   - const uint8_t *frame, ssize_t len)
  287 + const void *frame, ssize_t len)
288 288 {
289   - uint32_t *data = (uint32_t *)frame;
  289 + const uint32_t *data = frame;
290 290 struct drm_device *dev = encoder->dev;
291 291 struct drm_i915_private *dev_priv = dev->dev_private;
292 292 struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
drivers/gpu/drm/i915/intel_sdvo.c
Diff comments   View file @ fff6386
... ... @@ -952,7 +952,7 @@
952 952  
953 953 static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,
954 954 unsigned if_index, uint8_t tx_rate,
955   - uint8_t *data, unsigned length)
  955 + const uint8_t *data, unsigned length)
956 956 {
957 957 uint8_t set_buf_index[2] = { if_index, 0 };
958 958 uint8_t hbuf_size, tmp[8];