drm/msm/hdmi: use dynamic allocation for hdmi resources

Instead of reporting BUG_ON when resources arrays are not
dimensioned correctly, this patch does a dynamic allocation of
these arrays. This is needed for the following patches that add a
regulator for a new target.

Signed-off-by: Stephane Viau <sviau@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

2 files changed, 28 insertions, 8 deletions

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 95f7b8d0f3ef..99b83a6a6adc 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -106,7 +106,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev)
                 goto fail;
         }
 
-        BUG_ON(config->hpd_reg_cnt > ARRAY_SIZE(hdmi->hpd_regs));
+        hdmi->hpd_regs = devm_kzalloc(&pdev->dev, sizeof(hdmi->hpd_regs[0]) *
+                        config->hpd_reg_cnt, GFP_KERNEL);
+        if (!hdmi->hpd_regs) {
+                ret = -ENOMEM;
+                goto fail;
+        }
         for (i = 0; i < config->hpd_reg_cnt; i++) {
                 struct regulator *reg;
 
@@ -122,7 +127,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev)
                 hdmi->hpd_regs[i] = reg;
         }
 
-        BUG_ON(config->pwr_reg_cnt > ARRAY_SIZE(hdmi->pwr_regs));
+        hdmi->pwr_regs = devm_kzalloc(&pdev->dev, sizeof(hdmi->pwr_regs[0]) *
+                        config->pwr_reg_cnt, GFP_KERNEL);
+        if (!hdmi->pwr_regs) {
+                ret = -ENOMEM;
+                goto fail;
+        }
         for (i = 0; i < config->pwr_reg_cnt; i++) {
                 struct regulator *reg;
 
@@ -138,7 +148,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev)
                 hdmi->pwr_regs[i] = reg;
         }
 
-        BUG_ON(config->hpd_clk_cnt > ARRAY_SIZE(hdmi->hpd_clks));
+        hdmi->hpd_clks = devm_kzalloc(&pdev->dev, sizeof(hdmi->hpd_clks[0]) *
+                        config->hpd_clk_cnt, GFP_KERNEL);
+        if (!hdmi->hpd_clks) {
+                ret = -ENOMEM;
+                goto fail;
+        }
         for (i = 0; i < config->hpd_clk_cnt; i++) {
                 struct clk *clk;
 
@@ -153,7 +168,12 @@ static struct hdmi *hdmi_init(struct platform_device *pdev)
                 hdmi->hpd_clks[i] = clk;
         }
 
-        BUG_ON(config->pwr_clk_cnt > ARRAY_SIZE(hdmi->pwr_clks));
+        hdmi->pwr_clks = devm_kzalloc(&pdev->dev, sizeof(hdmi->pwr_clks[0]) *
+                        config->pwr_clk_cnt, GFP_KERNEL);
+        if (!hdmi->pwr_clks) {
+                ret = -ENOMEM;
+                goto fail;
+        }
         for (i = 0; i < config->pwr_clk_cnt; i++) {
                 struct clk *clk;
 
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
index 4d4cad42a776..68fdfb3622a5 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -52,10 +52,10 @@ struct hdmi {
 
         void __iomem *mmio;
 
-        struct regulator *hpd_regs[2];
-        struct regulator *pwr_regs[2];
-        struct clk *hpd_clks[3];
-        struct clk *pwr_clks[2];
+        struct regulator **hpd_regs;
+        struct regulator **pwr_regs;
+        struct clk **hpd_clks;
+        struct clk **pwr_clks;
 
         struct hdmi_phy *phy;
         struct i2c_adapter *i2c;