Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269761
b: refs/heads/master
c: f6b9825
h: refs/heads/master
i:
  269759: 7498832
v: v3
  • Loading branch information
Inki Dae authored and Dave Airlie committed Oct 18, 2011
1 parent 18c1289 commit 1928c1e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 601b44e3db833d28af66d4d6eaf5d353430914d0
refs/heads/master: f6b98252946496de86bd4e89a8b7ef12ec48d97c
6 changes: 6 additions & 0 deletions trunk/drivers/gpu/drm/exynos/exynos_drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,12 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
goto out;
}

/*
* the values related to a buffer of the drm framebuffer
* to be applied should be set at here. because these values
* first, is set to shadow registers and then to
* real registers at vsync front porch period.
*/
exynos_drm_crtc_apply(crtc);

dev_priv->pageflip_event = true;
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ struct exynos_drm_overlay_ops {
* @paddr: bus(accessed by dma) physical memory address to this overlay
* and this is physically continuous.
* @vaddr: virtual memory addresss to this overlay.
* @buf_off: start offset of framebuffer to be displayed.
* @default_win: a window to be enabled.
* @color_key: color key on or off.
* @index_color: if using color key feature then this value would be used
Expand Down Expand Up @@ -111,7 +110,6 @@ struct exynos_drm_overlay {
unsigned int pitch;
dma_addr_t paddr;
void __iomem *vaddr;
unsigned int buf_off;

bool default_win;
bool color_key;
Expand Down
6 changes: 5 additions & 1 deletion trunk/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,10 @@ int exynos_drm_fbdev_reinit(struct drm_device *dev)
if (!private)
return -EINVAL;

/*
* if all sub drivers were unloaded then num_connector is 0
* so at this time, the framebuffers also should be destroyed.
*/
if (!dev->mode_config.num_connector) {
exynos_drm_fbdev_fini(dev);
return 0;
Expand Down Expand Up @@ -429,7 +433,7 @@ int exynos_drm_fbdev_reinit(struct drm_device *dev)
* re-configure the fb helper. it means that this function
* has been called by the specific drivers.
*/
return exynos_drm_fbdev_init(dev);
ret = exynos_drm_fbdev_init(dev);
}

return ret;
Expand Down

0 comments on commit 1928c1e

Please sign in to comment.