From patchwork Thu Aug 1 03:44:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170296 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836403ile; Wed, 31 Jul 2019 20:45:14 -0700 (PDT) X-Received: by 2002:a17:902:23:: with SMTP id 32mr36812774pla.34.1564631114068; Wed, 31 Jul 2019 20:45:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631114; cv=none; d=google.com; s=arc-20160816; b=HZmDRbZtAWtofPZd4QX2eTHVo1xtwAEDC7/jY9ZpnTiL7DlZp90vrobZcVWvK0Ni0s aAEH8ZsBTgDrbVSYx2v68K7LBuYZQGC52hP5r71vq9HupTKZYMgtPAmC6xRiSYhdyhOh xsAwtK/dXYV0g07D/yFrl40/fKfvMRNWdwXEU42m4veFSRQ+Qo+sdZiq3bBzy8qrsV26 a5JpFmCjhZYMmoXEEHyMYp9tLG3eSyQcxmmjs+zPqxaulkuOniVmhrnZp5jvdxE36src tQs3J85n+pHIb7w0Gt3j62BuwPB76gyJVcefSVqyN6jTL+w/iiNk715NgVDtddwNNE7h ntcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dQGpl/nhmhJMZKv4Vo2Ohuy0f7yCwYFz4OhCfH7eIeY=; b=KwhYe8w6TZikV9CMvFou2492B0EevVa3/x4Aao1g6hAFmIUpghkDqh7ZNyHjpmfRV/ IBttGjZCKK17EhqpQOSFNrAtEc3cysAGqlz39leAmLj28P/45DHfQwEnBvAPPV2e8gVL cgKM/0Y1DCCNkSEt60PXqNA6MIhiefOOyOWB/0DM/0J75710hMyr5Vu4CHYHClwJ7Kmv f7lM6UmfbD9g/rQVyrJ7PwaZ+5bYaOXV4/bJ40n8bn3F3svGQmSryM6wUQlL4oNJ3MIv NC0rs7tCmlufo+G3cId+r+JlH7OTWP6LR2TB0Ml67otB+rNQL8UMCXEyuphKnfE3sK0p DNdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ml5jZwzg; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id r27sor51794468pfq.73.2019.07.31.20.45.14 for (Google Transport Security); Wed, 31 Jul 2019 20:45:14 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ml5jZwzg; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=dQGpl/nhmhJMZKv4Vo2Ohuy0f7yCwYFz4OhCfH7eIeY=; b=Ml5jZwzgL9rml4OFZjIub8zA/hmbDsOyOb5pgnwxP8CMB7+tMg38nXgrLV9QItM0En qKnXPeARSc4hO5vYz3U72ZS+AbG/jki8te5+3Pa36+Hi5RXUTdXBYD+4DT3Lht1i1d9I IgweV9STmp3PcjCZXgsTo+4sQj/B5CBB6+Ke8iqJqTokeJMdeN633a0emO7H0aLkXTGr Rs1GxKc91yTpK7K8rqrAOot9Lc9/qJal+/7iafr7L03c2VHcbKHxv5l8+Q+byqBX7JXK S1l68eVlYRWBEQAMu3OLAuLVld+I8FgFipQTXxzEL7CloNqZ0dbQ9uTV3RX1C/NH6qq2 CLBg== 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=dQGpl/nhmhJMZKv4Vo2Ohuy0f7yCwYFz4OhCfH7eIeY=; b=S3sKdqQxpF9yZS+uvHYOaMe8Fb9Kv1X8BryaI61C5saLCc59uXjTOh+//zBTAky8hW 38eFi4KOFomxi5P4GgGDHXVvh+ddF3DSkngE1KgihhvepliU7dZ3Fxr6yKFsYDbKLQgA rHAzpTXuA0SABSQ0N8jeLPjkJ+vx7WVpWzwzdkqu4g/n1Hu41MsIlueZIAlt5RVBWjpF Egqzn3Oyi4IyLXkccW0sWqmSOhfZAGaz1QGbgLrXVVfhHZR6FXRjRDnIyh1WcfLVaEYX FS7IRW9kGo3RZwKaZV/tyXLMEZohDMVSdblOXqZsWkgSMWjd/Jp98kvdITB4Qur8QjPZ whWw== X-Gm-Message-State: APjAAAWde/kaztffBQ8kHYEEwHRfj6QuvQ1EcbYE1FRG8huJMuX3Bvyw 30Y3mcgyPB0OiCjGR8+zOa8DGxaF X-Google-Smtp-Source: APXvYqyE9OksfN4t4uiO+wXMjLvxL1N0wCPPp8i87h6D2b8CP8sDMRKmHanTkkY//Kt3QIQTtMyLOw== X-Received: by 2002:aa7:93bb:: with SMTP id x27mr52443201pff.10.1564631113669; Wed, 31 Jul 2019 20:45:13 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id h70sm64775674pgc.36.2019.07.31.20.45.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:12 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v3 18/26] drm: kirin: Move config max_width and max_height to driver data Date: Thu, 1 Aug 2019 03:44:31 +0000 Message-Id: <20190801034439.98227-19-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190801034439.98227-1-john.stultz@linaro.org> References: <20190801034439.98227-1-john.stultz@linaro.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: Rongrong Zou Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Reviewed-by: Sam Ravnborg 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(-) -- 2.17.1 diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index fc0f4c04d1c9..68efd508d86b 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 bf1e601fb367..7956d698d368 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -39,17 +39,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; @@ -58,7 +47,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 2b660df60293..43be65f82a03 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -37,6 +37,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;