diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-10-13 11:49:13 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-10-13 14:18:23 +0000 |
| commit | 2fb91a50799342c9259b9689b69b787336018540 (patch) | |
| tree | c9b66a30b60fa7293c8dd455565ddc7a22b46695 | |
| parent | d5a0bb1d2eb3d866a45074b90f1dfedb6ba3c659 (diff) | |
| download | linux-baserock/pedroalvarez/rpi2-drm-rebased-on-vc4-kms-v3d-rpi2.tar.gz | |
HULK_SMASH.patchbaserock/pedroalvarez/rpi2-drm-rebased-on-vc4-kms-v3d-rpi2
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_crtc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_kms.c | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 1d2ca52530d5..ba7f355bcced 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1876,7 +1876,7 @@ void drm_atomic_helper_connector_dpms(struct drm_connector *connector, struct drm_connector *tmp_connector; int ret; bool active = false; - +return; if (mode != DRM_MODE_DPMS_ON) mode = DRM_MODE_DPMS_OFF; diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 90a51b2f5323..5c971d80a260 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -93,7 +93,7 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) ((mode->flags & DRM_MODE_FLAG_INTERLACE) ? 1 : 0)); u32 format = PV_CONTROL_FORMAT_24; bool debug_dump_regs = false; - +return; if (debug_dump_regs) { DRM_INFO("CRTC %d regs before:\n", drm_crtc_index(crtc)); vc4_crtc_dump_regs(vc4_crtc); diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 8c41fdc4ef2e..2a212b08e108 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -273,7 +273,7 @@ vc4_set_pixel_clock(struct vc4_dev *vc4, u32 clock) { u32 packet[2]; int ret; - +return; packet[0] = 8; /* Pixel clock. */ packet[1] = clock; @@ -295,6 +295,7 @@ static void vc4_hdmi_encoder_mode_set(struct drm_encoder *encoder, bool debug_dump_regs = false; bool hsync_pos = !(mode->flags & DRM_MODE_FLAG_NHSYNC); bool vsync_pos = !(mode->flags & DRM_MODE_FLAG_NVSYNC); +return; u32 vactive = (mode->vdisplay >> ((mode->flags & DRM_MODE_FLAG_INTERLACE) ? 1 : 0)); u32 verta = (VC4_SET_FIELD(mode->vsync_end - mode->vsync_start, @@ -405,7 +406,7 @@ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; struct vc4_dev *vc4 = to_vc4_dev(dev); - +return; HDMI_WRITE(VC4_HDMI_TX_PHY_RESET_CTL, 0xf << 16); } @@ -413,6 +414,7 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; struct vc4_dev *vc4 = to_vc4_dev(dev); +return; HDMI_WRITE(VC4_HDMI_TX_PHY_RESET_CTL, 0); } diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index 5745f22c4cc0..0b05aec3c12a 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -144,6 +144,7 @@ static int vc4_atomic_commit(struct drm_device *dev, * current layout. */ + async=0; if (async) { vc4_queue_seqno_cb(dev, &c->cb, wait_seqno, vc4_atomic_complete_commit_seqno_cb); |