From patchwork Thu Aug 1 03:44:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170285 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836070ile; Wed, 31 Jul 2019 20:44:55 -0700 (PDT) X-Received: by 2002:a63:fd57:: with SMTP id m23mr51720704pgj.204.1564631095273; Wed, 31 Jul 2019 20:44:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631095; cv=none; d=google.com; s=arc-20160816; b=JPe/BA+rEyTTegEFrw7nJkycUvr8JSShfs7qgSa6O67CGmOOT0DZv5tjtK/X6Dinwd qmBrfd1oi3dvbJr77FOK0UYVZwmkKPKPeQ0DjCB4mB6noUoVy3YWNekUouXARhRjKYRf S4xsn9Zyb2jgCj6/2u9GjjCDL0eD/7sUBqf/lzEGhY3u82bqSaMc0l1ng0G4MoDcWT4+ StNJNERtDu8RXdJmsS++ILDcZdANfE6ECx/t8vZwvD6ruCgYbYLTS/Y5j169h0eRm9La Cge9l3qPVW/ny0yOUGhdRkVGqs87OhVLbBxNBWzz00BgJONjhksFi/7quoNyBDoEDe36 AOyg== 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=sbuPXH3VdFgx7EyiYaXP+7dzAxv9Alyn24o+MicDc3g=; b=wQSSWUwM8Fa4NL8cECFVQscEZa1aLnw4pFPF2fmlSD6u/3azdILUcZy2NuAlk4ciY/ RAmhKnmKx+xXwzGioR3VuT5jT1AmrwPbYcB3UFUMb4+saa26ct/Ig++vNLi6muqe4wIv mDUwpBdtfDG8J4aQ/K+jHdd9NRJAMmhPTvSI3MYJyQh3GQ5PkczDqZn0gL1agvdu/Tv4 Numiao4T6IgxC4oD5j1ArbbloAohOX4k2VILvJZCtZoj2FaZLhQ1asQ1AK267uIg4iZZ 6dnJV6AResKKASg3ztgLHcVk1ltTcCKhkrCfZzT41jxKaasgomu2o2gsHhWQu5QZDXic LPCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PNeeTf6C; 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 f2sor84642120plj.43.2019.07.31.20.44.55 for (Google Transport Security); Wed, 31 Jul 2019 20:44:55 -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=PNeeTf6C; 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=sbuPXH3VdFgx7EyiYaXP+7dzAxv9Alyn24o+MicDc3g=; b=PNeeTf6CHxZtmleLM42uzK+kmr5gR/nqDqqSxXjOubaNccBQf+PsluK79zu0fwrSK+ YoHl+OQVP6HivC2BNict9dp1CyvV92P83bB6AWsTC3CVograuwWVb4kcT+hlEYaNy6wp Yg/bNu/6r4VSnp4z3mHIFpPe/vpNDSgp8eAFPSm7pvHCtjSSaluDT8aj4GyXeKcucv22 b/HWFxXZrbLewuFpZLwasAJcrr/89VT07i0bFvV/kmgWDbyAlQZpk95AIWRCHzN/U6cg Y30/O1WPhktFVgstl5QrhZ1km8wStdhadRCk3VhyfPuerwjrQZ7GLJaeMMhq5xXAv976 oF7w== 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=sbuPXH3VdFgx7EyiYaXP+7dzAxv9Alyn24o+MicDc3g=; b=AtCQPWPV//EanbhVf8d6N3oVFUNlieo4ycCluvslcjd3bqxktEKOmcbLw/f3XnktaR cTiF5IcwWY7Bego4XDXNgLg6jpg+NBc626mEgdjphz9DZX8t9/iwaN1tOCyDZ2lVle5F D5nT9MTRQA1seLkHL62iBdYO23W6jGw7lSWoOa3WB+8K9Nu62UlJTRm6hou0+pok/YPt O4kzaB57QUyBSaWhDFthQT1oN5fBYS/xx9PVWGN6GUgkj93tYVhwORpcVeJEmaOFJpeH uEnqZo+Wz76UhjxL8Vc7mKqlLmKhOe5RAL5sKSqzOY+5a7hz1ZhDRbXqH4JNLbfpkyy7 6/dQ== X-Gm-Message-State: APjAAAWlCf+MGEDMoM5iqXX3SQNQ01lfysQVmo353Pxw+bOzOE2bu2Xf Zbfr6/fJLaKtZiUfo0KbCO/App3F X-Google-Smtp-Source: APXvYqzmcmx5lYagz1N9Qyr8XCKv26OVvf3N44AMBU0z4Wll3KHYXMUEXbb/sT/a1R0ggUgnTgQ42w== X-Received: by 2002:a17:902:2987:: with SMTP id h7mr29146186plb.37.1564631094884; Wed, 31 Jul 2019 20:44:54 -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.44.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:44:54 -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 06/26] drm: kirin: Remove out_format from ade_crtc Date: Thu, 1 Aug 2019 03:44:19 +0000 Message-Id: <20190801034439.98227-7-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 removes the out_format field in the struct ade_crtc, which was only ever set to LDI_OUT_RGB_888. Thus this patch removes the field and instead directly uses LDI_OUT_RGB_888. 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 | 9 +++------ 1 file changed, 3 insertions(+), 6 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 756aefd5bcff..73dff21bed6a 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -60,7 +60,6 @@ struct ade_crtc { struct ade_hw_ctx *ctx; struct work_struct display_reset_wq; bool enable; - u32 out_format; }; struct ade_plane { @@ -383,11 +382,10 @@ static irqreturn_t ade_irq_handler(int irq, void *data) return IRQ_HANDLED; } -static void ade_display_enable(struct ade_crtc *acrtc) +static void ade_display_enable(struct ade_hw_ctx *ctx) { - struct ade_hw_ctx *ctx = acrtc->ctx; void __iomem *base = ctx->base; - u32 out_fmt = acrtc->out_format; + u32 out_fmt = LDI_OUT_RGB_888; /* enable output overlay compositor */ writel(ADE_ENABLE, base + ADE_OVLYX_CTL(OUT_OVLY)); @@ -514,7 +512,7 @@ static void ade_crtc_atomic_enable(struct drm_crtc *crtc, } ade_set_medianoc_qos(ctx); - ade_display_enable(acrtc); + ade_display_enable(ctx); ade_dump_regs(ctx->base); drm_crtc_vblank_on(crtc); acrtc->enable = true; @@ -1024,7 +1022,6 @@ static int ade_drm_init(struct platform_device *pdev) ctx = &ade->ctx; acrtc = &ade->acrtc; acrtc->ctx = ctx; - acrtc->out_format = LDI_OUT_RGB_888; ret = ade_dts_parse(pdev, ctx); if (ret)