drm/amd/display: num of sw i2c/aux engines less than num of connectors

[why]
AMD Stoney reference board, there are only 2 pipes (not include
underlay), and 3 connectors. resource creation, only
2 I2C/AUX engines are created. Within dc_link_aux_transfer, when
pin_data_en =2, refer to enengines[ddc_pin->pin_data->en] = NULL.
NULL point is referred later causing system crash.

[how]
each asic design has fixed number of ddc engines at hw side.
for each ddc engine, create its i2x/aux engine at sw side.

Signed-off-by: Hersen Wu <[email protected]>
Reviewed-by: Tony Cheng <[email protected]>
Acked-by: Bhawanpreet Lakha <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index ae613b025756da5cbd5b7f2151a0b969eaf2e849..b1cc38827f090ca6f343ecae1fb35c588f5831a0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -372,7 +372,8 @@ static const struct resource_caps res_cap = {
        .num_timing_generator = 6,
        .num_audio = 6,
        .num_stream_encoder = 6,
-       .num_pll = 3
+       .num_pll = 3,
+       .num_ddc = 6,
 };
 
 #define CTX  ctx
@@ -1004,6 +1005,9 @@ static bool construct(
                                "DC: failed to create output pixel processor!\n");
                        goto res_create_fail;
                }
+       }
+
+       for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
                pool->base.engines[i] = dce100_aux_engine_create(ctx, i);
                if (pool->base.engines[i] == NULL) {
                        BREAK_TO_DEBUGGER();

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index 49c5c7037be26e89d33d083c6b81e30952c7c285..9f44f1cad2212b2778e7bc57a1d4665eed738fcf 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -378,6 +378,7 @@ static const struct resource_caps carrizo_resource_cap = {
                .num_audio = 3,
                .num_stream_encoder = 3,
                .num_pll = 2,
+               .num_ddc = 3,
 };
 
 static const struct resource_caps stoney_resource_cap = {
@@ -386,6 +387,7 @@ static const struct resource_caps stoney_resource_cap = {
                .num_audio = 3,
                .num_stream_encoder = 3,
                .num_pll = 2,
+               .num_ddc = 3,
 };
 
 #define CTX  ctx
@@ -1336,7 +1338,9 @@ static bool construct(
                                "DC: failed to create output pixel processor!\n");
                        goto res_create_fail;
                }
+       }
 
+       for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
                pool->base.engines[i] = dce110_aux_engine_create(ctx, i);
                if (pool->base.engines[i] == NULL) {
                        BREAK_TO_DEBUGGER();

diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index d35dc730e01c295dd6d2a48328e3afce7e306392..2aa922cdcc58005392128093d09ef89da3d397a2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -384,6 +384,7 @@ static const struct resource_caps polaris_10_resource_cap = {
                .num_audio = 6,
                .num_stream_encoder = 6,
                .num_pll = 8, /* why 8? 6 combo PHY PLL + 2 regular PLLs? */
+               .num_ddc = 6,
 };
 
 static const struct resource_caps polaris_11_resource_cap = {
@@ -391,6 +392,7 @@ static const struct resource_caps polaris_11_resource_cap = {
                .num_audio = 5,
                .num_stream_encoder = 5,
                .num_pll = 8, /* why 8? 6 combo PHY PLL + 2 regular PLLs? */
+               .num_ddc = 5,
 };
 
 #define CTX  ctx
@@ -1286,6 +1288,9 @@ static bool construct(
                                "DC:failed to create output pixel processor!\n");
                        goto res_create_fail;
                }
+       }
+
+       for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
                pool->base.engines[i] = dce112_aux_engine_create(ctx, i);
                if (pool->base.engines[i] == NULL) {
                        BREAK_TO_DEBUGGER();

diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index b2fb06f3764837bb70e7ee6e3ace18460e41198e..465f68655db27228b218f63af500a3600c5e6f51 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -436,6 +436,7 @@ static const struct resource_caps res_cap = {
                .num_audio = 7,
                .num_stream_encoder = 6,
                .num_pll = 6,
+               .num_ddc = 6,
 };
 
 static const struct dc_debug_options debug_defaults = {
@@ -1062,6 +1063,12 @@ static bool construct(
                        dm_error(
                                "DC: failed to create output pixel processor!\n");
                }
+
+               /* check next valid pipe */
+               j++;
+       }
+
+       for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
                pool->base.engines[i] = dce120_aux_engine_create(ctx, i);
                if (pool->base.engines[i] == NULL) {
                        BREAK_TO_DEBUGGER();
@@ -1077,8 +1084,6 @@ static bool construct(
                        goto res_create_fail;
                }
                pool->base.sw_i2cs[i] = NULL;
-               /* check next valid pipe */
-               j++;
        }
 
        /* valid pipe num */

diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
index 4eae859e638321e34a5059999035b1126155e61c..1dc590ccc5f984589217a386a639d36df10582e9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
@@ -367,6 +367,7 @@ static const struct resource_caps res_cap = {
                .num_audio = 6,
                .num_stream_encoder = 6,
                .num_pll = 3,
+               .num_ddc = 6,
 };
 
 static const struct resource_caps res_cap_81 = {
@@ -374,6 +375,7 @@ static const struct resource_caps res_cap_81 = {
                .num_audio = 7,
                .num_stream_encoder = 7,
                .num_pll = 3,
+               .num_ddc = 6,
 };
 
 static const struct resource_caps res_cap_83 = {
@@ -381,6 +383,7 @@ static const struct resource_caps res_cap_83 = {
                .num_audio = 6,
                .num_stream_encoder = 6,
                .num_pll = 2,
+               .num_ddc = 2,
 };
 
 static const struct dce_dmcu_registers dmcu_regs = {
@@ -992,7 +995,9 @@ static bool dce80_construct(
                        dm_error("DC: failed to create output pixel processor!\n");
                        goto res_create_fail;
                }
+       }
 
+       for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
                pool->base.engines[i] = dce80_aux_engine_create(ctx, i);
                if (pool->base.engines[i] == NULL) {
                        BREAK_TO_DEBUGGER();
@@ -1200,6 +1205,16 @@ static bool dce81_construct(
                        dm_error("DC: failed to create output pixel processor!\n");
                        goto res_create_fail;
                }
+       }
+
+       for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
+               pool->base.engines[i] = dce80_aux_engine_create(ctx, i);
+               if (pool->base.engines[i] == NULL) {
+                       BREAK_TO_DEBUGGER();
+                       dm_error(
+                               "DC:failed to create aux engine!!\n");
+                       goto res_create_fail;
+               }
                pool->base.hw_i2cs[i] = dce80_i2c_hw_create(ctx, i);
                if (pool->base.hw_i2cs[i] == NULL) {
                        BREAK_TO_DEBUGGER();
@@ -1396,6 +1411,16 @@ static bool dce83_construct(
                        dm_error("DC: failed to create output pixel processor!\n");
                        goto res_create_fail;
                }
+       }
+
+       for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
+               pool->base.engines[i] = dce80_aux_engine_create(ctx, i);
+               if (pool->base.engines[i] == NULL) {
+                       BREAK_TO_DEBUGGER();
+                       dm_error(
+                               "DC:failed to create aux engine!!\n");
+                       goto res_create_fail;
+               }
                pool->base.hw_i2cs[i] = dce80_i2c_hw_create(ctx, i);
                if (pool->base.hw_i2cs[i] == NULL) {
                        BREAK_TO_DEBUGGER();

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 28ebad8c3ec468e6f16676ad4fc32fb4d5b4e556..1b519f8f044fb46e7325913eef82ce64ff603d38 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -501,6 +501,7 @@ static const struct resource_caps res_cap = {
                .num_audio = 4,
                .num_stream_encoder = 4,
                .num_pll = 4,
+               .num_ddc = 4,
 };
 
 static const struct dc_debug_options debug_defaults_drv = {
@@ -1334,7 +1335,11 @@ static bool construct(
                        dm_error("DC: failed to create tg!\n");
                        goto fail;
                }
+               /* check next valid pipe */
+               j++;
+       }
 
+       for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
                pool->base.engines[i] = dcn10_aux_engine_create(ctx, i);
                if (pool->base.engines[i] == NULL) {
                        BREAK_TO_DEBUGGER();
@@ -1350,8 +1355,6 @@ static bool construct(
                        goto fail;
                }
                pool->base.sw_i2cs[i] = NULL;
-               /* check next valid pipe */
-               j++;
        }
 
        /* valid pipe num */

diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h
index 5b321008b0b54c0a7dce51854979fc89e09ba9b1..76d00c6dbca955323525f8982e9ebf7d50d8ba50 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
@@ -44,6 +44,7 @@ struct resource_caps {
        int num_stream_encoder;
        int num_pll;
        int num_dwb;
+       int num_ddc;
 };
 
 struct resource_straps {