From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 17/25] drm: kirin: Move config max_width and max_height to driver data Date: Tue, 23 Apr 2019 16:20:48 -0700 Message-ID: <1556061656-1733-18-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C59A89786 for ; Tue, 23 Apr 2019 23:21:27 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id i17so8250403pfo.6 for ; Tue, 23 Apr 2019 16:21:27 -0700 (PDT) In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: Xu YiPing , David Airlie , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgdGhlIG1heF93aWR0aAphbmQgbWF4X2hl aWdodCB2YWx1ZXMgdXNlZCBpbiBraXJpbl9kcm1fbW9kZV9jb25maWdfaW5pdGEgdG8KaGFyZHdh cmUgc3BlY2lmaWMgZHJpdmVyIGRhdGEuCgpUaGlzIHdpbGwgbWFrZSBpdCBlYXNpZXIgdG8gYWRk IHN1cHBvcnQgZm9yIG5ldyBkZXZpY2VzCnZpYSBhIG5ldyBraXJpbl9kcm1fZGF0YSBzdHJ1Y3R1 cmUuCgpDYzogWGlubGlhbmcgTGl1IDx6LmxpdXhpbmxpYW5nQGhpc2lsaWNvbi5jb20+CkNjOiBS b25ncm9uZyBab3UgPHpvdXJvbmdyb25nQGdtYWlsLmNvbT4KQ2M6IFhpbndlaSBLb25nIDxrb25n Lmtvbmd4aW53ZWlAaGlzaWxpY29uLmNvbT4KQ2M6IENoZW4gRmVuZyA8cHVjay5jaGVuQGhpc2ls aWNvbi5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBEYW5pZWwg VmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBkcmktZGV2ZWwgPGRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmc+ClNpZ25lZC1vZmYtYnk6IFh1IFlpUGluZyA8eHV5aXBpbmdAaGlzaWxp Y29uLmNvbT4KW2pzdHVsdHo6IHJld29yZGVkIGNvbW1pdCBtZXNzYWdlXQpTaWduZWQtb2ZmLWJ5 OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYyB8ICAyICsrCiBkcml2ZXJzL2dwdS9k cm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuYyB8IDE3ICsrKysrLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaCB8ICAyICsr CiAzIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYwppbmRleCBi NmIxZGE2Li44ZjE1MjY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tp cmluL2tpcmluX2RybV9hZGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmlu L2tpcmluX2RybV9hZGUuYwpAQCAtMTA1NCw2ICsxMDU0LDggQEAgc3RydWN0IGtpcmluX2RybV9k YXRhIGFkZV9kcml2ZXJfZGF0YSA9IHsKIAkucHJpbV9wbGFuZSA9IEFERV9DSDEsCiAJLmNoYW5u ZWxfZm9ybWF0cyA9IGNoYW5uZWxfZm9ybWF0cywKIAkuY2hhbm5lbF9mb3JtYXRzX2NudCA9IEFS UkFZX1NJWkUoY2hhbm5lbF9mb3JtYXRzKSwKKwkuY29uZmlnX21heF93aWR0aCA9IDIwNDgsCisJ LmNvbmZpZ19tYXhfaGVpZ2h0ID0gMjA0OCwKIAkuY3J0Y19oZWxwZXJfZnVuY3MgPSAmYWRlX2Ny dGNfaGVscGVyX2Z1bmNzLAogCS5jcnRjX2Z1bmNzID0gJmFkZV9jcnRjX2Z1bmNzLAogCS5wbGFu ZV9oZWxwZXJfZnVuY3MgPSAmYWRlX3BsYW5lX2hlbHBlcl9mdW5jcywKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5jIGIvZHJpdmVycy9n cHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmMKaW5kZXggNGIyMTBlYS4uNzBm ZWUzMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9k cm1fZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1f ZHJ2LmMKQEAgLTQxLDE3ICs0MSw2IEBAIHN0YXRpYyBpbnQga2lyaW5fZHJtX2ttc19jbGVhbnVw KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIGtp cmluX2RybV9tb2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCi17Ci0JZGV2 LT5tb2RlX2NvbmZpZy5taW5fd2lkdGggPSAwOwotCWRldi0+bW9kZV9jb25maWcubWluX2hlaWdo dCA9IDA7Ci0KLQlkZXYtPm1vZGVfY29uZmlnLm1heF93aWR0aCA9IDIwNDg7Ci0JZGV2LT5tb2Rl X2NvbmZpZy5tYXhfaGVpZ2h0ID0gMjA0ODsKLQotCWRldi0+bW9kZV9jb25maWcuZnVuY3MgPSBk cml2ZXJfZGF0YS0+bW9kZV9jb25maWdfZnVuY3M7Ci19Ci0KIHN0YXRpYyBpbnQga2lyaW5fZHJt X2ttc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJaW50IHJldDsKQEAgLTYwLDcg KzQ5LDExIEBAIHN0YXRpYyBpbnQga2lyaW5fZHJtX2ttc19pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAKIAkvKiBkZXYtPm1vZGVfY29uZmlnIGluaXRpYWxpemF0aW9uICovCiAJZHJtX21v ZGVfY29uZmlnX2luaXQoZGV2KTsKLQlraXJpbl9kcm1fbW9kZV9jb25maWdfaW5pdChkZXYpOwor CWRldi0+bW9kZV9jb25maWcubWluX3dpZHRoID0gMDsKKwlkZXYtPm1vZGVfY29uZmlnLm1pbl9o ZWlnaHQgPSAwOworCWRldi0+bW9kZV9jb25maWcubWF4X3dpZHRoID0gZHJpdmVyX2RhdGEtPmNv bmZpZ19tYXhfd2lkdGg7CisJZGV2LT5tb2RlX2NvbmZpZy5tYXhfaGVpZ2h0ID0gZHJpdmVyX2Rh dGEtPmNvbmZpZ19tYXhfd2lkdGg7CisJZGV2LT5tb2RlX2NvbmZpZy5mdW5jcyA9IGRyaXZlcl9k YXRhLT5tb2RlX2NvbmZpZ19mdW5jczsKIAogCS8qIGRpc3BsYXkgY29udHJvbGxlciBpbml0ICov CiAJcmV0ID0gZHJpdmVyX2RhdGEtPmluaXQodG9fcGxhdGZvcm1fZGV2aWNlKGRldi0+ZGV2KSk7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5oCmlu ZGV4IDU5ZmM4ODguLmFmMjdhY2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGlj b24va2lyaW4va2lyaW5fZHJtX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24v a2lyaW4va2lyaW5fZHJtX2Rydi5oCkBAIC00MSw2ICs0MSw4IEBAIHN0cnVjdCBraXJpbl9wbGFu ZSB7CiBzdHJ1Y3Qga2lyaW5fZHJtX2RhdGEgewogCWNvbnN0IHUzMiAqY2hhbm5lbF9mb3JtYXRz OwogCXUzMiBjaGFubmVsX2Zvcm1hdHNfY250OworCWludCBjb25maWdfbWF4X3dpZHRoOworCWlu dCBjb25maWdfbWF4X2hlaWdodDsKIAl1MzIgbnVtX3BsYW5lczsKIAl1MzIgcHJpbV9wbGFuZTsK IAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bA== 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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 EC933C10F03 for ; Tue, 23 Apr 2019 23:22:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7190218D2 for ; Tue, 23 Apr 2019 23:22:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fTy8g/79" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729172AbfDWXWF (ORCPT ); Tue, 23 Apr 2019 19:22:05 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40370 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728932AbfDWXVZ (ORCPT ); Tue, 23 Apr 2019 19:21:25 -0400 Received: by mail-pg1-f194.google.com with SMTP id d31so8361526pgl.7 for ; Tue, 23 Apr 2019 16:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uz24bMZkViIyZeft57rxEgaLGT+lil7nI2PxrW42mfI=; b=fTy8g/79O0qRKYvKP2RA0bslJG7zvilBCVnEtjN2gYOP06t2CbJd8WhLxUF6wP+avC OA4zDKjq6w/qLqnBAyMmLXGoolHASn1fHzgNoFF4jjFWNN+ixU5A8hHC2X8jljvHZbvK c9vZWThmvpr5SHcmFje/wJEGzWf2M2AnoqigE4QKOwbIMcYPLIBSE7ZsA05BjnhHGGqE Y2rZMgViwnDm+lYCCrABRCAlhPjbcmc13D2EIV16Tct6u54mQi3yCdguIAmtGTO9832/ ut767RhEY0yZcBpSaI9KiekMCnaank+ZjmFwGEk/c56yqj0FHkyudqNvF+G3gMGjhde6 rdrw== 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=uz24bMZkViIyZeft57rxEgaLGT+lil7nI2PxrW42mfI=; b=CbhHTcCsBEwDh6smI0aZdzWaNiWknzPOKOaExTKOr91B7P/AcdR/mkwQ5JTheOeyJO 6wDwqG6hZXMMbbYc+qpRFYBfGJFkoht9fgYuwOX0d2sMbxVmaawnsEMHb/yZsGKhBmRa 1pGLZQ8CB2BoUs1DuncZsRJ2vRxfD+qaTCNtGDbZJlzNGZFENAM5m0DNzB/JtfXTkOoV a8hz+xdqCPtYLHIdVFXkPJQduBCm67YqmGsWLEWvS1cTPfKQgnkWh+A1DwkzME1iNj9z kKZqbfIprDk/VVuo44s3/xj4ggPV/dYXY/VJ3JH02b6rEOGKp3wipFlt2cJ9SxpLOMTq dMWg== X-Gm-Message-State: APjAAAV0HhCj2rHjZKfKtSXGnt8ShEcJRlUDLwZuCsgjaVAX39p2PNKG WK+d/6TToT9+kDyJ5PV9QEdNhEjVJhg= X-Google-Smtp-Source: APXvYqzaQtp/hoCTDB1oJS8t8WWJg3hNjFooU0vTdyY+fPoz4HEer+IeO5PcJE0YZVOjw5Sj4j0vrA== X-Received: by 2002:a62:6807:: with SMTP id d7mr29014610pfc.75.1556061684829; Tue, 23 Apr 2019 16:21:24 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.21.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:24 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel , John Stultz Subject: [PATCH 17/25] drm: kirin: Move config max_width and max_height to driver data Date: Tue, 23 Apr 2019 16:20:48 -0700 Message-Id: <1556061656-1733-18-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch moves the max_width and max_height values used in kirin_drm_mode_config_inita to hardware specific driver data. This will make it easier to add support for new devices via a new kirin_drm_data structure. Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 ++ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 17 +++++------------ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 ++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index b6b1da6..8f15269 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -1054,6 +1054,8 @@ struct kirin_drm_data ade_driver_data = { .prim_plane = ADE_CH1, .channel_formats = channel_formats, .channel_formats_cnt = ARRAY_SIZE(channel_formats), + .config_max_width = 2048, + .config_max_height = 2048, .crtc_helper_funcs = &ade_crtc_helper_funcs, .crtc_funcs = &ade_crtc_funcs, .plane_helper_funcs = &ade_plane_helper_funcs, diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 4b210ea..70fee30 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -41,17 +41,6 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) return 0; } -static void kirin_drm_mode_config_init(struct drm_device *dev) -{ - dev->mode_config.min_width = 0; - dev->mode_config.min_height = 0; - - dev->mode_config.max_width = 2048; - dev->mode_config.max_height = 2048; - - dev->mode_config.funcs = driver_data->mode_config_funcs; -} - static int kirin_drm_kms_init(struct drm_device *dev) { int ret; @@ -60,7 +49,11 @@ static int kirin_drm_kms_init(struct drm_device *dev) /* dev->mode_config initialization */ drm_mode_config_init(dev); - kirin_drm_mode_config_init(dev); + dev->mode_config.min_width = 0; + dev->mode_config.min_height = 0; + dev->mode_config.max_width = driver_data->config_max_width; + dev->mode_config.max_height = driver_data->config_max_width; + dev->mode_config.funcs = driver_data->mode_config_funcs; /* display controller init */ ret = driver_data->init(to_platform_device(dev->dev)); diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index 59fc888..af27acc 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -41,6 +41,8 @@ struct kirin_plane { struct kirin_drm_data { const u32 *channel_formats; u32 channel_formats_cnt; + int config_max_width; + int config_max_height; u32 num_planes; u32 prim_plane; -- 2.7.4