Gitlab 现已全面支持 git over ssh 与 git over https。通过 HTTPS 访问请配置带有 read_repository / write_repository 权限的 Personal access token。通过 SSH 端口访问请使用 22 端口或 13389 端口。如果使用CAS注册了账户但不知道密码，可以自行至设置中更改；如有其他问题，请发邮件至 service@cra.moe 寻求协助。

Commit 51f2af1d authored Dec 16, 2019 by Charlene Liu Committed by Alex Deucher Jan 16, 2020

drm/amd/display: rename _lvp to l_vp



Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent ee765924

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -937,7 +937,7 @@ static unsigned int CalculateVMAndRowBytes(
		*MetaRowByte = 0;
		}

		if (SurfaceTiling == dm_sw_linear \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_gl \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_lvp) {
		if (SurfaceTiling == dm_sw_linear \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_gl \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_l_vp) {
		MacroTileSizeBytes = 256;
		MacroTileHeight = BlockHeight256Bytes;
		} else if (SurfaceTiling == dm_sw_4kb_s \|\| SurfaceTiling == dm_sw_4kb_s_x
		@@ -3348,7 +3348,7 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
		== dm_420_10))
		\|\| (((mode_lib->vba.SurfaceTiling[k] == dm_sw_gfx7_2d_thin_gl
		\|\| mode_lib->vba.SurfaceTiling[k]
		== dm_sw_gfx7_2d_thin_lvp)
		== dm_sw_gfx7_2d_thin_l_vp)
		&& !((mode_lib->vba.SourcePixelFormat[k]
		== dm_444_64
		\|\| mode_lib->vba.SourcePixelFormat[k]

drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -997,7 +997,7 @@ static unsigned int CalculateVMAndRowBytes(
		*MetaRowByte = 0;
		}

		if (SurfaceTiling == dm_sw_linear \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_gl \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_lvp) {
		if (SurfaceTiling == dm_sw_linear \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_gl \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_l_vp) {
		MacroTileSizeBytes = 256;
		MacroTileHeight = BlockHeight256Bytes;
		} else if (SurfaceTiling == dm_sw_4kb_s \|\| SurfaceTiling == dm_sw_4kb_s_x
		@@ -3385,7 +3385,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode
		== dm_420_10))
		\|\| (((mode_lib->vba.SurfaceTiling[k] == dm_sw_gfx7_2d_thin_gl
		\|\| mode_lib->vba.SurfaceTiling[k]
		== dm_sw_gfx7_2d_thin_lvp)
		== dm_sw_gfx7_2d_thin_l_vp)
		&& !((mode_lib->vba.SourcePixelFormat[k]
		== dm_444_64
		\|\| mode_lib->vba.SourcePixelFormat[k]

drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1338,7 +1338,7 @@ static unsigned int CalculateVMAndRowBytes(
		*MetaRowByte = 0;
		}

		if (SurfaceTiling == dm_sw_linear \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_gl \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_lvp) {
		if (SurfaceTiling == dm_sw_linear \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_gl \|\| SurfaceTiling == dm_sw_gfx7_2d_thin_l_vp) {
		MacroTileSizeBytes = 256;
		MacroTileHeight = BlockHeight256Bytes;
		} else if (SurfaceTiling == dm_sw_4kb_s \|\| SurfaceTiling == dm_sw_4kb_s_x
		@@ -3453,7 +3453,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
		== dm_420_10))
		\|\| (((mode_lib->vba.SurfaceTiling[k] == dm_sw_gfx7_2d_thin_gl
		\|\| mode_lib->vba.SurfaceTiling[k]
		== dm_sw_gfx7_2d_thin_lvp)
		== dm_sw_gfx7_2d_thin_l_vp)
		&& !((mode_lib->vba.SourcePixelFormat[k]
		== dm_444_64
		\|\| mode_lib->vba.SourcePixelFormat[k]

drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ enum dm_swizzle_mode {
		dm_sw_var_s_x = 29,
		dm_sw_var_d_x = 30,
		dm_sw_64kb_r_x,
		dm_sw_gfx7_2d_thin_lvp,
		dm_sw_gfx7_2d_thin_l_vp,
		dm_sw_gfx7_2d_thin_gl,
		};
		enum lb_depth {

CRA Git | Maintained and supported by SUSTech CRA and CCSE