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

Commit ed517fbb authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: small hdmi coding style cleanups 



- Changed the coding style of auxiliary infoframe functions to make
  them smaller
- Fixed the column alignment of some function definitions
- Remove definition of "struct drm_crtc" in some places as they're
  used only to retrieve "struct intel_crtc"

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 81014b9d

drivers/gpu/drm/i915/intel_hdmi.c

+13 −31
Original line number Diff line number Diff line
@@ -65,40 +65,28 @@ void intel_dip_infoframe_csum(struct dip_infoframe *frame) 


static u32 g4x_infoframe_index(struct dip_infoframe *frame)

{

	u32 flags = 0;



	switch (frame->type) {

	case DIP_TYPE_AVI:

		flags |= VIDEO_DIP_SELECT_AVI;

		break;

		return VIDEO_DIP_SELECT_AVI;

	case DIP_TYPE_SPD:

		flags |= VIDEO_DIP_SELECT_SPD;

		break;

		return VIDEO_DIP_SELECT_SPD;

	default:

		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);

		break;

		return 0;

	}



	return flags;

}



static u32 g4x_infoframe_enable(struct dip_infoframe *frame)

{

	u32 flags = 0;



	switch (frame->type) {

	case DIP_TYPE_AVI:

		flags |= VIDEO_DIP_ENABLE_AVI;

		break;

		return VIDEO_DIP_ENABLE_AVI;

	case DIP_TYPE_SPD:

		flags |= VIDEO_DIP_ENABLE_SPD;

		break;

		return VIDEO_DIP_ENABLE_SPD;

	default:

		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);

		break;

		return 0;

	}



	return flags;

}



static void g4x_write_infoframe(struct drm_encoder *encoder,
@@ -111,8 +99,6 @@ static void g4x_write_infoframe(struct drm_encoder *encoder, 
	u32 val = I915_READ(VIDEO_DIP_CTL);

	unsigned i, len = DIP_HEADER_SIZE + frame->len;





	/* XXX first guess at handling video port, is this corrent? */

	val &= ~VIDEO_DIP_PORT_MASK;

	if (intel_hdmi->sdvox_reg == SDVOB)

		val |= VIDEO_DIP_PORT_B;
@@ -147,8 +133,7 @@ static void ibx_write_infoframe(struct drm_encoder *encoder, 
	uint32_t *data = (uint32_t *)frame;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc = encoder->crtc;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

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

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);

	int reg = TVIDEO_DIP_CTL(intel_crtc->pipe);

	unsigned i, len = DIP_HEADER_SIZE + frame->len;
@@ -197,8 +182,7 @@ static void cpt_write_infoframe(struct drm_encoder *encoder, 
	uint32_t *data = (uint32_t *)frame;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc = encoder->crtc;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

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

	int reg = TVIDEO_DIP_CTL(intel_crtc->pipe);

	unsigned i, len = DIP_HEADER_SIZE + frame->len;

	u32 val = I915_READ(reg);
@@ -237,8 +221,7 @@ static void vlv_write_infoframe(struct drm_encoder *encoder, 
	uint32_t *data = (uint32_t *)frame;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc = encoder->crtc;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

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

	int reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe);

	unsigned i, len = DIP_HEADER_SIZE + frame->len;

	u32 val = I915_READ(reg);
@@ -325,8 +308,7 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder, 
{

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc = encoder->crtc;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

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

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);

	u32 sdvox;