projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
tegra
/
dc.c
diff --git
a/drivers/gpu/drm/tegra/dc.c
b/drivers/gpu/drm/tegra/dc.c
index cdfa126a47257b3c72adbc09780f55755139676c..13bea1bbb881f34d2ec5121880a8e6e7e470fb9d 100644
(file)
--- a/
drivers/gpu/drm/tegra/dc.c
+++ b/
drivers/gpu/drm/tegra/dc.c
@@
-738,7
+738,6
@@
static const struct drm_crtc_funcs tegra_crtc_funcs = {
static void tegra_crtc_disable(struct drm_crtc *crtc)
{
static void tegra_crtc_disable(struct drm_crtc *crtc)
{
- struct tegra_dc *dc = to_tegra_dc(crtc);
struct drm_device *drm = crtc->dev;
struct drm_plane *plane;
struct drm_device *drm = crtc->dev;
struct drm_plane *plane;
@@
-754,7
+753,7
@@
static void tegra_crtc_disable(struct drm_crtc *crtc)
}
}
}
}
- drm_
vblank_off(drm, dc->pipe
);
+ drm_
crtc_vblank_off(crtc
);
}
static bool tegra_crtc_mode_fixup(struct drm_crtc *crtc,
}
static bool tegra_crtc_mode_fixup(struct drm_crtc *crtc,
@@
-843,8
+842,6
@@
static int tegra_crtc_mode_set(struct drm_crtc *crtc,
u32 value;
int err;
u32 value;
int err;
- drm_vblank_pre_modeset(crtc->dev, dc->pipe);
-
err = tegra_crtc_setup_clk(crtc, mode);
if (err) {
dev_err(dc->dev, "failed to setup clock for CRTC: %d\n", err);
err = tegra_crtc_setup_clk(crtc, mode);
if (err) {
dev_err(dc->dev, "failed to setup clock for CRTC: %d\n", err);
@@
-898,6
+895,8
@@
static void tegra_crtc_prepare(struct drm_crtc *crtc)
unsigned int syncpt;
unsigned long value;
unsigned int syncpt;
unsigned long value;
+ drm_crtc_vblank_off(crtc);
+
/* hardware initialization */
reset_control_deassert(dc->rst);
usleep_range(10000, 20000);
/* hardware initialization */
reset_control_deassert(dc->rst);
usleep_range(10000, 20000);
@@
-945,7
+944,7
@@
static void tegra_crtc_commit(struct drm_crtc *crtc)
value = GENERAL_ACT_REQ | WIN_A_ACT_REQ;
tegra_dc_writel(dc, value, DC_CMD_STATE_CONTROL);
value = GENERAL_ACT_REQ | WIN_A_ACT_REQ;
tegra_dc_writel(dc, value, DC_CMD_STATE_CONTROL);
- drm_
vblank_post_modeset(crtc->dev, dc->pipe
);
+ drm_
crtc_vblank_on(crtc
);
}
static void tegra_crtc_load_lut(struct drm_crtc *crtc)
}
static void tegra_crtc_load_lut(struct drm_crtc *crtc)