Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fff63867 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ec9ed197

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -455,7 +455,7 @@ struct intel_hdmi { 
	bool rgb_quant_range_selectable;

	bool rgb_quant_range_selectable;

	void (*write_infoframe)(struct drm_encoder *encoder,

	void (*write_infoframe)(struct drm_encoder *encoder,

				enum hdmi_infoframe_type type,

				enum hdmi_infoframe_type type,

				const uint8_t *frame, ssize_t len);

				const void *frame, ssize_t len);

	void (*set_infoframes)(struct drm_encoder *encoder,

	void (*set_infoframes)(struct drm_encoder *encoder,

			       struct drm_display_mode *adjusted_mode);

			       struct drm_display_mode *adjusted_mode);

};

};

drivers/gpu/drm/i915/intel_hdmi.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -130,9 +130,9 @@ static u32 hsw_infoframe_data_reg(enum hdmi_infoframe_type type, 




static void g4x_write_infoframe(struct drm_encoder *encoder,

static void g4x_write_infoframe(struct drm_encoder *encoder,

				enum hdmi_infoframe_type type,

				enum hdmi_infoframe_type type,

				const uint8_t *frame, ssize_t len)

				const void *frame, ssize_t len)

{

{

	uint32_t *data = (uint32_t *)frame;

	const uint32_t *data = frame;

	struct drm_device *dev = encoder->dev;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 val = I915_READ(VIDEO_DIP_CTL);

	u32 val = I915_READ(VIDEO_DIP_CTL);
@@ -167,9 +167,9 @@ static void g4x_write_infoframe(struct drm_encoder *encoder, 




static void ibx_write_infoframe(struct drm_encoder *encoder,

static void ibx_write_infoframe(struct drm_encoder *encoder,

				enum hdmi_infoframe_type type,

				enum hdmi_infoframe_type type,

				const uint8_t *frame, ssize_t len)

				const void *frame, ssize_t len)

{

{

	uint32_t *data = (uint32_t *)frame;

	const uint32_t *data = frame;

	struct drm_device *dev = encoder->dev;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
@@ -205,9 +205,9 @@ static void ibx_write_infoframe(struct drm_encoder *encoder, 




static void cpt_write_infoframe(struct drm_encoder *encoder,

static void cpt_write_infoframe(struct drm_encoder *encoder,

				enum hdmi_infoframe_type type,

				enum hdmi_infoframe_type type,

				const uint8_t *frame, ssize_t len)

				const void *frame, ssize_t len)

{

{

	uint32_t *data = (uint32_t *)frame;

	const uint32_t *data = frame;

	struct drm_device *dev = encoder->dev;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
@@ -246,9 +246,9 @@ static void cpt_write_infoframe(struct drm_encoder *encoder, 




static void vlv_write_infoframe(struct drm_encoder *encoder,

static void vlv_write_infoframe(struct drm_encoder *encoder,

				enum hdmi_infoframe_type type,

				enum hdmi_infoframe_type type,

				const uint8_t *frame, ssize_t len)

				const void *frame, ssize_t len)

{

{

	uint32_t *data = (uint32_t *)frame;

	const uint32_t *data = frame;

	struct drm_device *dev = encoder->dev;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
@@ -284,9 +284,9 @@ static void vlv_write_infoframe(struct drm_encoder *encoder, 




static void hsw_write_infoframe(struct drm_encoder *encoder,

static void hsw_write_infoframe(struct drm_encoder *encoder,

				enum hdmi_infoframe_type type,

				enum hdmi_infoframe_type type,

				const uint8_t *frame, ssize_t len)

				const void *frame, ssize_t len)

{

{

	uint32_t *data = (uint32_t *)frame;

	const uint32_t *data = frame;

	struct drm_device *dev = encoder->dev;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

drivers/gpu/drm/i915/intel_sdvo.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -952,7 +952,7 @@ static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo) 




static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,

static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,

				       unsigned if_index, uint8_t tx_rate,

				       unsigned if_index, uint8_t tx_rate,

				       uint8_t *data, unsigned length)

				       const uint8_t *data, unsigned length)

{

{

	uint8_t set_buf_index[2] = { if_index, 0 };

	uint8_t set_buf_index[2] = { if_index, 0 };

	uint8_t hbuf_size, tmp[8];

	uint8_t hbuf_size, tmp[8];