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

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

drm/i2c/ch7006: Constify ch7006_tv_norms[] and ch7006_modes[] 



 drivers/gpu/drm/i2c/ch7006.ko:
-.text                        5913
+.text                        5897
-.rodata                       664
+.rodata                      7256
-.data                        6992
+.data                         416

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b7c914b3

drivers/gpu/drm/i2c/ch7006_mode.c

+11 −11
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ const char * const ch7006_tv_norm_names[] = { 
		.vtotal = 625,					\

		.hvirtual = 810



struct ch7006_tv_norm_info ch7006_tv_norms[] = {

const struct ch7006_tv_norm_info ch7006_tv_norms[] = {

	[TV_NORM_NTSC_M] = {

		NTSC_LIKE_TIMINGS,

		.black_level = 0.339 * fixed1,
@@ -142,7 +142,7 @@ struct ch7006_tv_norm_info ch7006_tv_norms[] = { 


#define PAL_LIKE (1 << TV_NORM_PAL | 1 << TV_NORM_PAL_N | 1 << TV_NORM_PAL_NC)



struct ch7006_mode ch7006_modes[] = {

const struct ch7006_mode ch7006_modes[] = {

	MODE(21000, 512, 384, 840, 500, N, N, 181.797557582, 5_4, 0x6, PAL_LIKE),

	MODE(26250, 512, 384, 840, 625, N, N, 145.438046066, 1_1, 0x1, PAL_LIKE),

	MODE(20140, 512, 384, 800, 420, N, N, 213.257083791, 5_4, 0x4, NTSC_LIKE),
@@ -171,11 +171,11 @@ struct ch7006_mode ch7006_modes[] = { 
	{}

};



struct ch7006_mode *ch7006_lookup_mode(struct drm_encoder *encoder,

const struct ch7006_mode *ch7006_lookup_mode(struct drm_encoder *encoder,

					     const struct drm_display_mode *drm_mode)

{

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_mode *mode;

	const struct ch7006_mode *mode;



	for (mode = ch7006_modes; mode->mode.clock; mode++) {
@@ -233,8 +233,8 @@ void ch7006_setup_subcarrier(struct drm_encoder *encoder) 
	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_state *state = &priv->state;

	struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];

	struct ch7006_mode *mode = priv->mode;

	const struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];

	const struct ch7006_mode *mode = priv->mode;

	uint32_t subc_inc;



	subc_inc = round_fixed((mode->subc_coeff >> 8)
@@ -257,7 +257,7 @@ void ch7006_setup_pll(struct drm_encoder *encoder) 
	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	uint8_t *regs = priv->state.regs;

	struct ch7006_mode *mode = priv->mode;

	const struct ch7006_mode *mode = priv->mode;

	int n, best_n = 0;

	int m, best_m = 0;

	int freq, best_freq = 0;
@@ -328,9 +328,9 @@ void ch7006_setup_properties(struct drm_encoder *encoder) 
	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_state *state = &priv->state;

	struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];

	struct ch7006_mode *ch_mode = priv->mode;

	struct drm_display_mode *mode = &ch_mode->mode;

	const struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];

	const struct ch7006_mode *ch_mode = priv->mode;

	const struct drm_display_mode *mode = &ch_mode->mode;

	uint8_t *regs = state->regs;

	int flicker, contrast, hpos, vpos;

	uint64_t scale, aspect;

drivers/gpu/drm/i2c/ch7006_priv.h

+5 −5
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct ch7006_state { 


struct ch7006_priv {

	struct ch7006_encoder_params params;

	struct ch7006_mode *mode;

	const struct ch7006_mode *mode;



	struct ch7006_state state;

	struct ch7006_state saved_state;
@@ -107,10 +107,10 @@ extern char *ch7006_tv_norm; 
extern int ch7006_scale;



extern const char * const ch7006_tv_norm_names[];

extern struct ch7006_tv_norm_info ch7006_tv_norms[];

extern struct ch7006_mode ch7006_modes[];

extern const struct ch7006_tv_norm_info ch7006_tv_norms[];

extern const struct ch7006_mode ch7006_modes[];



struct ch7006_mode *ch7006_lookup_mode(struct drm_encoder *encoder,

const struct ch7006_mode *ch7006_lookup_mode(struct drm_encoder *encoder,

					     const struct drm_display_mode *drm_mode);



void ch7006_setup_levels(struct drm_encoder *encoder);