Merge branch 'at91-4.19-trunk/drm' into linux-4.19-at91

cristibirsan · cristibirsan · commit 7e500d7d019f · 2019-05-17T17:11:25.000+03:00
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -382,7 +382,7 @@ atmel_hlcdc_plane_update_general_settings(struct atmel_hlcdc_plane *plane,
 			cfg |= ATMEL_HLCDC_LAYER_LAEN;
 		else
 			cfg |= ATMEL_HLCDC_LAYER_GAEN |
-			       ATMEL_HLCDC_LAYER_GA(state->base.alpha >> 8);
+			       ATMEL_HLCDC_LAYER_GA(state->base.alpha);
 	}
 
 	if (state->disc_h && state->disc_w)

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ atmel_hlcdc_plane_update_general_settings(struct atmel_hlcdc_plane *plane,`
`382`	`382`	`cfg \|= ATMEL_HLCDC_LAYER_LAEN;`
`383`	`383`	`else`
`384`	`384`	`cfg \|= ATMEL_HLCDC_LAYER_GAEN \|`
`385`		`- ATMEL_HLCDC_LAYER_GA(state->base.alpha >> 8);`
	`385`	`+ ATMEL_HLCDC_LAYER_GA(state->base.alpha);`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`if (state->disc_h && state->disc_w)`