diff options
| author | Andy Hu <andy.hu@starfivetech.com> | 2023-08-23 15:51:20 +0300 |
|---|---|---|
| committer | Andy Hu <andy.hu@starfivetech.com> | 2023-08-23 15:51:20 +0300 |
| commit | 3fe2294f6f442ce41023d8f37544fbb6162f9f0c (patch) | |
| tree | 658d20b24a2d7d9a819250b09aea64715b4d6000 /drivers | |
| parent | 82ef90739fed72001e97c03d983f12589211faf7 (diff) | |
| parent | 65188bcf15b8cc638782a577f565f5e10edaf680 (diff) | |
| download | linux-3fe2294f6f442ce41023d8f37544fbb6162f9f0c.tar.xz | |
Merge tag 'JH7110_6.1_SDK_v5.6.1' into vf2-6.1.y-devel
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/verisilicon/vs_dc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/verisilicon/vs_dc.c b/drivers/gpu/drm/verisilicon/vs_dc.c index 148c13387131..e91a2821f830 100644 --- a/drivers/gpu/drm/verisilicon/vs_dc.c +++ b/drivers/gpu/drm/verisilicon/vs_dc.c @@ -459,7 +459,7 @@ static void vs_vout_reset_get(struct device *dev, struct vs_dc *dc) dc->rst_vout_src = reset_control_get_shared(dev, "rst_vout_src"); if (IS_ERR(dc->rst_vout_src)) dev_err(dev, "failed to get rst_vout_src\n"); - dc->noc_disp = reset_control_get_shared(dev, "rst_noc_disp"); + dc->noc_disp = reset_control_get_exclusive(dev, "rst_noc_disp"); if (IS_ERR(dc->noc_disp)) dev_err(dev, "failed to get rst_noc_disp\n"); } @@ -467,7 +467,7 @@ static void vs_vout_reset_get(struct device *dev, struct vs_dc *dc) static void vs_vout_reset_deassert(struct vs_dc *dc) { reset_control_deassert(dc->rst_vout_src);//no! - reset_control_deassert(dc->noc_disp);//ok + //reset_control_deassert(dc->noc_disp);//ok } /* @@ -536,6 +536,7 @@ static int dc_vout_clk_enable(struct device *dev, struct vs_dc *dc) dev_err(dev, "failed to enable clock\n"); return ret; } + reset_control_deassert(dc->noc_disp); ret = vs_dc_vouttop_clock_enable(dev, dc); if (ret) { |