diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-08-06 07:43:12 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-09-10 11:19:06 -0400 |
| commit | d65bd0e431156f156f43946b6efb524694afb685 (patch) | |
| tree | a1d14c39b4ff8e7535fb764232e9cb86e793eb94 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | f9a1ca5c4734ad0da68ab322c8e9b7eb0b63a789 (diff) | |
drm/msm/mdp4: fix blend setup with multiple crtcs
In particular, blend_setup() should not overwrite the other crtc's mixer
settings. Also, the encoder needs to be able to specify the mixer-id
explicitly, since both LVDS and DTV use 'INTF_LVDC_DTV', so we cannot
guess the mixer-id from the interface.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 47ccdbf49fa..3b05fb4e3d6 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -280,7 +280,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags) dev->mode_config.max_height = 2048; dev->mode_config.funcs = &mode_config_funcs; - ret = drm_vblank_init(dev, 1); + ret = drm_vblank_init(dev, priv->num_crtcs); if (ret < 0) { dev_err(dev->dev, "failed to initialize vblank\n"); goto fail; |