OSDN Git Service

drm/amd/display: Cache the use_pitch_c conditional
authorIlya Bakoulin <Ilya.Bakoulin@amd.com>
Wed, 19 Jun 2019 21:33:02 +0000 (17:33 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 18 Jul 2019 19:27:25 +0000 (14:27 -0500)
For clarity, save the use_pitch_c logic to a bool

Signed-off-by: Ilya Bakoulin <Ilya.Bakoulin@amd.com>
Reviewed-by: Eric Bernstein <eric.bernstein@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c

index 02e8c0c..a167f86 100644 (file)
@@ -402,11 +402,14 @@ void hubp2_program_size(
 {
        struct dcn20_hubp *hubp2 = TO_DCN20_HUBP(hubp);
        uint32_t pitch, meta_pitch, pitch_c, meta_pitch_c;
+       bool use_pitch_c = false;
 
        /* Program data and meta surface pitch (calculation from addrlib)
         * 444 or 420 luma
         */
-       if (format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN && format < SURFACE_PIXEL_FORMAT_SUBSAMPLE_END) {
+       use_pitch_c = format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN
+               && format < SURFACE_PIXEL_FORMAT_SUBSAMPLE_END;
+       if (use_pitch_c) {
                ASSERT(plane_size->video.chroma_pitch != 0);
                /* Chroma pitch zero can cause system hang! */
 
@@ -429,7 +432,8 @@ void hubp2_program_size(
        REG_UPDATE_2(DCSURF_SURFACE_PITCH,
                        PITCH, pitch, META_PITCH, meta_pitch);
 
-       if (format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
+       use_pitch_c = format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN;
+       if (use_pitch_c)
                REG_UPDATE_2(DCSURF_SURFACE_PITCH_C,
                        PITCH_C, pitch_c, META_PITCH_C, meta_pitch_c);
 }