Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
This commit is contained in:
@@ -84,6 +84,7 @@ static void ipu_fb_enable(struct ipu_crtc *ipu_crtc)
|
||||
/* Start DC channel and DI after IDMAC */
|
||||
ipu_dc_enable_channel(ipu_crtc->dc);
|
||||
ipu_di_enable(ipu_crtc->di);
|
||||
drm_crtc_vblank_on(&ipu_crtc->base);
|
||||
|
||||
ipu_crtc->enabled = 1;
|
||||
}
|
||||
@@ -100,6 +101,7 @@ static void ipu_fb_disable(struct ipu_crtc *ipu_crtc)
|
||||
ipu_di_disable(ipu_crtc->di);
|
||||
ipu_plane_disable(ipu_crtc->plane[0]);
|
||||
ipu_dc_disable(ipu);
|
||||
drm_crtc_vblank_off(&ipu_crtc->base);
|
||||
|
||||
ipu_crtc->enabled = 0;
|
||||
}
|
||||
|
@@ -42,6 +42,7 @@ static const uint32_t ipu_plane_formats[] = {
|
||||
DRM_FORMAT_YVYU,
|
||||
DRM_FORMAT_YUV420,
|
||||
DRM_FORMAT_YVU420,
|
||||
DRM_FORMAT_RGB565,
|
||||
};
|
||||
|
||||
int ipu_plane_irq(struct ipu_plane *ipu_plane)
|
||||
|
Reference in New Issue
Block a user