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

Commit f2434237 authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Break some long lines in the TV-out code. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 8597a1ba

drivers/gpu/drm/nouveau/nv17_tv.c

+57 −42
Original line number Diff line number Diff line
@@ -193,32 +193,12 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector) 
	}

}



static const struct {

	int hdisplay;

	int vdisplay;

} modes[] = {

	{ 640, 400 },

	{ 640, 480 },

	{ 720, 480 },

	{ 720, 576 },

	{ 800, 600 },

	{ 1024, 768 },

	{ 1280, 720 },

	{ 1280, 1024 },

	{ 1920, 1080 }

};



static int nv17_tv_get_modes(struct drm_encoder *encoder,

static int nv17_tv_get_ld_modes(struct drm_encoder *encoder,

				struct drm_connector *connector)

{

	struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);

	struct drm_display_mode *mode;

	struct drm_display_mode *output_mode;

	struct drm_display_mode *mode, *tv_mode;

	int n = 0;

	int i;



	if (tv_norm->kind != CTV_ENC_MODE) {

		struct drm_display_mode *tv_mode;



	for (tv_mode = nv17_tv_modes; tv_mode->hdisplay; tv_mode++) {

		mode = drm_mode_duplicate(encoder->dev, tv_mode);
@@ -237,11 +217,32 @@ static int nv17_tv_get_modes(struct drm_encoder *encoder, 
		drm_mode_probed_add(connector, mode);

		n++;

	}



	return n;

}



	/* tv_norm->kind == CTV_ENC_MODE */

	output_mode = &tv_norm->ctv_enc_mode.mode;

static int nv17_tv_get_hd_modes(struct drm_encoder *encoder,

				struct drm_connector *connector)

{

	struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);

	struct drm_display_mode *output_mode = &tv_norm->ctv_enc_mode.mode;

	struct drm_display_mode *mode;

	const struct {

		int hdisplay;

		int vdisplay;

	} modes[] = {

		{ 640, 400 },

		{ 640, 480 },

		{ 720, 480 },

		{ 720, 576 },

		{ 800, 600 },

		{ 1024, 768 },

		{ 1280, 720 },

		{ 1280, 1024 },

		{ 1920, 1080 }

	};

	int i, n = 0;



	for (i = 0; i < ARRAY_SIZE(modes); i++) {

		if (modes[i].hdisplay > output_mode->hdisplay ||

		    modes[i].vdisplay > output_mode->vdisplay)
@@ -251,11 +252,12 @@ static int nv17_tv_get_modes(struct drm_encoder *encoder, 
		    modes[i].vdisplay == output_mode->vdisplay) {

			mode = drm_mode_duplicate(encoder->dev, output_mode);

			mode->type |= DRM_MODE_TYPE_PREFERRED;



		} else {

			mode = drm_cvt_mode(encoder->dev, modes[i].hdisplay,

					    modes[i].vdisplay, 60, false,

				output_mode->flags & DRM_MODE_FLAG_INTERLACE,

				false);

					    (output_mode->flags &

					     DRM_MODE_FLAG_INTERLACE), false);

		}



		/* CVT modes are sometimes unsuitable... */
@@ -266,6 +268,7 @@ static int nv17_tv_get_modes(struct drm_encoder *encoder, 
					     - mode->hdisplay) * 9 / 10) & ~7;

			mode->hsync_end = mode->hsync_start + 8;

		}



		if (output_mode->vdisplay >= 1024) {

			mode->vtotal = output_mode->vtotal;

			mode->vsync_start = output_mode->vsync_start;
@@ -276,9 +279,21 @@ static int nv17_tv_get_modes(struct drm_encoder *encoder, 
		drm_mode_probed_add(connector, mode);

		n++;

	}



	return n;

}



static int nv17_tv_get_modes(struct drm_encoder *encoder,

			     struct drm_connector *connector)

{

	struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);



	if (tv_norm->kind == CTV_ENC_MODE)

		return nv17_tv_get_hd_modes(encoder, connector);

	else

		return nv17_tv_get_ld_modes(encoder, connector);

}



static int nv17_tv_mode_valid(struct drm_encoder *encoder,

			      struct drm_display_mode *mode)

{

drivers/gpu/drm/nouveau/nv17_tv.h

+10 −5
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ void nv17_ctv_update_rescaler(struct drm_encoder *encoder); 


/* TV hardware access functions */



static inline void nv_write_ptv(struct drm_device *dev, uint32_t reg, uint32_t val)

static inline void nv_write_ptv(struct drm_device *dev, uint32_t reg,

				uint32_t val)

{

	nv_wr32(dev, reg, val);

}
@@ -137,7 +138,8 @@ static inline uint32_t nv_read_ptv(struct drm_device *dev, uint32_t reg) 
	return nv_rd32(dev, reg);

}



static inline void nv_write_tv_enc(struct drm_device *dev, uint8_t reg, uint8_t val)

static inline void nv_write_tv_enc(struct drm_device *dev, uint8_t reg,

				   uint8_t val)

{

	nv_write_ptv(dev, NV_PTV_TV_INDEX, reg);

	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) 
	return nv_read_ptv(dev, NV_PTV_TV_DATA);

}



#define nv_load_ptv(dev, state, reg) nv_write_ptv(dev, NV_PTV_OFFSET + 0x##reg, state->ptv_##reg)

#define nv_save_ptv(dev, state, reg) state->ptv_##reg = nv_read_ptv(dev, NV_PTV_OFFSET + 0x##reg)

#define nv_load_tv_enc(dev, state, reg) nv_write_tv_enc(dev, 0x##reg, state->tv_enc[0x##reg])

#define nv_load_ptv(dev, state, reg) \

	nv_write_ptv(dev, NV_PTV_OFFSET + 0x##reg, state->ptv_##reg)

#define nv_save_ptv(dev, state, reg) \

	state->ptv_##reg = nv_read_ptv(dev, NV_PTV_OFFSET + 0x##reg)

#define nv_load_tv_enc(dev, state, reg) \

	nv_write_tv_enc(dev, 0x##reg, state->tv_enc[0x##reg])



#endif

drivers/gpu/drm/nouveau/nv17_tv_modes.c

+29 −19
Original line number Diff line number Diff line
@@ -336,12 +336,17 @@ static void tv_setup_filter(struct drm_encoder *encoder) 
			struct filter_params *p = &fparams[k][j];



			for (i = 0; i < 7; i++) {

				int64_t c = (p->k1 + p->ki*i + p->ki2*i*i + p->ki3*i*i*i)

					+ (p->kr + p->kir*i + p->ki2r*i*i + p->ki3r*i*i*i)*rs[k]

					+ (p->kf + p->kif*i + p->ki2f*i*i + p->ki3f*i*i*i)*flicker

					+ (p->krf + p->kirf*i + p->ki2rf*i*i + p->ki3rf*i*i*i)*flicker*rs[k];



				(*filters[k])[j][i] = (c + id5/2) >> 39 & (0x1 << 31 | 0x7f << 9);

				int64_t c = (p->k1 + p->ki*i + p->ki2*i*i +

					     p->ki3*i*i*i)

					+ (p->kr + p->kir*i + p->ki2r*i*i +

					   p->ki3r*i*i*i) * rs[k]

					+ (p->kf + p->kif*i + p->ki2f*i*i +

					   p->ki3f*i*i*i) * flicker

					+ (p->krf + p->kirf*i + p->ki2rf*i*i +

					   p->ki3rf*i*i*i) * flicker * rs[k];



				(*filters[k])[j][i] = (c + id5/2) >> 39

					& (0x1 << 31 | 0x7f << 9);

			}

		}

	}
@@ -349,7 +354,8 @@ static void tv_setup_filter(struct drm_encoder *encoder) 


/* Hardware state saving/restoring */



static void tv_save_filter(struct drm_device *dev, uint32_t base, uint32_t regs[4][7])

static void tv_save_filter(struct drm_device *dev, uint32_t base,

			   uint32_t regs[4][7])

{

	int i, j;

	uint32_t offsets[] = { base, base + 0x1c, base + 0x40, base + 0x5c };
@@ -360,7 +366,8 @@ static void tv_save_filter(struct drm_device *dev, uint32_t base, uint32_t regs[ 
	}

}



static void tv_load_filter(struct drm_device *dev, uint32_t base, uint32_t regs[4][7])

static void tv_load_filter(struct drm_device *dev, uint32_t base,

			   uint32_t regs[4][7])

{

	int i, j;

	uint32_t offsets[] = { base, base + 0x1c, base + 0x40, base + 0x5c };
@@ -504,10 +511,10 @@ void nv17_tv_update_properties(struct drm_encoder *encoder) 
		break;

	}



	regs->tv_enc[0x20] = interpolate(0, tv_norm->tv_enc_mode.tv_enc[0x20], 255,

					 tv_enc->saturation);

	regs->tv_enc[0x22] = interpolate(0, tv_norm->tv_enc_mode.tv_enc[0x22], 255,

					 tv_enc->saturation);

	regs->tv_enc[0x20] = interpolate(0, tv_norm->tv_enc_mode.tv_enc[0x20],

					 255, tv_enc->saturation);

	regs->tv_enc[0x22] = interpolate(0, tv_norm->tv_enc_mode.tv_enc[0x22],

					 255, tv_enc->saturation);

	regs->tv_enc[0x25] = tv_enc->hue * 255 / 100;



	nv_load_ptv(dev, regs, 204);
@@ -541,7 +548,8 @@ void nv17_ctv_update_rescaler(struct drm_encoder *encoder) 
	int head = nouveau_crtc(encoder->crtc)->index;

	struct nv04_crtc_reg *regs = &dev_priv->mode_reg.crtc_reg[head];

	struct drm_display_mode *crtc_mode = &encoder->crtc->mode;

	struct drm_display_mode *output_mode = &get_tv_norm(encoder)->ctv_enc_mode.mode;

	struct drm_display_mode *output_mode =

		&get_tv_norm(encoder)->ctv_enc_mode.mode;

	int overscan, hmargin, vmargin, hratio, vratio;



	/* The rescaler doesn't do the right thing for interlaced modes. */
@@ -553,13 +561,15 @@ void nv17_ctv_update_rescaler(struct drm_encoder *encoder) 
	hmargin = (output_mode->hdisplay - crtc_mode->hdisplay) / 2;

	vmargin = (output_mode->vdisplay - crtc_mode->vdisplay) / 2;



	hmargin = interpolate(0, min(hmargin, output_mode->hdisplay/20), hmargin,

			      overscan);

	vmargin = interpolate(0, min(vmargin, output_mode->vdisplay/20), vmargin,

			      overscan);

	hmargin = interpolate(0, min(hmargin, output_mode->hdisplay/20),

			      hmargin, overscan);

	vmargin = interpolate(0, min(vmargin, output_mode->vdisplay/20),

			      vmargin, overscan);



	hratio = crtc_mode->hdisplay * 0x800 / (output_mode->hdisplay - 2*hmargin);

	vratio = crtc_mode->vdisplay * 0x800 / (output_mode->vdisplay - 2*vmargin) & ~3;

	hratio = crtc_mode->hdisplay * 0x800 /

		(output_mode->hdisplay - 2*hmargin);

	vratio = crtc_mode->vdisplay * 0x800 /

		(output_mode->vdisplay - 2*vmargin) & ~3;



	regs->fp_horiz_regs[FP_VALID_START] = hmargin;

	regs->fp_horiz_regs[FP_VALID_END] = output_mode->hdisplay - hmargin - 1;