Commit d5757dbe79870d825d0dec30074d48683e1d7e9a
1 parent
500df2e5d8
Exists in
master
and in
20 other branches
Revert "drm: tegra: protect DC register access with mutex"
This reverts commit 83c0bcb694be31dcd6c04bdd935b96a95a0af548. Lucas pointed out this was a mistake, and I missed the discussion, so just revert it out to save a rebase. Signed-off-by: Dave Airlie <airlied@redhat.com>
Showing 2 changed files with 0 additions and 14 deletions Side-by-side Diff
drivers/gpu/drm/tegra/dc.c
| ... | ... | @@ -171,8 +171,6 @@ |
| 171 | 171 | return err; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - mutex_lock(&dc->regs_mutex); | |
| 175 | - | |
| 176 | 174 | /* program display mode */ |
| 177 | 175 | tegra_dc_set_timings(dc, mode); |
| 178 | 176 | |
| ... | ... | @@ -270,8 +268,6 @@ |
| 270 | 268 | tegra_dc_writel(dc, 0xff00, DC_WIN_BLEND_NOKEY); |
| 271 | 269 | tegra_dc_writel(dc, 0xff00, DC_WIN_BLEND_1WIN); |
| 272 | 270 | |
| 273 | - mutex_unlock(&dc->regs_mutex); | |
| 274 | - | |
| 275 | 271 | return 0; |
| 276 | 272 | } |
| 277 | 273 | |
| ... | ... | @@ -290,8 +286,6 @@ |
| 290 | 286 | else |
| 291 | 287 | syncpt = SYNCPT_VBLANK0; |
| 292 | 288 | |
| 293 | - mutex_lock(&dc->regs_mutex); | |
| 294 | - | |
| 295 | 289 | /* initialize display controller */ |
| 296 | 290 | tegra_dc_writel(dc, 0x00000100, DC_CMD_GENERAL_INCR_SYNCPT_CNTRL); |
| 297 | 291 | tegra_dc_writel(dc, 0x100 | syncpt, DC_CMD_CONT_SYNCPT_VSYNC); |
| ... | ... | @@ -325,8 +319,6 @@ |
| 325 | 319 | |
| 326 | 320 | value = VBLANK_INT | WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT; |
| 327 | 321 | tegra_dc_writel(dc, value, DC_CMD_INT_ENABLE); |
| 328 | - | |
| 329 | - mutex_unlock(&dc->regs_mutex); | |
| 330 | 322 | } |
| 331 | 323 | |
| 332 | 324 | static void tegra_crtc_commit(struct drm_crtc *crtc) |
| ... | ... | @@ -337,8 +329,6 @@ |
| 337 | 329 | |
| 338 | 330 | update_mask = GENERAL_ACT_REQ | WIN_A_ACT_REQ; |
| 339 | 331 | |
| 340 | - mutex_lock(&dc->regs_mutex); | |
| 341 | - | |
| 342 | 332 | tegra_dc_writel(dc, update_mask << 8, DC_CMD_STATE_CONTROL); |
| 343 | 333 | |
| 344 | 334 | value = tegra_dc_readl(dc, DC_CMD_INT_ENABLE); |
| ... | ... | @@ -350,8 +340,6 @@ |
| 350 | 340 | tegra_dc_writel(dc, value, DC_CMD_INT_MASK); |
| 351 | 341 | |
| 352 | 342 | tegra_dc_writel(dc, update_mask, DC_CMD_STATE_CONTROL); |
| 353 | - | |
| 354 | - mutex_unlock(&dc->regs_mutex); | |
| 355 | 343 | } |
| 356 | 344 | |
| 357 | 345 | static void tegra_crtc_load_lut(struct drm_crtc *crtc) |
| ... | ... | @@ -758,7 +746,6 @@ |
| 758 | 746 | return -ENOMEM; |
| 759 | 747 | |
| 760 | 748 | INIT_LIST_HEAD(&dc->list); |
| 761 | - mutex_init(&dc->regs_mutex); | |
| 762 | 749 | dc->dev = &pdev->dev; |
| 763 | 750 | |
| 764 | 751 | dc->clk = devm_clk_get(&pdev->dev, NULL); |