OSDN Git Service

drm/amd/display: Use res_cap to acquire i2c instead of pipe count
authorDerek Lai <Derek.Lai@amd.com>
Fri, 23 Aug 2019 16:44:53 +0000 (11:44 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 23 Aug 2019 16:45:34 +0000 (11:45 -0500)
[Why]
We should be using the ddc_num from res_caps. As the
pipe count != number of i2c resources.

[How]
Use ddc_num from res_cap instead of pipe count.

Signed-off-by: Derek Lai <Derek.Lai@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c

index 420b18f..aad7b52 100644 (file)
@@ -25,6 +25,7 @@
 
 #include <linux/delay.h>
 
+#include "resource.h"
 #include "dce_i2c.h"
 #include "dce_i2c_hw.h"
 #include "reg_helper.h"
@@ -390,7 +391,7 @@ struct dce_i2c_hw *acquire_i2c_hw_engine(
        if (ddc->hw_info.hw_supported) {
                enum gpio_ddc_line line = dal_ddc_get_line(ddc);
 
-               if (line < pool->pipe_count)
+               if (line < pool->res_cap->num_ddc)
                        dce_i2c_hw = pool->hw_i2cs[line];
        }