From mboxrd@z Thu Jan 1 00:00:00 1970 From: moinejf@free.fr (Jean-Francois Moine) Date: Thu, 9 Jan 2014 11:59:03 +0100 Subject: [PATCH v2 7/28] drm/i2c: tda998x: set the video mode from the adjusted value Message-ID: <20140109115903.00517f15@armhf> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This patch uses always the adjusted video mode instead of a mix of original and adjusted mode. Signed-off-by: Jean-Francois Moine --- drivers/gpu/drm/i2c/tda998x_drv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index c29c0b1..1abf404 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -777,6 +777,8 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, uint16_t de_pix_s, de_pix_e; uint8_t reg, div, rep; + mode = adjusted_mode; + /* * Internally TDA998x is using ITU-R BT.656 style sync but * we get VESA style sync. TDA998x is using a reference pixel @@ -808,8 +810,8 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, * those to adjust the position of the rising VS edge by adding * HSKEW to ref_pix. */ - if (adjusted_mode->flags & DRM_MODE_FLAG_HSKEW) - ref_pix += adjusted_mode->hskew; + if (mode->flags & DRM_MODE_FLAG_HSKEW) + ref_pix += mode->hskew; if ((mode->flags & DRM_MODE_FLAG_INTERLACE) == 0) { ref_line = 1 + mode->vsync_start - mode->vdisplay; @@ -941,11 +943,10 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, reg_write(priv, REG_ENC_CNTRL, ENC_CNTRL_CTL_CODE(1)); reg_set(priv, REG_TX33, TX33_HDMI); - tda998x_write_avi(priv, adjusted_mode); + tda998x_write_avi(priv, mode); if (priv->params.audio_cfg) - tda998x_configure_audio(priv, adjusted_mode, - &priv->params); + tda998x_configure_audio(priv, mode, &priv->params); } } -- Ken ar c'henta? | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Francois Moine Subject: [PATCH v2 7/28] drm/i2c: tda998x: set the video mode from the adjusted value Date: Thu, 9 Jan 2014 11:59:03 +0100 Message-ID: <20140109115903.00517f15@armhf> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by gabe.freedesktop.org (Postfix) with ESMTP id C29B2105C2F for ; Thu, 9 Jan 2014 03:16:14 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBwYXRjaCB1c2VzIGFsd2F5cyB0aGUgYWRqdXN0ZWQgdmlkZW8gbW9kZSBpbnN0ZWFkIG9m IGEgbWl4IG9mCm9yaWdpbmFsIGFuZCBhZGp1c3RlZCBtb2RlLgoKU2lnbmVkLW9mZi1ieTogSmVh bi1GcmFuY29pcyBNb2luZSA8bW9pbmVqZkBmcmVlLmZyPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p MmMvdGRhOTk4eF9kcnYuYyAgICB8IDExICsrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNiBp bnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pMmMvdGRhOTk4eF9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pMmMvdGRhOTk4eF9kcnYuYwpp bmRleCBjMjljMGIxLi4xYWJmNDA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTJjL3Rk YTk5OHhfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2kyYy90ZGE5OTh4X2Rydi5jCkBAIC03 NzcsNiArNzc3LDggQEAgdGRhOTk4eF9lbmNvZGVyX21vZGVfc2V0KHN0cnVjdCBkcm1fZW5jb2Rl ciAqZW5jb2RlciwKIAl1aW50MTZfdCBkZV9waXhfcywgZGVfcGl4X2U7CiAJdWludDhfdCByZWcs IGRpdiwgcmVwOwogCisJbW9kZSA9IGFkanVzdGVkX21vZGU7CisKIAkvKgogCSAqIEludGVybmFs bHkgVERBOTk4eCBpcyB1c2luZyBJVFUtUiBCVC42NTYgc3R5bGUgc3luYyBidXQKIAkgKiB3ZSBn ZXQgVkVTQSBzdHlsZSBzeW5jLiBUREE5OTh4IGlzIHVzaW5nIGEgcmVmZXJlbmNlIHBpeGVsCkBA IC04MDgsOCArODEwLDggQEAgdGRhOTk4eF9lbmNvZGVyX21vZGVfc2V0KHN0cnVjdCBkcm1fZW5j b2RlciAqZW5jb2RlciwKIAkgKiB0aG9zZSB0byBhZGp1c3QgdGhlIHBvc2l0aW9uIG9mIHRoZSBy aXNpbmcgVlMgZWRnZSBieSBhZGRpbmcKIAkgKiBIU0tFVyB0byByZWZfcGl4LgogCSAqLwotCWlm IChhZGp1c3RlZF9tb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSFNLRVcpCi0JCXJlZl9waXgg Kz0gYWRqdXN0ZWRfbW9kZS0+aHNrZXc7CisJaWYgKG1vZGUtPmZsYWdzICYgRFJNX01PREVfRkxB R19IU0tFVykKKwkJcmVmX3BpeCArPSBtb2RlLT5oc2tldzsKIAogCWlmICgobW9kZS0+ZmxhZ3Mg JiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFDRSkgPT0gMCkgewogCQlyZWZfbGluZSAgICAgPSAxICsg bW9kZS0+dnN5bmNfc3RhcnQgLSBtb2RlLT52ZGlzcGxheTsKQEAgLTk0MSwxMSArOTQzLDEwIEBA IHRkYTk5OHhfZW5jb2Rlcl9tb2RlX3NldChzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJ CXJlZ193cml0ZShwcml2LCBSRUdfRU5DX0NOVFJMLCBFTkNfQ05UUkxfQ1RMX0NPREUoMSkpOwog CQlyZWdfc2V0KHByaXYsIFJFR19UWDMzLCBUWDMzX0hETUkpOwogCi0JCXRkYTk5OHhfd3JpdGVf YXZpKHByaXYsIGFkanVzdGVkX21vZGUpOworCQl0ZGE5OTh4X3dyaXRlX2F2aShwcml2LCBtb2Rl KTsKIAogCQlpZiAocHJpdi0+cGFyYW1zLmF1ZGlvX2NmZykKLQkJCXRkYTk5OHhfY29uZmlndXJl X2F1ZGlvKHByaXYsIGFkanVzdGVkX21vZGUsCi0JCQkJCQkmcHJpdi0+cGFyYW1zKTsKKwkJCXRk YTk5OHhfY29uZmlndXJlX2F1ZGlvKHByaXYsIG1vZGUsICZwcml2LT5wYXJhbXMpOwogCX0KIH0K IAoKLS0gCktlbiBhciBjJ2hlbnRhw7EJfAkgICAgICAqKiBCcmVpemggaGEgTGludXggYXRhdiEg KioKSmVmCQl8CQlodHRwOi8vbW9pbmVqZi5mcmVlLmZyLwpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756617AbaAILQw (ORCPT ); Thu, 9 Jan 2014 06:16:52 -0500 Received: from smtpfb1-g21.free.fr ([212.27.42.9]:33804 "EHLO smtpfb1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755414AbaAILQ3 convert rfc822-to-8bit (ORCPT ); Thu, 9 Jan 2014 06:16:29 -0500 Date: Thu, 9 Jan 2014 11:59:03 +0100 From: Jean-Francois Moine To: dri-devel@lists.freedesktop.org Cc: Dave Airlie , Rob Clark , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/28] drm/i2c: tda998x: set the video mode from the adjusted value Message-ID: <20140109115903.00517f15@armhf> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; arm-unknown-linux-gnueabihf) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch uses always the adjusted video mode instead of a mix of original and adjusted mode. Signed-off-by: Jean-Francois Moine --- drivers/gpu/drm/i2c/tda998x_drv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index c29c0b1..1abf404 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -777,6 +777,8 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, uint16_t de_pix_s, de_pix_e; uint8_t reg, div, rep; + mode = adjusted_mode; + /* * Internally TDA998x is using ITU-R BT.656 style sync but * we get VESA style sync. TDA998x is using a reference pixel @@ -808,8 +810,8 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, * those to adjust the position of the rising VS edge by adding * HSKEW to ref_pix. */ - if (adjusted_mode->flags & DRM_MODE_FLAG_HSKEW) - ref_pix += adjusted_mode->hskew; + if (mode->flags & DRM_MODE_FLAG_HSKEW) + ref_pix += mode->hskew; if ((mode->flags & DRM_MODE_FLAG_INTERLACE) == 0) { ref_line = 1 + mode->vsync_start - mode->vdisplay; @@ -941,11 +943,10 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, reg_write(priv, REG_ENC_CNTRL, ENC_CNTRL_CTL_CODE(1)); reg_set(priv, REG_TX33, TX33_HDMI); - tda998x_write_avi(priv, adjusted_mode); + tda998x_write_avi(priv, mode); if (priv->params.audio_cfg) - tda998x_configure_audio(priv, adjusted_mode, - &priv->params); + tda998x_configure_audio(priv, mode, &priv->params); } } -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/