drm/amd/display: rename BGRA8888 to ABGR8888

DC actually support ABGR8888 instead of BGRA8888 (R/B swap rather than endian swap) ,
rename to avoid confusion

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Yongqiang Sun <yongqiang.sun@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/bandwidth_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/bandwidth_calcs.c
index 54388c0e29e077564a0e945b90374e305a357bbd..946379852b2a0cb742389e4a5350613b990d8dee 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/calcs/bandwidth_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/bandwidth_calcs.c
@@ -2530,7 +2530,7 @@ static void populate_initial_data(
                        data->bytes_per_pixel[num_displays + 4] = 2;
                        break;
                case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:
-               case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:
+               case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:
                case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:
                case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010:
                case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS:
@@ -2626,7 +2626,7 @@ static void populate_initial_data(
                                data->bytes_per_pixel[num_displays + 4] = 2;
                                break;
                        case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:
-                       case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:
+                       case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:
                        case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:
                        case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010:
                        case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS:

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 8b41c7708562b2239be7aa98cf4e3f15b00c5f51..ee1c3b0293942e2d3eecf60e323d4d981e24b60c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -341,7 +341,7 @@ static enum pixel_format convert_pixel_format_to_dalsurface(
        case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:
                dal_pixel_format = PIXEL_FORMAT_ARGB8888;
                break;
-       case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:
+       case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:
                dal_pixel_format = PIXEL_FORMAT_ARGB8888;
                break;
        case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:

diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
index 5c1b2f833fe2cf7611a76e1b2314440aa2f3d001..53c73de75da9fc2117b13857d42f15191f09c95a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -174,7 +174,7 @@ enum surface_pixel_format {
        /*32 bpp*/
        SURFACE_PIXEL_FORMAT_GRPH_ARGB8888,
        /*32 bpp swaped*/
-       SURFACE_PIXEL_FORMAT_GRPH_BGRA8888,
+       SURFACE_PIXEL_FORMAT_GRPH_ABGR8888,
 
        SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010,
        /*swaped*/

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
index 130935fffba390a0dc617b0ab78b91a2c7fc4b94..e14a21cedfd5e149ce0320002531be5e83b1eb5b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
@@ -302,7 +302,7 @@ static void program_grph_pixel_format(
        uint32_t grph_depth, grph_format;
        uint32_t sign = 0, floating = 0;
 
-       if (format == SURFACE_PIXEL_FORMAT_GRPH_BGRA8888 ||
+       if (format == SURFACE_PIXEL_FORMAT_GRPH_ABGR8888 ||
                        /*todo: doesn't look like we handle BGRA here,
                         *  should problem swap endian*/
                format == SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010 ||
@@ -331,7 +331,7 @@ static void program_grph_pixel_format(
                grph_format = 1;
                break;
        case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:
-       case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:
+       case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:
                grph_depth = 2;
                grph_format = 0;
                break;

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index e9fd83e9af79dfe04bac4e965cb164ec2953e0ea..6dbfc570b8c6cb1148adc13be81ba17fe75bf1db 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -214,7 +214,7 @@ static void build_prescale_params(struct ipp_prescale_params *prescale_params,
 
        switch (surface->public.format) {
        case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:
-       case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:
+       case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:
                prescale_params->scale = 0x2020;
                break;
        case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c
index b12506adcba4e27be7d05228f0e15061561e072d..aac47955e9bf95484f62e3850bfa9a8923dd3b96 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c
@@ -405,7 +405,7 @@ static void program_pixel_format(
                        grph_format = 1;
                        break;
                case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888:
-               case SURFACE_PIXEL_FORMAT_GRPH_BGRA8888:
+               case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888:
                        grph_depth = 2;
                        grph_format = 0;
                        break;