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=-3.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 874D3C433DF for ; Wed, 27 May 2020 18:26:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 683612089D for ; Wed, 27 May 2020 18:26:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=anholt-net.20150623.gappssmtp.com header.i=@anholt-net.20150623.gappssmtp.com header.b="jVDU6dAI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391976AbgE0S00 (ORCPT ); Wed, 27 May 2020 14:26:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389214AbgE0S0Z (ORCPT ); Wed, 27 May 2020 14:26:25 -0400 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E41FC08C5C1 for ; Wed, 27 May 2020 11:26:25 -0700 (PDT) Received: by mail-lj1-x242.google.com with SMTP id z18so30121198lji.12 for ; Wed, 27 May 2020 11:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anholt-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QB7YwKLcAEW/NVxETJ/RRwZrpqw1ubcJORL5utvFFXU=; b=jVDU6dAIH5AMHvUenFCLEWc4e55tCqNJdfkNlGCKtdQ94FJ2ncc6VGQQ6rttsFcAyl dqtMPPBIon1Ieua2HOivG/UGPk9Ax02cmVxtlqyXA4gNg4qCWoTPim7JDk6SxP0y+Snc KqNNJXD4/Fwdr13n9LZMd/DSXHh7ebYllwc7RsOiaeEfmid5gUShCMZoJaA/zHhugQ+3 vXiq57zCHznETZPv6jo2AMUFiicPgZ5MgBnBGNQ2/aZdxQdxbjj4kALa2fBrOfUuIFU2 2SKqQuH6ewCZ4tiwHO47DhJaRPS5pt/diRpda0vF7ojfHnwoJpJnohxNt+gtNrB5K2Ax G+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QB7YwKLcAEW/NVxETJ/RRwZrpqw1ubcJORL5utvFFXU=; b=Qqptq0+Rv9Nk4S9QGPJMprte4Qahxqc3SUrNAGYxGzkffr5i6L5+xMl/Ue6AVLqJtv 0nDgTfOll1xWGDZiyzUxcfc0DVb2QzJ8zHCs/4d/YzN68HuLTdg1ZAECqjzjRYbxZteV ElV4bdlAdMIgdfOBi7v892JCfBhEWZsMekjaVjEJ+Gf1/XTZ2n/4hJTsidBxVmglK1x8 EGEnbvtYD7osr6b3tZjzsNeU85nGkNSQRv7aD15RXKqkCUvT8zOFuNN9An40+ZkAE6T7 BdUSNfXOCFZNU6URNrAEUaktI3wijuypanJuinAqj9uEeUWmK0jhEXRDlYhK59Qf2yG8 gfJw== X-Gm-Message-State: AOAM533PdQhgj3i4uXybZRVlNU/tk3yQ00S6cwqPD7cu7RmgPjjk99Rt gaV6yJp2YIfvkPOE4Xi+35is4OQIjs7RZyHUPv/XwA== X-Google-Smtp-Source: ABdhPJxA8oAlyNouzKzEzxB2DjfrFnm6s4bMaRIjUr0L/MTi6rlsrHzCde2XffFmTHZekkBhimOM52uiHfe7MBRTvrc= X-Received: by 2002:a2e:8186:: with SMTP id e6mr3843593ljg.252.1590603983554; Wed, 27 May 2020 11:26:23 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Eric Anholt Date: Wed, 27 May 2020 11:26:12 -0700 Message-ID: Subject: Re: [PATCH v3 041/105] drm/vc4: crtc: Move HVS mode config to HVS file To: Maxime Ripard Cc: Nicolas Saenz Julienne , DRI Development , linux-rpi-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Dave Stevenson , Tim Gover , Phil Elwell Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 27, 2020 at 8:50 AM Maxime Ripard wrote: > > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/vc4/vc4_crtc.c | 272 +------------------------------- > drivers/gpu/drm/vc4/vc4_drv.h | 5 +- > drivers/gpu/drm/vc4/vc4_hvs.c | 298 ++++++++++++++++++++++++++++++++++- > 3 files changed, 309 insertions(+), 266 deletions(-) > static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) > { > - struct drm_device *dev = crtc->dev; > - struct vc4_dev *vc4 = to_vc4_dev(dev); > struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); > struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state); > - struct drm_display_mode *mode = &crtc->state->adjusted_mode; > - bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE; > bool debug_dump_regs = false; > > if (debug_dump_regs) { > @@ -418,42 +372,10 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) > drm_print_regset32(&p, &vc4_crtc->regset); > } > > - if (vc4_crtc->data->hvs_output == 2) { > - u32 dispctrl; > - u32 dsp3_mux; > - > - /* > - * SCALER_DISPCTRL_DSP3 = X, where X < 2 means 'connect DSP3 to > - * FIFO X'. > - * SCALER_DISPCTRL_DSP3 = 3 means 'disable DSP 3'. > - * > - * DSP3 is connected to FIFO2 unless the transposer is > - * enabled. In this case, FIFO 2 is directly accessed by the > - * TXP IP, and we need to disable the FIFO2 -> pixelvalve1 > - * route. > - */ > - if (vc4_state->feed_txp) > - dsp3_mux = VC4_SET_FIELD(3, SCALER_DISPCTRL_DSP3_MUX); > - else > - dsp3_mux = VC4_SET_FIELD(2, SCALER_DISPCTRL_DSP3_MUX); > - > - dispctrl = HVS_READ(SCALER_DISPCTRL) & > - ~SCALER_DISPCTRL_DSP3_MUX_MASK; > - HVS_WRITE(SCALER_DISPCTRL, dispctrl | dsp3_mux); > - } I just noticed, this block being moved looks like it should probably have been removed as part of patch #33. Cleaning this up I think will impact the following patches. 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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 75F85C433E2 for ; Wed, 27 May 2020 18:26:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46E7B2089D for ; Wed, 27 May 2020 18:26:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="C/5bisNM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=anholt-net.20150623.gappssmtp.com header.i=@anholt-net.20150623.gappssmtp.com header.b="jVDU6dAI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46E7B2089D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anholt.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=orOfaOAg18MVA0pe25+U6M0BiTHpse9hBPNkNFYvC0o=; b=C/5bisNM1+oHb6 +ntm7eQ6j1j41FTrW4B3tCUoYvrXT/YTYa0AyPnYgln/xjoRVNHtt/J8+WOFm6kixPU3h5jzugDnv V/ihEfsCZTt4LANqY/niZf0D0rweTXB49HRy/hDnHiTweYBSYmEnK4Tq46I+g7+u2kjSOUjiaC8BV V96DRGUnR2dHtYFwZrhLhTyZkQeASYvW6+T3Ki0opvGRiy3W9jiwDTMk6KKMNEShU0nTdd+hDLMTw MeJZLZGduaT/Tsgu4Rhz2QUHlQQSUObfXv+12k5IOQ6/ocpscgWEa+SyK0+0Zxnq6StCPlAHnO1yc FhV/Q5pK7aXQxGy4VT4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1je0l1-0003Zl-V2; Wed, 27 May 2020 18:26:27 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1je0kz-0003Yz-FF for linux-arm-kernel@lists.infradead.org; Wed, 27 May 2020 18:26:26 +0000 Received: by mail-lj1-x242.google.com with SMTP id l15so29807227lje.9 for ; Wed, 27 May 2020 11:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anholt-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QB7YwKLcAEW/NVxETJ/RRwZrpqw1ubcJORL5utvFFXU=; b=jVDU6dAIH5AMHvUenFCLEWc4e55tCqNJdfkNlGCKtdQ94FJ2ncc6VGQQ6rttsFcAyl dqtMPPBIon1Ieua2HOivG/UGPk9Ax02cmVxtlqyXA4gNg4qCWoTPim7JDk6SxP0y+Snc KqNNJXD4/Fwdr13n9LZMd/DSXHh7ebYllwc7RsOiaeEfmid5gUShCMZoJaA/zHhugQ+3 vXiq57zCHznETZPv6jo2AMUFiicPgZ5MgBnBGNQ2/aZdxQdxbjj4kALa2fBrOfUuIFU2 2SKqQuH6ewCZ4tiwHO47DhJaRPS5pt/diRpda0vF7ojfHnwoJpJnohxNt+gtNrB5K2Ax G+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QB7YwKLcAEW/NVxETJ/RRwZrpqw1ubcJORL5utvFFXU=; b=iq32KZ6SfieHSzDYcoV3X00Q0nz+l80jGS93OItWPCGMRHzS3o5bwvBZzHfxnGVh46 lxv9+XXyDV0lpJkFWzzT1tbi8qZzhtsyny6xy+xJs6dhEVUaWzeQsaDaBSpupD40exSo 7QBZb3g6jqTQsz9rsO4zF3pKSx32J12xtR1UsVNKTEieUZc1xLDVDa/iusIn0Mf70qrU oZl5ryX9d7gm1xwkZN6qGSNNtkn1JTQQ1jCTzjeu26JEIyfnjXWQdm93jzA08ILdve+M IXPKQoQ2PDdWHlkC71N8JBtLzZLiedkUnSuRwNNDdXJ7hxgYCJCSCgrm/gO5OlOGp0n3 PEXQ== X-Gm-Message-State: AOAM5319pqwb1pFoMALxzFz8tMLqgGazTSZE9oVC/ZYXHrLv89x+S0og uOBXz4buRPIyr/2gdMpJmawoOTU/QYMgZD5mfW/mMw== X-Google-Smtp-Source: ABdhPJxA8oAlyNouzKzEzxB2DjfrFnm6s4bMaRIjUr0L/MTi6rlsrHzCde2XffFmTHZekkBhimOM52uiHfe7MBRTvrc= X-Received: by 2002:a2e:8186:: with SMTP id e6mr3843593ljg.252.1590603983554; Wed, 27 May 2020 11:26:23 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Eric Anholt Date: Wed, 27 May 2020 11:26:12 -0700 Message-ID: Subject: Re: [PATCH v3 041/105] drm/vc4: crtc: Move HVS mode config to HVS file To: Maxime Ripard X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200527_112625_511930_B33EA543 X-CRM114-Status: GOOD ( 14.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tim Gover , Dave Stevenson , linux-kernel@vger.kernel.org, DRI Development , bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne , Phil Elwell , linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, May 27, 2020 at 8:50 AM Maxime Ripard wrote: > > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/vc4/vc4_crtc.c | 272 +------------------------------- > drivers/gpu/drm/vc4/vc4_drv.h | 5 +- > drivers/gpu/drm/vc4/vc4_hvs.c | 298 ++++++++++++++++++++++++++++++++++- > 3 files changed, 309 insertions(+), 266 deletions(-) > static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) > { > - struct drm_device *dev = crtc->dev; > - struct vc4_dev *vc4 = to_vc4_dev(dev); > struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); > struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state); > - struct drm_display_mode *mode = &crtc->state->adjusted_mode; > - bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE; > bool debug_dump_regs = false; > > if (debug_dump_regs) { > @@ -418,42 +372,10 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) > drm_print_regset32(&p, &vc4_crtc->regset); > } > > - if (vc4_crtc->data->hvs_output == 2) { > - u32 dispctrl; > - u32 dsp3_mux; > - > - /* > - * SCALER_DISPCTRL_DSP3 = X, where X < 2 means 'connect DSP3 to > - * FIFO X'. > - * SCALER_DISPCTRL_DSP3 = 3 means 'disable DSP 3'. > - * > - * DSP3 is connected to FIFO2 unless the transposer is > - * enabled. In this case, FIFO 2 is directly accessed by the > - * TXP IP, and we need to disable the FIFO2 -> pixelvalve1 > - * route. > - */ > - if (vc4_state->feed_txp) > - dsp3_mux = VC4_SET_FIELD(3, SCALER_DISPCTRL_DSP3_MUX); > - else > - dsp3_mux = VC4_SET_FIELD(2, SCALER_DISPCTRL_DSP3_MUX); > - > - dispctrl = HVS_READ(SCALER_DISPCTRL) & > - ~SCALER_DISPCTRL_DSP3_MUX_MASK; > - HVS_WRITE(SCALER_DISPCTRL, dispctrl | dsp3_mux); > - } I just noticed, this block being moved looks like it should probably have been removed as part of patch #33. Cleaning this up I think will impact the following patches. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 1576AC433E0 for ; Wed, 27 May 2020 18:26:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D5AA620890 for ; Wed, 27 May 2020 18:26:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=anholt-net.20150623.gappssmtp.com header.i=@anholt-net.20150623.gappssmtp.com header.b="jVDU6dAI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5AA620890 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anholt.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4359F6E3A0; Wed, 27 May 2020 18:26:26 +0000 (UTC) Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4458B6E395 for ; Wed, 27 May 2020 18:26:25 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id w10so30206406ljo.0 for ; Wed, 27 May 2020 11:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anholt-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QB7YwKLcAEW/NVxETJ/RRwZrpqw1ubcJORL5utvFFXU=; b=jVDU6dAIH5AMHvUenFCLEWc4e55tCqNJdfkNlGCKtdQ94FJ2ncc6VGQQ6rttsFcAyl dqtMPPBIon1Ieua2HOivG/UGPk9Ax02cmVxtlqyXA4gNg4qCWoTPim7JDk6SxP0y+Snc KqNNJXD4/Fwdr13n9LZMd/DSXHh7ebYllwc7RsOiaeEfmid5gUShCMZoJaA/zHhugQ+3 vXiq57zCHznETZPv6jo2AMUFiicPgZ5MgBnBGNQ2/aZdxQdxbjj4kALa2fBrOfUuIFU2 2SKqQuH6ewCZ4tiwHO47DhJaRPS5pt/diRpda0vF7ojfHnwoJpJnohxNt+gtNrB5K2Ax G+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QB7YwKLcAEW/NVxETJ/RRwZrpqw1ubcJORL5utvFFXU=; b=YrpdXrsqucL6KneDW0GzHN7pLM2hWJxWRGx+TMPS7O+o/FO0kiPbuTJ2cTxTELB2Er 8d2q+rerz+NI2T6Q5khcTsF+OPgr8WRR1CCaBufnRuHdR58T00gBer1AzZJ4wXq8vm+c PXJvXhhvfEXvufyXHveOkKrqZ/dp26pvzWKDwNxx97NOcMdZFRLKKqm5nCvxvvfiaQ6x yxNTaAU7Dlel9KoScVLUw3nXn0jFf+FYTxvq1tDlhLmCjhxqWhmQZxB2mN5UxWHMq9Lt 1b5O2uZ2bxNMI0ibClMlKQtHLDVLgf7vVmj9NirSytUSxMruRfgmkLPs9wz4zG1X5CoF 8RTw== X-Gm-Message-State: AOAM530aXV6SzTjLdgekA9XU4WP8/iSiTji/hr0KBVINFkw6LXen1rCs RsKj+ZzQSDLj+/9/vEXYFebcC6y26TT+9y2N/6awFA== X-Google-Smtp-Source: ABdhPJxA8oAlyNouzKzEzxB2DjfrFnm6s4bMaRIjUr0L/MTi6rlsrHzCde2XffFmTHZekkBhimOM52uiHfe7MBRTvrc= X-Received: by 2002:a2e:8186:: with SMTP id e6mr3843593ljg.252.1590603983554; Wed, 27 May 2020 11:26:23 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Eric Anholt Date: Wed, 27 May 2020 11:26:12 -0700 Message-ID: Subject: Re: [PATCH v3 041/105] drm/vc4: crtc: Move HVS mode config to HVS file To: Maxime Ripard X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tim Gover , Dave Stevenson , linux-kernel@vger.kernel.org, DRI Development , bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne , Phil Elwell , linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, May 27, 2020 at 8:50 AM Maxime Ripard wrote: > > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/vc4/vc4_crtc.c | 272 +------------------------------- > drivers/gpu/drm/vc4/vc4_drv.h | 5 +- > drivers/gpu/drm/vc4/vc4_hvs.c | 298 ++++++++++++++++++++++++++++++++++- > 3 files changed, 309 insertions(+), 266 deletions(-) > static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) > { > - struct drm_device *dev = crtc->dev; > - struct vc4_dev *vc4 = to_vc4_dev(dev); > struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); > struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state); > - struct drm_display_mode *mode = &crtc->state->adjusted_mode; > - bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE; > bool debug_dump_regs = false; > > if (debug_dump_regs) { > @@ -418,42 +372,10 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc) > drm_print_regset32(&p, &vc4_crtc->regset); > } > > - if (vc4_crtc->data->hvs_output == 2) { > - u32 dispctrl; > - u32 dsp3_mux; > - > - /* > - * SCALER_DISPCTRL_DSP3 = X, where X < 2 means 'connect DSP3 to > - * FIFO X'. > - * SCALER_DISPCTRL_DSP3 = 3 means 'disable DSP 3'. > - * > - * DSP3 is connected to FIFO2 unless the transposer is > - * enabled. In this case, FIFO 2 is directly accessed by the > - * TXP IP, and we need to disable the FIFO2 -> pixelvalve1 > - * route. > - */ > - if (vc4_state->feed_txp) > - dsp3_mux = VC4_SET_FIELD(3, SCALER_DISPCTRL_DSP3_MUX); > - else > - dsp3_mux = VC4_SET_FIELD(2, SCALER_DISPCTRL_DSP3_MUX); > - > - dispctrl = HVS_READ(SCALER_DISPCTRL) & > - ~SCALER_DISPCTRL_DSP3_MUX_MASK; > - HVS_WRITE(SCALER_DISPCTRL, dispctrl | dsp3_mux); > - } I just noticed, this block being moved looks like it should probably have been removed as part of patch #33. Cleaning this up I think will impact the following patches. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel