diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-11-07 13:06:54 -0500 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-11-16 14:22:44 -0500 |
| commit | 88ff1c2f3b5d4826bbe3b6ec3cf12a223dc0cb22 (patch) | |
| tree | 9492d96f6202f39f595779fcce04a43b9d32e426 | |
| parent | 8845ef80413a6a63a7d91bf15ccbcc9df3466b0c (diff) | |
drm/msm/mdp4: don't care about fb in crtc
Since we are configuring things via MDP4_PIPE regs in the plane, it seems
like setting the dimensions of the primary plane on the OVLP/DMA regs in
crtc is unnecessary. This will make life easier when we want to do a
nofb modeset.
Signed-off-by: Rob Clark <robdclark@gmail.com>
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c index 5d2913f179b1..d0e6c279cc72 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | |||
| @@ -369,8 +369,7 @@ static int mdp4_crtc_mode_set(struct drm_crtc *crtc, | |||
| 369 | 369 | ||
| 370 | /* take data from pipe: */ | 370 | /* take data from pipe: */ |
| 371 | mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_BASE(dma), 0); | 371 | mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_BASE(dma), 0); |
| 372 | mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_STRIDE(dma), | 372 | mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_STRIDE(dma), 0); |
| 373 | crtc->primary->fb->pitches[0]); | ||
| 374 | mdp4_write(mdp4_kms, REG_MDP4_DMA_DST_SIZE(dma), | 373 | mdp4_write(mdp4_kms, REG_MDP4_DMA_DST_SIZE(dma), |
| 375 | MDP4_DMA_DST_SIZE_WIDTH(0) | | 374 | MDP4_DMA_DST_SIZE_WIDTH(0) | |
| 376 | MDP4_DMA_DST_SIZE_HEIGHT(0)); | 375 | MDP4_DMA_DST_SIZE_HEIGHT(0)); |
| @@ -379,8 +378,7 @@ static int mdp4_crtc_mode_set(struct drm_crtc *crtc, | |||
| 379 | mdp4_write(mdp4_kms, REG_MDP4_OVLP_SIZE(ovlp), | 378 | mdp4_write(mdp4_kms, REG_MDP4_OVLP_SIZE(ovlp), |
| 380 | MDP4_OVLP_SIZE_WIDTH(mode->hdisplay) | | 379 | MDP4_OVLP_SIZE_WIDTH(mode->hdisplay) | |
| 381 | MDP4_OVLP_SIZE_HEIGHT(mode->vdisplay)); | 380 | MDP4_OVLP_SIZE_HEIGHT(mode->vdisplay)); |
| 382 | mdp4_write(mdp4_kms, REG_MDP4_OVLP_STRIDE(ovlp), | 381 | mdp4_write(mdp4_kms, REG_MDP4_OVLP_STRIDE(ovlp), 0); |
| 383 | crtc->primary->fb->pitches[0]); | ||
| 384 | 382 | ||
| 385 | mdp4_write(mdp4_kms, REG_MDP4_OVLP_CFG(ovlp), 1); | 383 | mdp4_write(mdp4_kms, REG_MDP4_OVLP_CFG(ovlp), 1); |
| 386 | 384 | ||