From patchwork Tue Apr 23 23:20:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 162754 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4354880jan; Tue, 23 Apr 2019 16:21:25 -0700 (PDT) X-Received: by 2002:a62:47d0:: with SMTP id p77mr29164137pfi.95.1556061685224; Tue, 23 Apr 2019 16:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556061685; cv=none; d=google.com; s=arc-20160816; b=njZbDKjQudgZcwTltHh3GHcPORjX9M5srqcT9u1DtGIBNsc5LqpU0Y6CkGv3DDNYNC 7BiExnXFvVQh0nl9Dm+IDbc8UoZnijPlB40JO/5RPT4RNBwQAC7KihixxZE8A+rjaIgi CuW1B8Z+3jK+3GOBFE2utqyzSM2YF7+LSVAXENHq346fzvRmIBPRDz/4TA8unwt49r1U 8k0n/1Dze0LITFsKIpg5eN8kL3NBt90mQ4AN194CyIoJkisTLP9EXk/AEKogocF4vzU+ JHtekRP2xbqQ7hwh47/9d41qXUlCQ7tPmtazOgAsLX4/dOCpt/ugt83A9+ZxOUDNIuwC bkBQ== 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=uz24bMZkViIyZeft57rxEgaLGT+lil7nI2PxrW42mfI=; b=0POvgijJ8DWf2k6RtNwyFQf8zCbOTesqupBmzrp6OYSTAS+bHfKS6DJaQFrIrUY8bV wdn0Ay9/qVt2E+yYf0o3NYCAMH9+19/n/NwNO+jIEGZksDs5qn+hxQ2a8JnbRIbHiz4I PZw6kOfVWPoAxv+CbdY5900wkvv7Bhy5rac1Fyg3FPuZBbqOQnUPWfaK9k+1VdCOTczq AityiRkakhzLHEwaGpDCIQp3OXC172eK0BPJoq7yuSvOKeUTgt93IdwNw3weT5mrBYcM RalJUobW+kYcbAzTQxvqIu0bvSpRphBi9o9PWNXu30+KmU13+e1BVo2UtKzQkDlxbQAI P7HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fTy8g/79"; 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 k4sor19497406pfa.53.2019.04.23.16.21.25 for (Google Transport Security); Tue, 23 Apr 2019 16:21:25 -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="fTy8g/79"; 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=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=DK0fYNgoHCL0hEj/9oSVvWO7s8qiFsxfF8UH0CNWn8GkF6j8BIKTWeW8FwP2jrgeb4 4hSY3iVWEn+N5w0dieHBivG28okjyXY+E3bBq2SEilEOCRWU0A0TnMV6n6dW7utl2aO2 gidX6cQzaVxHUhCDbokkIkAm/jQJSax6hcCdRBcTalPr4zglW26qWGEDTlthYbkJn6oc 7RX1iLUcVdVz+UVPJhCfYTO/duw7tzSBN/JWQE2PTXg+1oXSXA5DgApxdwacwYn1rJ1p 52e+LmQZo9DvP62rYJcPb3LM28FbqTa4OSFpRce4B0dqigVSTyvYqEB3DFClFWvN/k37 eluw== X-Gm-Message-State: APjAAAVhtcPShD+JWn779qTQn9clP8SyCctZgXMQmBRpOCxFvZr+X1lE 1HkVwu+zerzsYPM9WLKSYgun9VC+ 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) Return-Path: 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> 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(-) -- 2.7.4 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;