From patchwork Mon Oct 9 18:34:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 150268 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2055066vqo; Mon, 9 Oct 2023 11:38:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEk/xCQLD+LOrhCa8/v3Fy7QD7ndoiAnoY6Whil70MbOie8fgGz6Z8gmuc8yd7pdip9DQEJ X-Received: by 2002:a05:6358:784:b0:13a:d25a:ed7b with SMTP id n4-20020a056358078400b0013ad25aed7bmr11914645rwj.10.1696876717014; Mon, 09 Oct 2023 11:38:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696876716; cv=none; d=google.com; s=arc-20160816; b=CvBnQhoms3aP3ADKW7Losq2GeMiuDNepWpU0a5KLWq9Wcn2bmQHO2Y4bVGJkAwvV4X VVYmpGt7+p1gDPpIFOrogitvOA9Ryu1KXRqVLK1xL/Ziy+HIOfaqB28LDvse+rOYuRq5 GLxUbcMa3aa7nTpsz1zn8EleviHkcLW3UGKCFwRb9pNwduGAhqQx+WBVZcr3ywQb2DN0 pLhkhI1NNxv2Er+ZsiMgBDCPsVjk8m7Kun9dhHeHuMUJLrmgEhPoDpXMTiqpLzEwKKhk FTmjNbbY7NxXsBK2kJTNtOoK9QJ4t5Q8ZTRABggGd9lQB8dmwb8QwOHGkUtOCi+ZBRBL eihw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j5ZrsHwzLorvUYPP8a8dcsR2FiW1aaopcCHsyKU7r9w=; fh=1I5lTY1+ka1279yYKeahgmu2nUf/4FrdOpy00Mbu+g8=; b=oH8BcAGbtsaizdCHo7Wj4b+uZP4szNk883lZGHxE0ycpEQeR/hWj0F1gFQF8CXSo8q Ojl6tCODSHjJ9nrVJhAnaUR4t0G2xWSxsyTwBgthVKBifXXspmwqQzxk0OOAw63S1jtv nA2t4E1LyCPM8VJFYgRoztcQQOEgEkCbw6dybrA8MgtJ3CKXxosjXdWiEAHfau3w7Ql2 tOi51cykv67hHFhaTvsiHnEVm3EH/kxBkTIJYBTeMET6D0poUDNZ5HgoizqwD+FI+fKH lKj8tpDAwE7Ji8SoL/821IJ8R3bBkxMm4aoUMcpFtx3Jp9b1u8V/6/bZmaT9HXn7Be3X fy7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UBzBED79; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id z7-20020a056a00240700b0068fcff1dc3asi8224780pfh.339.2023.10.09.11.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 11:38:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UBzBED79; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id EA484805CF47; Mon, 9 Oct 2023 11:38:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378293AbjJISh0 (ORCPT + 18 others); Mon, 9 Oct 2023 14:37:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377787AbjJIShM (ORCPT ); Mon, 9 Oct 2023 14:37:12 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD51AA4 for ; Mon, 9 Oct 2023 11:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696876581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j5ZrsHwzLorvUYPP8a8dcsR2FiW1aaopcCHsyKU7r9w=; b=UBzBED79ZspZUSpwFPDhuu77j5bq3SV7TBGTPYtEI/0e6++NXZWZk/I8tqXeMN2/cs81rc vLEsewLqO0fXVZSaklH/GSIGuNTUu8jEMDcYvXWv66D97yYY8uQPhxf4C/GYyv4N1msTGy Bt1tUcBrDmf7ZdQvQJfRoZPt4F7jV8A= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-639-5X6HZGfrPbeygmPqagbHJA-1; Mon, 09 Oct 2023 14:36:05 -0400 X-MC-Unique: 5X6HZGfrPbeygmPqagbHJA-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-323334992fbso3420622f8f.1 for ; Mon, 09 Oct 2023 11:36:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696876564; x=1697481364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j5ZrsHwzLorvUYPP8a8dcsR2FiW1aaopcCHsyKU7r9w=; b=sZmxvDMGHE5pdZbgeOY6rr31VEISZAMfgjY8ApUBS6Mv59MlwnEIpaIhMgmJr3y2PP HiLl6b2WsNZhAreChxKfdKzKED0Tu/TqN40ndU7oA7j4dlinfkg49ImJbBO5m3zHWJ1y hm3hHc/YSuPQ8kMBdDU0fEgEjU4ZueBESMappCYkfKtu8nqxlBpOmzcYRhcU+gP5Y/7D Zkozs5/oDzwUwa5+0DzdxKOlu/OLaJ82jtT0yCZI4KrRnLYcL2dBdD/Iu07kakd0Slrz OY691F0b1uJ26erkmcSQxYIbHFRkN3ntnHGjkT1bWZ/5JU4wucsgKgd6/LDWvIxPmrGg hTSQ== X-Gm-Message-State: AOJu0Yz5Cip8n320gB3AEC+e0chgFNzlwQkRswXVk1ydHATATKud51Jh tQWygg2qXuoqkKf3gYcUPhLc8SyiI3HO/8W8sm+2lG0bmR/U43mpzW5EEjOZoWOdjcsZpUnIvDB eD+P/0BvV4nbCKI1XR9WGgzgsV20MGK3hdnMN1YAyaG6BZ3BOroSKyZD/wjKy0UzGXFBjxskmYv ktigy7TgQ= X-Received: by 2002:a5d:5187:0:b0:31f:ec06:20f with SMTP id k7-20020a5d5187000000b0031fec06020fmr13559055wrv.14.1696876564247; Mon, 09 Oct 2023 11:36:04 -0700 (PDT) X-Received: by 2002:a5d:5187:0:b0:31f:ec06:20f with SMTP id k7-20020a5d5187000000b0031fec06020fmr13559037wrv.14.1696876563940; Mon, 09 Oct 2023 11:36:03 -0700 (PDT) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id x8-20020adfcc08000000b003296bb21c77sm9747623wrh.80.2023.10.09.11.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 11:36:03 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Maxime Ripard , Thomas Zimmermann , Geert Uytterhoeven , Javier Martinez Canillas , Daniel Vetter , David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org Subject: [PATCH 4/8] drm/ssd13xx: Use drm_format_info_min_pitch() to calculate the dest_pitch Date: Mon, 9 Oct 2023 20:34:18 +0200 Message-ID: <20231009183522.543918-5-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009183522.543918-1-javierm@redhat.com> References: <20231009183522.543918-1-javierm@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 09 Oct 2023 11:38:34 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779304200274399484 X-GMAIL-MSGID: 1779304200274399484 Don't assume bpp of 1 and instead compute the destination pitch using the intermediate buffer pixel format info when doing a format conversion. Signed-off-by: Javier Martinez Canillas --- drivers/gpu/drm/solomon/ssd13xx.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/solomon/ssd13xx.c b/drivers/gpu/drm/solomon/ssd13xx.c index d29be17665b5..9747f8656636 100644 --- a/drivers/gpu/drm/solomon/ssd13xx.c +++ b/drivers/gpu/drm/solomon/ssd13xx.c @@ -148,6 +148,8 @@ struct ssd13xx_plane_state { struct drm_shadow_plane_state base; /* Intermediate buffer to convert pixels from XRGB8888 to HW format */ u8 *buffer; + /* Pixel format info for the intermediate buffer */ + const struct drm_format_info *fi; }; static inline struct ssd13xx_crtc_state *to_ssd13xx_crtc_state(struct drm_crtc_state *state) @@ -602,8 +604,9 @@ static void ssd13xx_clear_screen(struct ssd13xx_device *ssd13xx, u8 *data_array) static int ssd13xx_fb_blit_rect(struct drm_framebuffer *fb, const struct iosys_map *vmap, - struct drm_rect *rect, - u8 *buf, u8 *data_array) + struct drm_rect *rect, u8 *buf, + const struct drm_format_info *fi, + u8 *data_array) { struct ssd13xx_device *ssd13xx = drm_to_ssd13xx(fb->dev); struct iosys_map dst; @@ -614,7 +617,7 @@ static int ssd13xx_fb_blit_rect(struct drm_framebuffer *fb, rect->y1 = round_down(rect->y1, SSD130X_PAGE_HEIGHT); rect->y2 = min_t(unsigned int, round_up(rect->y2, SSD130X_PAGE_HEIGHT), ssd13xx->height); - dst_pitch = DIV_ROUND_UP(drm_rect_width(rect), 8); + dst_pitch = drm_format_info_min_pitch(fi, 0, drm_rect_width(rect)); ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE); if (ret) @@ -664,6 +667,8 @@ static int ssd13xx_primary_plane_atomic_check(struct drm_plane *plane, if (!ssd13xx_state->buffer) return -ENOMEM; + ssd13xx_state->fi = fi; + return 0; } @@ -695,6 +700,7 @@ static void ssd13xx_primary_plane_atomic_update(struct drm_plane *plane, ssd13xx_fb_blit_rect(fb, &shadow_plane_state->data[0], &dst_clip, ssd13xx_plane_state->buffer, + ssd13xx_plane_state->fi, ssd13xx_crtc_state->data_array); }