From patchwork Thu Feb 3 08:26:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 539584 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp2222973imr; Thu, 3 Feb 2022 00:26:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXr7YvdYLI4h5TbRChKgvdtYlSIEQimktgo7/3dt6HSbY1b5qU84VSdFE5mVvl9eS3nUsm X-Received: by 2002:a17:902:9a06:: with SMTP id v6mr17361122plp.109.1643876781173; Thu, 03 Feb 2022 00:26:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643876781; cv=none; d=google.com; s=arc-20160816; b=PmHL9E4fYb84nTUzjKUTDpkSnieWu53r4Mp7TrDhZoS+0humjMeZbcnidZWTIuRvK/ hXROpLNrjGg2A7Jw/T6Njnr+8AYPUWNg4TqBTloRpBXYetvbNzT922cpyahbkWl64R4x h4h9rw4UfBM0xMh0yajdl4/yBHJ38v0oSH5IlRorNJgHIXo/WYSFNK3JK8P4Phg5okbC z7Triu0BX59rK9aMIe4OTeWidjb6TB4iGTX0b2K++mRnwPLoTvERa2MXVKVvoArlaKRy wUAY6doqoYxaxxYQxmlNKtEDFB8qbxttMgr7t7fCArRlIbPJg1SnEM8oe+HS4BZ97hAt o/rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=sfwEed+GJAr0KDwg+GYGg8QDt2lqdwbQp3DHVhIOZQQ=; b=SFqrd9gIBlGBLwXgqv5P/Oc3tL0z6ociN4fhdbnTQl6+j9AFvQrgEWPG5WgQcC+2Nh oO2FmEz4/8DRbet2VH2MieaLMwIHSirxo/V/h3GVO21X21nS+K/AntYGs2Weih+KX1rY fY8MByYYRq9QQaVU1cBDnnwV9Pd1eBrmA19lvguT+9g1KrMk3OikJ5Lqy3aMNfylpOqz ozeUs5Lr5wWHS9hcPgjlhdGS+NUPxFZ0A5bAaTB7uwwCNlqmb9Lk5vU20stce7CoYkAr bv9Ze38XXRjY7ZNCP5/dAm6+NkgpoBx8P1whcBtTdkkOZcDwSWvpMzm1Et4LJIhrgI3+ jlLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XWqsNZ+t; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id nu18si7232082pjb.172.2022.02.03.00.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 00:26:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XWqsNZ+t; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8305110EBE1; Thu, 3 Feb 2022 08:26:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0BD2310EA09 for ; Thu, 3 Feb 2022 08:26:16 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id t7so2749034ljc.10 for ; Thu, 03 Feb 2022 00:26:15 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=sfwEed+GJAr0KDwg+GYGg8QDt2lqdwbQp3DHVhIOZQQ=; b=XWqsNZ+t9i/U4p0KeuaSH72S02HQnwRce+TrI4VLyzbPGmSz+xtnMCgvt7GWHlx849 jzuBkm2V9/KqHaSslcs/kXqxP6337cc6sxkNhvlG/7zfWxDCRs+P472qPS3vqwpcZjx9 Fg1MZhCtPUEYhnMSk8ECZHfxJRce3RAGlVJsjIpsJu1ESC+Ub8h3hYjEdYpXDpDAL8Gv 3uJOiQl5p+MQTcVOhHCQZKnGYThT1GtkDqkIA5ORNcaXcuPPlkMNX7OZdsY22Y5mLoSa HN6oGINDBCQVEL2S/Q0oj9l5kabL97lb0NDM+p0EgymBC2lAJBAYLZKEo4jvwe2eSEPz Zaxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sfwEed+GJAr0KDwg+GYGg8QDt2lqdwbQp3DHVhIOZQQ=; b=N3EAslgfcQE2y7tQPlPlYQ6BNoNS3AYeyv8+OnTDyIyCPuEt103O6GT0R5xVoCgJui 4W6Q2fleNB8w1WDviPe5ZGrHBtSlV4Scpi5xL2aT7LtlESlTEwA8TQ64pn72x6HLSIUU gDvdT6AF4REgO9RHj51pkk6oNNTbyQny9+xHlDQX6CzvDpun6qMEO/8zObiEtCtDtPwt PzCkZ0sbjtcZNi8xlGrmISid7aXLzcrn9EJOJviVGtxOQwgyycNUzFuawKz3ZfWYzHtn WATFNP6SLqBPiG6MEbS3qW4Kwgn2lZ0Ef5timqOEcBEATKhcQHcWm8cXzp9yaVAwhRWY anNw== X-Gm-Message-State: AOAM530wJx4R6/Y25/5r0NSs34XGY5WYDKQBjatC/iGh21o845BVAjdP DBALKH+ViwvobMqa8bSLFcIv0g== X-Received: by 2002:a2e:988d:: with SMTP id b13mr18964703ljj.170.1643876774158; Thu, 03 Feb 2022 00:26:14 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id n15sm4083440ljh.36.2022.02.03.00.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 00:26:13 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH 1/7] drm/msm: move struct msm_display_info to dpu driver Date: Thu, 3 Feb 2022 11:26:05 +0300 Message-Id: <20220203082611.2654810-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203082611.2654810-1-dmitry.baryshkov@linaro.org> References: <20220203082611.2654810-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 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: David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Stephen Boyd , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The msm_display_info structure is not used by the rest of msm driver, so move it into the dpu1 (dpu_encoder.h to be precise). Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 18 ++++++++++++++++++ drivers/gpu/drm/msm/msm_drv.h | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h index e241914a9677..ebe3944355bb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h @@ -34,6 +34,24 @@ struct dpu_encoder_hw_resources { void dpu_encoder_get_hw_resources(struct drm_encoder *encoder, struct dpu_encoder_hw_resources *hw_res); +/** + * struct msm_display_info - defines display properties + * @intf_type: DRM_MODE_ENCODER_ type + * @capabilities: Bitmask of display flags + * @num_of_h_tiles: Number of horizontal tiles in case of split interface + * @h_tile_instance: Controller instance used per tile. Number of elements is + * based on num_of_h_tiles + * @is_te_using_watchdog_timer: Boolean to indicate watchdog TE is + * used instead of panel TE in cmd mode panels + */ +struct msm_display_info { + int intf_type; + uint32_t capabilities; + uint32_t num_of_h_tiles; + uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY]; + bool is_te_using_watchdog_timer; +}; + /** * dpu_encoder_assign_crtc - Link the encoder to the crtc it's assigned to * @encoder: encoder pointer diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index d7574e6bd4e4..16f9e25ee19e 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -109,24 +109,6 @@ struct msm_display_topology { u32 num_dspp; }; -/** - * struct msm_display_info - defines display properties - * @intf_type: DRM_MODE_ENCODER_ type - * @capabilities: Bitmask of display flags - * @num_of_h_tiles: Number of horizontal tiles in case of split interface - * @h_tile_instance: Controller instance used per tile. Number of elements is - * based on num_of_h_tiles - * @is_te_using_watchdog_timer: Boolean to indicate watchdog TE is - * used instead of panel TE in cmd mode panels - */ -struct msm_display_info { - int intf_type; - uint32_t capabilities; - uint32_t num_of_h_tiles; - uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY]; - bool is_te_using_watchdog_timer; -}; - /* Commit/Event thread specific structure */ struct msm_drm_thread { struct drm_device *dev;