From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752117AbeDGVa0 (ORCPT ); Sat, 7 Apr 2018 17:30:26 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:44397 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751572AbeDGVaY (ORCPT ); Sat, 7 Apr 2018 17:30:24 -0400 From: Philippe Cornu To: Yannick Fertre , Philippe Cornu , Benjamin Gaignard , Vincent Abriou , David Airlie , , CC: Fabien Dessenne , Mickael Reulier , Alexandre Torgue Subject: [PATCH] drm/stm: move enable/disable_vblank to crtc Date: Sat, 7 Apr 2018 23:29:37 +0200 Message-ID: <20180407212937.30407-1-philippe.cornu@st.com> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.129.5.9] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-07_08:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org enable/disable_vblank() functions at drm_driver level are deprecated. Move them to the ltdc drm_crtc_funcs structure. Signed-off-by: Philippe Cornu --- drivers/gpu/drm/stm/drv.c | 2 -- drivers/gpu/drm/stm/ltdc.c | 10 ++++++---- drivers/gpu/drm/stm/ltdc.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c index 9ab00a87f7cc..8698e08313e1 100644 --- a/drivers/gpu/drm/stm/drv.c +++ b/drivers/gpu/drm/stm/drv.c @@ -72,8 +72,6 @@ static struct drm_driver drv_driver = { .gem_prime_vmap = drm_gem_cma_prime_vmap, .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, - .enable_vblank = ltdc_crtc_enable_vblank, - .disable_vblank = ltdc_crtc_disable_vblank, }; static int drv_load(struct drm_device *ddev) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 1a3277e483d5..2b745cfc9000 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -569,9 +569,9 @@ static const struct drm_crtc_helper_funcs ltdc_crtc_helper_funcs = { .atomic_disable = ltdc_crtc_atomic_disable, }; -int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe) +static int ltdc_crtc_enable_vblank(struct drm_crtc *crtc) { - struct ltdc_device *ldev = ddev->dev_private; + struct ltdc_device *ldev = crtc_to_ltdc(crtc); DRM_DEBUG_DRIVER("\n"); reg_set(ldev->regs, LTDC_IER, IER_LIE); @@ -579,9 +579,9 @@ int ltdc_crtc_enable_vblank(struct drm_device *ddev, unsigned int pipe) return 0; } -void ltdc_crtc_disable_vblank(struct drm_device *ddev, unsigned int pipe) +static void ltdc_crtc_disable_vblank(struct drm_crtc *crtc) { - struct ltdc_device *ldev = ddev->dev_private; + struct ltdc_device *ldev = crtc_to_ltdc(crtc); DRM_DEBUG_DRIVER("\n"); reg_clear(ldev->regs, LTDC_IER, IER_LIE); @@ -594,6 +594,8 @@ static const struct drm_crtc_funcs ltdc_crtc_funcs = { .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = ltdc_crtc_enable_vblank, + .disable_vblank = ltdc_crtc_disable_vblank, .gamma_set = drm_atomic_helper_legacy_gamma_set, }; diff --git a/drivers/gpu/drm/stm/ltdc.h b/drivers/gpu/drm/stm/ltdc.h index edb268129c54..61a80d00bc3b 100644 --- a/drivers/gpu/drm/stm/ltdc.h +++ b/drivers/gpu/drm/stm/ltdc.h @@ -29,8 +29,6 @@ struct ltdc_device { u32 irq_status; }; -int ltdc_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe); -void ltdc_crtc_disable_vblank(struct drm_device *dev, unsigned int pipe); int ltdc_load(struct drm_device *ddev); void ltdc_unload(struct drm_device *ddev); -- 2.15.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philippe Cornu Subject: [PATCH] drm/stm: move enable/disable_vblank to crtc Date: Sat, 7 Apr 2018 23:29:37 +0200 Message-ID: <20180407212937.30407-1-philippe.cornu@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id D6E556E1FA for ; Sat, 7 Apr 2018 21:30:22 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Yannick Fertre , Philippe Cornu , Benjamin Gaignard , Vincent Abriou , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Mickael Reulier , Alexandre Torgue , Fabien Dessenne List-Id: dri-devel@lists.freedesktop.org ZW5hYmxlL2Rpc2FibGVfdmJsYW5rKCkgZnVuY3Rpb25zIGF0IGRybV9kcml2ZXIgbGV2ZWwKYXJl IGRlcHJlY2F0ZWQuIE1vdmUgdGhlbSB0byB0aGUgbHRkYyBkcm1fY3J0Y19mdW5jcwpzdHJ1Y3R1 cmUuCgpTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwZSBDb3JudSA8cGhpbGlwcGUuY29ybnVAc3QuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9zdG0vZHJ2LmMgIHwgIDIgLS0KIGRyaXZlcnMvZ3B1L2Ry bS9zdG0vbHRkYy5jIHwgMTAgKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmgg fCAgMiAtLQogMyBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3N0bS9kcnYuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9zdG0vZHJ2LmMKaW5kZXggOWFiMDBhODdmN2NjLi44Njk4ZTA4MzEzZTEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9zdG0vZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3N0bS9kcnYu YwpAQCAtNzIsOCArNzIsNiBAQCBzdGF0aWMgc3RydWN0IGRybV9kcml2ZXIgZHJ2X2RyaXZlciA9 IHsKIAkuZ2VtX3ByaW1lX3ZtYXAgPSBkcm1fZ2VtX2NtYV9wcmltZV92bWFwLAogCS5nZW1fcHJp bWVfdnVubWFwID0gZHJtX2dlbV9jbWFfcHJpbWVfdnVubWFwLAogCS5nZW1fcHJpbWVfbW1hcCA9 IGRybV9nZW1fY21hX3ByaW1lX21tYXAsCi0JLmVuYWJsZV92YmxhbmsgPSBsdGRjX2NydGNfZW5h YmxlX3ZibGFuaywKLQkuZGlzYWJsZV92YmxhbmsgPSBsdGRjX2NydGNfZGlzYWJsZV92Ymxhbmss CiB9OwogCiBzdGF0aWMgaW50IGRydl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZGV2KQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vc3Rt L2x0ZGMuYwppbmRleCAxYTMyNzdlNDgzZDUuLjJiNzQ1Y2ZjOTAwMCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL3N0bS9sdGRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmMK QEAgLTU2OSw5ICs1NjksOSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9m dW5jcyBsdGRjX2NydGNfaGVscGVyX2Z1bmNzID0gewogCS5hdG9taWNfZGlzYWJsZSA9IGx0ZGNf Y3J0Y19hdG9taWNfZGlzYWJsZSwKIH07CiAKLWludCBsdGRjX2NydGNfZW5hYmxlX3ZibGFuayhz dHJ1Y3QgZHJtX2RldmljZSAqZGRldiwgdW5zaWduZWQgaW50IHBpcGUpCitzdGF0aWMgaW50IGx0 ZGNfY3J0Y19lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3Qg bHRkY19kZXZpY2UgKmxkZXYgPSBkZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgbHRkY19kZXZp Y2UgKmxkZXYgPSBjcnRjX3RvX2x0ZGMoY3J0Yyk7CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJcbiIp OwogCXJlZ19zZXQobGRldi0+cmVncywgTFREQ19JRVIsIElFUl9MSUUpOwpAQCAtNTc5LDkgKzU3 OSw5IEBAIGludCBsdGRjX2NydGNfZW5hYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGRl diwgdW5zaWduZWQgaW50IHBpcGUpCiAJcmV0dXJuIDA7CiB9CiAKLXZvaWQgbHRkY19jcnRjX2Rp c2FibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkK K3N0YXRpYyB2b2lkIGx0ZGNfY3J0Y19kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCiB7Ci0Jc3RydWN0IGx0ZGNfZGV2aWNlICpsZGV2ID0gZGRldi0+ZGV2X3ByaXZhdGU7CisJ c3RydWN0IGx0ZGNfZGV2aWNlICpsZGV2ID0gY3J0Y190b19sdGRjKGNydGMpOwogCiAJRFJNX0RF QlVHX0RSSVZFUigiXG4iKTsKIAlyZWdfY2xlYXIobGRldi0+cmVncywgTFREQ19JRVIsIElFUl9M SUUpOwpAQCAtNTk0LDYgKzU5NCw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfZnVu Y3MgbHRkY19jcnRjX2Z1bmNzID0gewogCS5yZXNldCA9IGRybV9hdG9taWNfaGVscGVyX2NydGNf cmVzZXQsCiAJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9jcnRj X2R1cGxpY2F0ZV9zdGF0ZSwKIAkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBkcm1fYXRvbWljX2hl bHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUsCisJLmVuYWJsZV92YmxhbmsgPSBsdGRjX2NydGNfZW5h YmxlX3ZibGFuaywKKwkuZGlzYWJsZV92YmxhbmsgPSBsdGRjX2NydGNfZGlzYWJsZV92Ymxhbmss CiAJLmdhbW1hX3NldCA9IGRybV9hdG9taWNfaGVscGVyX2xlZ2FjeV9nYW1tYV9zZXQsCiB9Owog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vc3RtL2x0ZGMuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9zdG0vbHRkYy5oCmluZGV4IGVkYjI2ODEyOWM1NC4uNjFhODBkMDBiYzNiIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vc3RtL2x0ZGMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vc3RtL2x0 ZGMuaApAQCAtMjksOCArMjksNiBAQCBzdHJ1Y3QgbHRkY19kZXZpY2UgewogCXUzMiBpcnFfc3Rh dHVzOwogfTsKIAotaW50IGx0ZGNfY3J0Y19lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKTsKLXZvaWQgbHRkY19jcnRjX2Rpc2FibGVfdmJsYW5r KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKTsKIGludCBsdGRjX2xv YWQoc3RydWN0IGRybV9kZXZpY2UgKmRkZXYpOwogdm9pZCBsdGRjX3VubG9hZChzdHJ1Y3QgZHJt X2RldmljZSAqZGRldik7CiAKLS0gCjIuMTUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==