Commit ea4f3111 authored by Steffen Trumtrar's avatar Steffen Trumtrar
Browse files

viafb: rename display_timing to via_display_timing 



The struct display_timing is specific to the via subsystem. The naming leads to
collisions with the new struct display_timing, which is supposed to be a shared
struct between different subsystems.
To clean this up, prepend the existing struct with the subsystem it is specific
to.

Signed-off-by: default avatarSteffen Trumtrar <s.trumtrar@pengutronix.de>
parent 7d1f9aef

drivers/video/via/hw.c

+3 −3
Original line number Diff line number Diff line
@@ -1467,10 +1467,10 @@ void viafb_set_vclock(u32 clk, int set_iga) 
	via_write_misc_reg_mask(0x0C, 0x0C); /* select external clock */

}



struct display_timing var_to_timing(const struct fb_var_screeninfo *var,

struct via_display_timing var_to_timing(const struct fb_var_screeninfo *var,

	u16 cxres, u16 cyres)

{

	struct display_timing timing;

	struct via_display_timing timing;

	u16 dx = (var->xres - cxres) / 2, dy = (var->yres - cyres) / 2;



	timing.hor_addr = cxres;
@@ -1491,7 +1491,7 @@ struct display_timing var_to_timing(const struct fb_var_screeninfo *var, 
void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var,

	u16 cxres, u16 cyres, int iga)

{

	struct display_timing crt_reg = var_to_timing(var,

	struct via_display_timing crt_reg = var_to_timing(var,

		cxres ? cxres : var->xres, cyres ? cyres : var->yres);



	if (iga == IGA1)

drivers/video/via/hw.h

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ extern int viafb_LCD_ON; 
extern int viafb_DVI_ON;

extern int viafb_hotplug;



struct display_timing var_to_timing(const struct fb_var_screeninfo *var,

struct via_display_timing var_to_timing(const struct fb_var_screeninfo *var,

	u16 cxres, u16 cyres);

void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var,

	u16 cxres, u16 cyres, int iga);

drivers/video/via/lcd.c

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ void viafb_lcd_set_mode(const struct fb_var_screeninfo *var, u16 cxres, 
	int panel_hres = plvds_setting_info->lcd_panel_hres;

	int panel_vres = plvds_setting_info->lcd_panel_vres;

	u32 clock;

	struct display_timing timing;

	struct via_display_timing timing;

	struct fb_var_screeninfo panel_var;

	const struct fb_videomode *mode_crt_table, *panel_crt_table;

drivers/video/via/share.h

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ struct crt_mode_table { 
	int refresh_rate;

	int h_sync_polarity;

	int v_sync_polarity;

	struct display_timing crtc;

	struct via_display_timing crtc;

};



struct io_reg {

drivers/video/via/via_modesetting.c

+4 −4
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
#include "debug.h"





void via_set_primary_timing(const struct display_timing *timing)

void via_set_primary_timing(const struct via_display_timing *timing)

{

	struct display_timing raw;

	struct via_display_timing raw;



	raw.hor_total = timing->hor_total / 8 - 5;

	raw.hor_addr = timing->hor_addr / 8 - 1;
@@ -88,9 +88,9 @@ void via_set_primary_timing(const struct display_timing *timing) 
	via_write_reg_mask(VIACR, 0x17, 0x80, 0x80);

}



void via_set_secondary_timing(const struct display_timing *timing)

void via_set_secondary_timing(const struct via_display_timing *timing)

{

	struct display_timing raw;

	struct via_display_timing raw;



	raw.hor_total = timing->hor_total - 1;

	raw.hor_addr = timing->hor_addr - 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE