From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Marek Subject: [PATCH v4 2/5] drm/msm: add headless gpu device for imx5 Date: Tue, 4 Dec 2018 10:16:58 -0500 Message-ID: <20181204151702.8514-2-jonathan@marek.ca> References: <20181204151702.8514-1-jonathan@marek.ca> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181204151702.8514-1-jonathan-eSc4qw6YbEQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: David Airlie , "open list:DRM DRIVER FOR MSM ADRENO GPU" , open list , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Rob Clark , Sean Paul , Chris.Healy-c8ZVq/bFV1I@public.gmane.org, Jeykumar Sankaran , festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org VGhpcyBwYXRjaCBhbGxvd3MgdXNpbmcgZHJtL21zbSB3aXRob3V0IHFjb20gZGlzcGxheSBoYXJk d2FyZS4gSXQgYWRkcyBhCmFtZCxpbWFnZW9uIGNvbXBhdGlibGUsIHdoaWNoIGlzIHVzZWQgaW5z dGVhZCBvZiBxY29tLGFkcmVubywgYnV0IGRvZXMKbm90IHJlcXVpcmUgYSB0b3AgbGV2ZWwgbXNt IG5vZGUuCgpTaWduZWQtb2ZmLWJ5OiBKb25hdGhhbiBNYXJlayA8am9uYXRoYW5AbWFyZWsuY2E+ Ci0tLQp2MzogcmV3b3JrZWQgdG8gd29yayB3aXRoIG9ubHkgYSBhbWQsaW1hZ2VvbiBub2RlCgog ZHJpdmVycy9ncHUvZHJtL21zbS9LY29uZmlnICAgICAgICAgICAgICAgIHwgIDQgKy0tCiBkcml2 ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hZHJlbm9fZGV2aWNlLmMgfCAzNSArKysrKysrKysrKysr KysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kZWJ1Z2ZzLmMgICAgICAgICAgfCAg MiArLQogZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMgICAgICAgICAgICAgIHwgMjEgKysr KysrKy0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL0tjb25maWcgYi9kcml2ZXJz L2dwdS9kcm0vbXNtL0tjb25maWcKaW5kZXggODQzYTlkNDBjLi5jZjU0OWYxZWQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vS2NvbmZpZworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNt L0tjb25maWcKQEAgLTIsNyArMiw3IEBACiBjb25maWcgRFJNX01TTQogCXRyaXN0YXRlICJNU00g RFJNIgogCWRlcGVuZHMgb24gRFJNCi0JZGVwZW5kcyBvbiBBUkNIX1FDT00gfHwgKEFSTSAmJiBD T01QSUxFX1RFU1QpCisJZGVwZW5kcyBvbiBBUkNIX1FDT00gfHwgU09DX0lNWDUgfHwgKEFSTSAm JiBDT01QSUxFX1RFU1QpCiAJZGVwZW5kcyBvbiBPRiAmJiBDT01NT05fQ0xLCiAJZGVwZW5kcyBv biBNTVUKIAlzZWxlY3QgUUNPTV9NRFRfTE9BREVSIGlmIEFSQ0hfUUNPTQpAQCAtMTEsNyArMTEs NyBAQCBjb25maWcgRFJNX01TTQogCXNlbGVjdCBEUk1fUEFORUwKIAlzZWxlY3QgU0hNRU0KIAlz ZWxlY3QgVE1QRlMKLQlzZWxlY3QgUUNPTV9TQ00KKwlzZWxlY3QgUUNPTV9TQ00gaWYgQVJDSF9R Q09NCiAJc2VsZWN0IFdBTlRfREVWX0NPUkVEVU1QCiAJc2VsZWN0IFNORF9TT0NfSERNSV9DT0RF QyBpZiBTTkRfU09DCiAJc2VsZWN0IFNZTkNfRklMRQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL21zbS9hZHJlbm8vYWRyZW5vX2RldmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJl bm8vYWRyZW5vX2RldmljZS5jCmluZGV4IGFkYzQ0MmY3My4uOTllMzYzYzNkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hZHJlbm9fZGV2aWNlLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL21zbS9hZHJlbm8vYWRyZW5vX2RldmljZS5jCkBAIC0yNzEsNyArMjcxLDggQEAg c3RhdGljIGludCBmaW5kX2NoaXBpZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBhZHJlbm9f cmV2ICpyZXYpCiAJaWYgKHJldCA9PSAwKSB7CiAJCXVuc2lnbmVkIGludCByLCBwYXRjaDsKIAot CQlpZiAoc3NjYW5mKGNvbXBhdCwgInFjb20sYWRyZW5vLSV1LiV1IiwgJnIsICZwYXRjaCkgPT0g MikgeworCQlpZiAoc3NjYW5mKGNvbXBhdCwgInFjb20sYWRyZW5vLSV1LiV1IiwgJnIsICZwYXRj aCkgPT0gMiB8fAorCQkgICAgc3NjYW5mKGNvbXBhdCwgImFtZCxpbWFnZW9uLSV1LiV1IiwgJnIs ICZwYXRjaCkgPT0gMikgewogCQkJcmV2LT5jb3JlID0gciAvIDEwMDsKIAkJCXIgJT0gMTAwOwog CQkJcmV2LT5tYWpvciA9IHIgLyAxMDsKQEAgLTM1Niw5ICszNTcsMzcgQEAgc3RhdGljIGNvbnN0 IHN0cnVjdCBjb21wb25lbnRfb3BzIGEzeHhfb3BzID0gewogCQkudW5iaW5kID0gYWRyZW5vX3Vu YmluZCwKIH07CiAKK3N0YXRpYyB2b2lkIGFkcmVub19kZXZpY2VfcmVnaXN0ZXJfaGVhZGxlc3Mo dm9pZCkKK3sKKwkvKiBvbiBpbXg1LCB3ZSBkb24ndCBoYXZlIGEgdG9wLWxldmVsIG1kcC9kcHUg bm9kZQorCSAqIHRoaXMgY3JlYXRlcyBhIGR1bW15IG5vZGUgZm9yIHRoZSBkcml2ZXIgZm9yIHRo YXQgY2FzZQorCSAqLworCXN0cnVjdCBwbGF0Zm9ybV9kZXZpY2VfaW5mbyBkdW1teV9pbmZvID0g eworCQkucGFyZW50ID0gTlVMTCwKKwkJLm5hbWUgPSAibXNtIiwKKwkJLmlkID0gLTEsCisJCS5y ZXMgPSBOVUxMLAorCQkubnVtX3JlcyA9IDAsCisJCS5kYXRhID0gTlVMTCwKKwkJLnNpemVfZGF0 YSA9IDAsCisJCS5kbWFfbWFzayA9IH4wLAorCX07CisJcGxhdGZvcm1fZGV2aWNlX3JlZ2lzdGVy X2Z1bGwoJmR1bW15X2luZm8pOworfQorCiBzdGF0aWMgaW50IGFkcmVub19wcm9iZShzdHJ1Y3Qg cGxhdGZvcm1fZGV2aWNlICpwZGV2KQogewotCXJldHVybiBjb21wb25lbnRfYWRkKCZwZGV2LT5k ZXYsICZhM3h4X29wcyk7CisKKwlpbnQgcmV0OworCisJcmV0ID0gY29tcG9uZW50X2FkZCgmcGRl di0+ZGV2LCAmYTN4eF9vcHMpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlpZiAob2Zf ZGV2aWNlX2lzX2NvbXBhdGlibGUocGRldi0+ZGV2Lm9mX25vZGUsICJhbWQsaW1hZ2VvbiIpKQor CQlhZHJlbm9fZGV2aWNlX3JlZ2lzdGVyX2hlYWRsZXNzKCk7CisKKwlyZXR1cm4gMDsKIH0KIAog c3RhdGljIGludCBhZHJlbm9fcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCkBA IC0zNzAsNiArMzk5LDggQEAgc3RhdGljIGludCBhZHJlbm9fcmVtb3ZlKHN0cnVjdCBwbGF0Zm9y bV9kZXZpY2UgKnBkZXYpCiBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9pZCBkdF9tYXRj aFtdID0gewogCXsgLmNvbXBhdGlibGUgPSAicWNvbSxhZHJlbm8iIH0sCiAJeyAuY29tcGF0aWJs ZSA9ICJxY29tLGFkcmVuby0zeHgiIH0sCisJLyogZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBpbXg1 IGdwdTogKi8KKwl7IC5jb21wYXRpYmxlID0gImFtZCxpbWFnZW9uIiB9LAogCS8qIGZvciBiYWNr d2FyZHMgY29tcGF0IHcvIGRvd25zdHJlYW0ga2dzbCBEVCBmaWxlczogKi8KIAl7IC5jb21wYXRp YmxlID0gInFjb20sa2dzbC0zZDAiIH0sCiAJe30KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9tc20vbXNtX2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2RlYnVnZnMuYwpp bmRleCA5YTdjZjlmZTIuLmZiNDIzZDMwOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21z bS9tc21fZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2RlYnVnZnMuYwpA QCAtMjQyLDcgKzI0Miw3IEBAIGludCBtc21fZGVidWdmc19pbml0KHN0cnVjdCBkcm1fbWlub3Ig Km1pbm9yKQogCWRlYnVnZnNfY3JlYXRlX2ZpbGUoImdwdSIsIFNfSVJVU1IsIG1pbm9yLT5kZWJ1 Z2ZzX3Jvb3QsCiAJCWRldiwgJm1zbV9ncHVfZm9wcyk7CiAKLQlpZiAocHJpdi0+a21zLT5mdW5j cy0+ZGVidWdmc19pbml0KSB7CisJaWYgKHByaXYtPmttcyAmJiBwcml2LT5rbXMtPmZ1bmNzLT5k ZWJ1Z2ZzX2luaXQpIHsKIAkJcmV0ID0gcHJpdi0+a21zLT5mdW5jcy0+ZGVidWdmc19pbml0KHBy aXYtPmttcywgbWlub3IpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21f ZHJ2LmMKaW5kZXggODFiZmFjNzQ0Li43ODQyNTE4YTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9tc20vbXNtX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5jCkBA IC01MTAsMTcgKzUxMCwxMyBAQCBzdGF0aWMgaW50IG1zbV9kcm1faW5pdChzdHJ1Y3QgZGV2aWNl ICpkZXYsIHN0cnVjdCBkcm1fZHJpdmVyICpkcnYpCiAJCXByaXYtPmttcyA9IGttczsKIAkJYnJl YWs7CiAJZGVmYXVsdDoKLQkJa21zID0gRVJSX1BUUigtRU5PREVWKTsKKwkJLyogdmFsaWQgb25s eSBmb3IgdGhlIGR1bW15IGhlYWRsZXNzIGNhc2UsIHdoZXJlIG9mX25vZGU9TlVMTCAqLworCQlX QVJOX09OKGRldi0+b2Zfbm9kZSk7CisJCWttcyA9IE5VTEw7CiAJCWJyZWFrOwogCX0KIAogCWlm IChJU19FUlIoa21zKSkgewotCQkvKgotCQkgKiBOT1RFOiBvbmNlIHdlIGhhdmUgR1BVIHN1cHBv cnQsIGhhdmluZyBubyBrbXMgc2hvdWxkIG5vdAotCQkgKiBiZSBjb25zaWRlcmVkIGZhdGFsLi4g aWRlYWxseSB3ZSB3b3VsZCBzdGlsbCBzdXBwb3J0IGdwdQotCQkgKiBhbmQgKGZvciBleGFtcGxl KSB1c2UgZG1hYnVmL3ByaW1lIHRvIHNoYXJlIGJ1ZmZlcnMgd2l0aAotCQkgKiBpbXggZHJtIGRy aXZlciBvbiBpTVg1Ci0JCSAqLwogCQlEUk1fREVWX0VSUk9SKGRldiwgImZhaWxlZCB0byBsb2Fk IGttc1xuIik7CiAJCXJldCA9IFBUUl9FUlIoa21zKTsKIAkJcHJpdi0+a21zID0gTlVMTDsKQEAg LTYyMCw3ICs2MTYsNyBAQCBzdGF0aWMgaW50IG1zbV9kcm1faW5pdChzdHJ1Y3QgZGV2aWNlICpk ZXYsIHN0cnVjdCBkcm1fZHJpdmVyICpkcnYpCiAJZHJtX21vZGVfY29uZmlnX3Jlc2V0KGRkZXYp OwogCiAjaWZkZWYgQ09ORklHX0RSTV9GQkRFVl9FTVVMQVRJT04KLQlpZiAoZmJkZXYpCisJaWYg KGttcyAmJiBmYmRldikKIAkJcHJpdi0+ZmJkZXYgPSBtc21fZmJkZXZfaW5pdChkZGV2KTsKICNl bmRpZgogCkBAIC0xMzAyLDYgKzEyOTgsNyBAQCBzdGF0aWMgaW50IGFkZF9kaXNwbGF5X2NvbXBv bmVudHMoc3RydWN0IGRldmljZSAqZGV2LAogc3RhdGljIGNvbnN0IHN0cnVjdCBvZl9kZXZpY2Vf aWQgbXNtX2dwdV9tYXRjaFtdID0gewogCXsgLmNvbXBhdGlibGUgPSAicWNvbSxhZHJlbm8iIH0s CiAJeyAuY29tcGF0aWJsZSA9ICJxY29tLGFkcmVuby0zeHgiIH0sCisJeyAuY29tcGF0aWJsZSA9 ICJhbWQsaW1hZ2VvbiIgfSwKIAl7IC5jb21wYXRpYmxlID0gInFjb20sa2dzbC0zZDAiIH0sCiAJ eyB9LAogfTsKQEAgLTEzNDYsOSArMTM0MywxMSBAQCBzdGF0aWMgaW50IG1zbV9wZGV2X3Byb2Jl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJc3RydWN0IGNvbXBvbmVudF9tYXRjaCAq bWF0Y2ggPSBOVUxMOwogCWludCByZXQ7CiAKLQlyZXQgPSBhZGRfZGlzcGxheV9jb21wb25lbnRz KCZwZGV2LT5kZXYsICZtYXRjaCk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwlpZiAoZ2V0 X21kcF92ZXIocGRldikpIHsKKwkJcmV0ID0gYWRkX2Rpc3BsYXlfY29tcG9uZW50cygmcGRldi0+ ZGV2LCAmbWF0Y2gpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CiAKIAlyZXQgPSBh ZGRfZ3B1X2NvbXBvbmVudHMoJnBkZXYtPmRldiwgJm1hdGNoKTsKIAlpZiAocmV0KQotLSAKMi4x Ny4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpGcmVl ZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJlbm8K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A79EC04EB8 for ; Tue, 4 Dec 2018 15:20:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D79402082B for ; Tue, 4 Dec 2018 15:20:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marek-ca.20150623.gappssmtp.com header.i=@marek-ca.20150623.gappssmtp.com header.b="NiDVo+Rf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D79402082B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=marek.ca Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725955AbeLDPUD (ORCPT ); Tue, 4 Dec 2018 10:20:03 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:45050 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726722AbeLDPUB (ORCPT ); Tue, 4 Dec 2018 10:20:01 -0500 Received: by mail-qt1-f194.google.com with SMTP id n32so18379325qte.11 for ; Tue, 04 Dec 2018 07:20:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ko4Y7Uyh13FJDGl/9r6xGDDp7+352wGvWojGv/9q9YQ=; b=NiDVo+Rf/QYBkRz6VRnN1B0oCjDHQKchT4tTOWajvyRLpwu47dmInhMlu6N1n0fKn+ l9g8vw7hZVLARpNMWLL65w4k5qRtG/YmHurszXQyt65se9JdrTXEZY1HopZNKx+4XaOS FjmmwkmwzyP6QOAwqX7bhWrtS3ZMeRqVwmErhIDLff8eOMNdYH25TaGXl6m6dAAFKged GgWQGojkXJbCaN8uwFfUSX7F7KyE5m+71Q92WW6FevJhU0QpSkwQxySSZZoRp9rSzt5P Fcn3tMHyTD2YGUH/dxeR8WVHVaO7tEfK2wTz6bJ+Pi+o8MoItmn/Yvd1EjPw7nqcEYj+ ytiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ko4Y7Uyh13FJDGl/9r6xGDDp7+352wGvWojGv/9q9YQ=; b=O/09yaUjRbrGCJ71lVcpTMq1Gqhi7PHqKtBB+q1wm2JRX4hNX0r7f+Q32BXCC17Cbq PuhhMbJaCn+gsLHJ8j7TFF8bq6dQzMmCTM6FiOeN6MHhOoYeQjBKeOHGmqZYVT8aNxdu vifGz8V5K6dXrB4u1dFqmSOaxYWgMyXZFIpQ3MDvZv10vt0bQsoq9tiuQ6Xkux/LBVMi meTB7zp5nt27qQ7TIPFpCeUER7HPepwuqSzvN/d3kVDFDNhMb7SuNSYU4xK8g/5oEVZ6 y4b796oMVkfwpz8oiYYNTvblyy87bKh3xObzE8hkigywyGOXdueAf9rv8esykk5nncki Ee0g== X-Gm-Message-State: AA+aEWavMLlj24XRsJG5eG/nW+uDQkttFaUySRF+uO2FS3pN2SijafUZ aJ9qSrgz+83jRhZ1x5kw4udGKQ== X-Google-Smtp-Source: AFSGD/UErJBXBNLB3H5nDM4FLyRTcepdU4eI825gAncFLOTjiOTv4tK6K0ev5w9q4P4JDBG5Q6O47Q== X-Received: by 2002:ac8:13c5:: with SMTP id i5mr14305187qtj.365.1543936799841; Tue, 04 Dec 2018 07:19:59 -0800 (PST) Received: from localhost.localdomain (modemcable014.247-57-74.mc.videotron.ca. [74.57.247.14]) by smtp.gmail.com with ESMTPSA id q17sm11053989qtc.19.2018.12.04.07.19.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Dec 2018 07:19:59 -0800 (PST) From: Jonathan Marek To: freedreno@lists.freedesktop.org Cc: Chris.Healy@zii.aero, festevam@gmail.com, Rob Clark , David Airlie , Sean Paul , Jeykumar Sankaran , linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), dri-devel@lists.freedesktop.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 2/5] drm/msm: add headless gpu device for imx5 Date: Tue, 4 Dec 2018 10:16:58 -0500 Message-Id: <20181204151702.8514-2-jonathan@marek.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181204151702.8514-1-jonathan@marek.ca> References: <20181204151702.8514-1-jonathan@marek.ca> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch allows using drm/msm without qcom display hardware. It adds a amd,imageon compatible, which is used instead of qcom,adreno, but does not require a top level msm node. Signed-off-by: Jonathan Marek --- v3: reworked to work with only a amd,imageon node drivers/gpu/drm/msm/Kconfig | 4 +-- drivers/gpu/drm/msm/adreno/adreno_device.c | 35 ++++++++++++++++++++-- drivers/gpu/drm/msm/msm_debugfs.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 21 +++++++------ 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 843a9d40c..cf549f1ed 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -2,7 +2,7 @@ config DRM_MSM tristate "MSM DRM" depends on DRM - depends on ARCH_QCOM || (ARM && COMPILE_TEST) + depends on ARCH_QCOM || SOC_IMX5 || (ARM && COMPILE_TEST) depends on OF && COMMON_CLK depends on MMU select QCOM_MDT_LOADER if ARCH_QCOM @@ -11,7 +11,7 @@ config DRM_MSM select DRM_PANEL select SHMEM select TMPFS - select QCOM_SCM + select QCOM_SCM if ARCH_QCOM select WANT_DEV_COREDUMP select SND_SOC_HDMI_CODEC if SND_SOC select SYNC_FILE diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index adc442f73..99e363c3d 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -271,7 +271,8 @@ static int find_chipid(struct device *dev, struct adreno_rev *rev) if (ret == 0) { unsigned int r, patch; - if (sscanf(compat, "qcom,adreno-%u.%u", &r, &patch) == 2) { + if (sscanf(compat, "qcom,adreno-%u.%u", &r, &patch) == 2 || + sscanf(compat, "amd,imageon-%u.%u", &r, &patch) == 2) { rev->core = r / 100; r %= 100; rev->major = r / 10; @@ -356,9 +357,37 @@ static const struct component_ops a3xx_ops = { .unbind = adreno_unbind, }; +static void adreno_device_register_headless(void) +{ + /* on imx5, we don't have a top-level mdp/dpu node + * this creates a dummy node for the driver for that case + */ + struct platform_device_info dummy_info = { + .parent = NULL, + .name = "msm", + .id = -1, + .res = NULL, + .num_res = 0, + .data = NULL, + .size_data = 0, + .dma_mask = ~0, + }; + platform_device_register_full(&dummy_info); +} + static int adreno_probe(struct platform_device *pdev) { - return component_add(&pdev->dev, &a3xx_ops); + + int ret; + + ret = component_add(&pdev->dev, &a3xx_ops); + if (ret) + return ret; + + if (of_device_is_compatible(pdev->dev.of_node, "amd,imageon")) + adreno_device_register_headless(); + + return 0; } static int adreno_remove(struct platform_device *pdev) @@ -370,6 +399,8 @@ static int adreno_remove(struct platform_device *pdev) static const struct of_device_id dt_match[] = { { .compatible = "qcom,adreno" }, { .compatible = "qcom,adreno-3xx" }, + /* for compatibility with imx5 gpu: */ + { .compatible = "amd,imageon" }, /* for backwards compat w/ downstream kgsl DT files: */ { .compatible = "qcom,kgsl-3d0" }, {} diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c index 9a7cf9fe2..fb423d309 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -242,7 +242,7 @@ int msm_debugfs_init(struct drm_minor *minor) debugfs_create_file("gpu", S_IRUSR, minor->debugfs_root, dev, &msm_gpu_fops); - if (priv->kms->funcs->debugfs_init) { + if (priv->kms && priv->kms->funcs->debugfs_init) { ret = priv->kms->funcs->debugfs_init(priv->kms, minor); if (ret) return ret; diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 81bfac744..7842518a9 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -510,17 +510,13 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) priv->kms = kms; break; default: - kms = ERR_PTR(-ENODEV); + /* valid only for the dummy headless case, where of_node=NULL */ + WARN_ON(dev->of_node); + kms = NULL; break; } if (IS_ERR(kms)) { - /* - * NOTE: once we have GPU support, having no kms should not - * be considered fatal.. ideally we would still support gpu - * and (for example) use dmabuf/prime to share buffers with - * imx drm driver on iMX5 - */ DRM_DEV_ERROR(dev, "failed to load kms\n"); ret = PTR_ERR(kms); priv->kms = NULL; @@ -620,7 +616,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) drm_mode_config_reset(ddev); #ifdef CONFIG_DRM_FBDEV_EMULATION - if (fbdev) + if (kms && fbdev) priv->fbdev = msm_fbdev_init(ddev); #endif @@ -1302,6 +1298,7 @@ static int add_display_components(struct device *dev, static const struct of_device_id msm_gpu_match[] = { { .compatible = "qcom,adreno" }, { .compatible = "qcom,adreno-3xx" }, + { .compatible = "amd,imageon" }, { .compatible = "qcom,kgsl-3d0" }, { }, }; @@ -1346,9 +1343,11 @@ static int msm_pdev_probe(struct platform_device *pdev) struct component_match *match = NULL; int ret; - ret = add_display_components(&pdev->dev, &match); - if (ret) - return ret; + if (get_mdp_ver(pdev)) { + ret = add_display_components(&pdev->dev, &match); + if (ret) + return ret; + } ret = add_gpu_components(&pdev->dev, &match); if (ret) -- 2.17.1