From patchwork Mon Feb 1 13:26:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 12059011 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 863D7C433DB for ; Mon, 1 Feb 2021 13:26:33 +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 103FC61481 for ; Mon, 1 Feb 2021 13:26:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 103FC61481 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 04DF86E454; Mon, 1 Feb 2021 13:26:32 +0000 (UTC) Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id E3BD46E454 for ; Mon, 1 Feb 2021 13:26:30 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id v15so16557259ljk.13 for ; Mon, 01 Feb 2021 05:26:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kJ/JrPKNS9o2HEP+luNF+GgwglKJg4easN3w4HlyOZc=; b=tkD59PWpDRcAccheOBo9990b7J+O8dWhZmshW9s5O/8Gh1fBShFBMZ/Kmd5XpnmaiS 1hBK1FQk/eUPSeWMNVyxbV5hHOuAqmF/YLwvh9bGlBl0j7MVuT+SRT0+om4X/Ghoy8Gc wf8KC09K0Qj+LbRuQ7vSodS+LgojPxzKHQJUJiy8ap4WF9JYLtSWMj8zFLEMzHypaZ4h CZSTfxAX0t7eJsxO2va6H0kDvy6V4vTj/vebFCtCAULm6wHFH674xPilljCyHutkmPS9 htZ4rDZmWTuQl38LFXwtdrlLfyk8PLm4+JblsF0TIuzF7oO4bpon4pWgBVyw5lhR3KVY pBYA== 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:mime-version :content-transfer-encoding; bh=kJ/JrPKNS9o2HEP+luNF+GgwglKJg4easN3w4HlyOZc=; b=AoHsJFyLaQ6UPPj9BmTt8s/GHzo6/3y5e0tylkuKDLxkkhyrqYXxpMSHTPqv8Bkb4H TVtV/H0rh+LZUGmfNybOkLzSJe+tbaNRvYcNKhP1THU93u1ZcdywZv7ol2m5DwSDC7lJ GJmiq8lSl4oYIwEwq3rx/OEqnhz3VDrbvTIxa7LLHRG6lf8GIZiN80WnraANfjJkS3Rt 8eyGUKzb6AtnY3i90dsgSR7GAOLG9d+dZfWpF98/N2i+DuS4Cc5RJI55DLoZEpSmBNdB DUHbb7wV8lgFuTLJJwyIMp2Xk9LjUE+El5o2HLSn4dgU3O9+4grDBA7jfTRjsp0R+nF9 KkPg== X-Gm-Message-State: AOAM531Uu6RxX7raQcaZQuHcyOQKY1uMQwyWwyuONKzm8jUWpbbNBdGe a8/9QaVpnR8TNRdAhgqDF7NSZaED8xs= X-Google-Smtp-Source: ABdhPJyQ8qGSmlL5GPWl0kvRwAScIZ3WBYa/RPoZuyS6h6dKYRe6oo4ZgJzddFgvOcaQ9HzZbVP6lQ== X-Received: by 2002:a2e:2f19:: with SMTP id v25mr10772666ljv.184.1612185989064; Mon, 01 Feb 2021 05:26:29 -0800 (PST) Received: from workstation.lan (81-229-85-231-no13.tbcn.telia.com. [81.229.85.231]) by smtp.gmail.com with ESMTPSA id p21sm2984737lfu.227.2021.02.01.05.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 05:26:28 -0800 (PST) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/6] drm/gma500/cdv: Remove unused code for crt init Date: Mon, 1 Feb 2021 14:26:12 +0100 Message-Id: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 2.30.0 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: airlied@linux.ie, tzimmermann@suse.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clearly never been used so just remove it. Signed-off-by: Patrik Jakobsson Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/gma500/cdv_intel_crt.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c index c48c9d322dfb..4a9bb4994a26 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_crt.c +++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c @@ -248,8 +248,6 @@ void cdv_intel_crt_init(struct drm_device *dev, struct drm_connector *connector; struct drm_encoder *encoder; - u32 i2c_reg; - gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL); if (!gma_encoder) return; @@ -269,24 +267,13 @@ void cdv_intel_crt_init(struct drm_device *dev, gma_connector_attach_encoder(gma_connector, gma_encoder); /* Set up the DDC bus. */ - i2c_reg = GPIOA; - /* Remove the following code for CDV */ - /* - if (dev_priv->crt_ddc_bus != 0) - i2c_reg = dev_priv->crt_ddc_bus; - }*/ - gma_encoder->ddc_bus = psb_intel_i2c_create(dev, - i2c_reg, "CRTDDC_A"); + gma_encoder->ddc_bus = psb_intel_i2c_create(dev, GPIOA, "CRTDDC_A"); if (!gma_encoder->ddc_bus) { dev_printk(KERN_ERR, dev->dev, "DDC bus registration failed.\n"); goto failed_ddc; } gma_encoder->type = INTEL_OUTPUT_ANALOG; - /* - psb_intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT); - psb_intel_output->crtc_mask = (1 << 0) | (1 << 1); - */ connector->interlace_allowed = 0; connector->doublescan_allowed = 0; From patchwork Mon Feb 1 13:26:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 12059013 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 C3094C433DB for ; Mon, 1 Feb 2021 13:26:37 +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 6240664E7A for ; Mon, 1 Feb 2021 13:26:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6240664E7A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 47C5B6E59B; Mon, 1 Feb 2021 13:26:35 +0000 (UTC) Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB7926E59B for ; Mon, 1 Feb 2021 13:26:34 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id l12so19564910ljc.3 for ; Mon, 01 Feb 2021 05:26:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ucyMt61g8JcFNFBNILDPxkh5n07FH+dmgVEnCJ8A7zU=; b=XgzMr2ncXyHs2G1nY0f8+QhUzYhX30MUkYXGEbZIrzeDeZ7AwCjRgkj5uU3rleV2Rk iwj20/7deJb+2tMrg+ZLYns+ksfdXXbCUgdGs7Ny+Eq3tq36stj1mxW+U7sa5tpTyihM c1aD4ofgqOnkGtsxLFPXr9LrWTPNE/tnlY1oO5VKuYK3LBTEMm/T/7yp35PuWA4GUkXr Vd70vPgRtEOIGa9mPWtevudrZ3QHMLlxT5WSP1L4KO+Uj6WrZQ0cemz9HF3dteX/fF86 m2JZy+VgJTNaruRcEYrUbDMq8V5SEqnoJPGkOBjGivzDwjcLY0UL2bM+5Pkvnl5deuDB /bMA== 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:mime-version:content-transfer-encoding; bh=ucyMt61g8JcFNFBNILDPxkh5n07FH+dmgVEnCJ8A7zU=; b=jbif/+RvfyC4cyLSUMLYwQmSlT3D+z/Yf2a+xRNwrQhHTkWBVnEC4890U+gqCTXtJy lkV6IXfyTf6qM78NF89sbmcXNkzlTiKBaQgHKS1vwSGgFqscz50I6uOvKv+xaDupuCBY NkGX1bNU/Oclr58q6j9G8wm4OQCZyw9kCIq5a+jo6lRlNgi1jORmUaOErbT+RDlCI3Kj xHoHbmvvIhIPCVfcOpr6Nvadh/YvyA3gxUer3mghyRiuVlYRWnHNrO6rsfqD8vnT3KsY pheN+26oXDnxnJ8VrC/GejRApQeqYbFZkbYWhb8AW5ZtRR83ga43z2tENQRDZB05BPWm /vYA== X-Gm-Message-State: AOAM531rkfgjmkQjdrvgtqyNLvKK98SaXCo97b9m2HdeZEKCmAErzb8h GltETMQmiaRMVfB6ySWMamhzK8+ET/k= X-Google-Smtp-Source: ABdhPJwcx1LFIQ9svLdJTSuONAGRBPuINBXJsqGZR2SnRhWa9bBKKWInuLCzXRp9YVI83VI74R4F6w== X-Received: by 2002:a2e:7a0a:: with SMTP id v10mr10244920ljc.339.1612185992715; Mon, 01 Feb 2021 05:26:32 -0800 (PST) Received: from workstation.lan (81-229-85-231-no13.tbcn.telia.com. [81.229.85.231]) by smtp.gmail.com with ESMTPSA id p21sm2984737lfu.227.2021.02.01.05.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 05:26:32 -0800 (PST) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/6] drm/gma500: Remove unused DPST support Date: Mon, 1 Feb 2021 14:26:13 +0100 Message-Id: <20210201132617.1233-2-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> References: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> 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: airlied@linux.ie, tzimmermann@suse.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" DPST never got enabled so remove it. We keep the reg save/restore code just for safety. Signed-off-by: Patrik Jakobsson Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/gma500/psb_drv.h | 4 - drivers/gpu/drm/gma500/psb_intel_reg.h | 32 ------- drivers/gpu/drm/gma500/psb_irq.c | 110 ------------------------- drivers/gpu/drm/gma500/psb_irq.h | 4 - 4 files changed, 150 deletions(-) diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index 020a71b91577..d4f14a5d509b 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h @@ -622,13 +622,9 @@ static inline struct drm_psb_private *psb_priv(struct drm_device *dev) /* psb_irq.c */ extern irqreturn_t psb_irq_handler(int irq, void *arg); -extern int psb_irq_enable_dpst(struct drm_device *dev); -extern int psb_irq_disable_dpst(struct drm_device *dev); extern void psb_irq_preinstall(struct drm_device *dev); extern int psb_irq_postinstall(struct drm_device *dev); extern void psb_irq_uninstall(struct drm_device *dev); -extern void psb_irq_turn_on_dpst(struct drm_device *dev); -extern void psb_irq_turn_off_dpst(struct drm_device *dev); extern void psb_irq_uninstall_islands(struct drm_device *dev, int hw_islands); extern int psb_vblank_wait2(struct drm_device *dev, unsigned int *sequence); diff --git a/drivers/gpu/drm/gma500/psb_intel_reg.h b/drivers/gpu/drm/gma500/psb_intel_reg.h index 364ea8f06f9c..ced7b433befb 100644 --- a/drivers/gpu/drm/gma500/psb_intel_reg.h +++ b/drivers/gpu/drm/gma500/psb_intel_reg.h @@ -550,38 +550,6 @@ #define HISTOGRAM_INT_CTRL_CLEAR (1UL << 30) #define DPST_YUV_LUMA_MODE 0 -struct dpst_ie_histogram_control { - union { - uint32_t data; - struct { - uint32_t bin_reg_index:7; - uint32_t reserved:4; - uint32_t bin_reg_func_select:1; - uint32_t sync_to_phase_in:1; - uint32_t alt_enhancement_mode:2; - uint32_t reserved1:1; - uint32_t sync_to_phase_in_count:8; - uint32_t histogram_mode_select:1; - uint32_t reserved2:4; - uint32_t ie_pipe_assignment:1; - uint32_t ie_mode_table_enabled:1; - uint32_t ie_histogram_enable:1; - }; - }; -}; - -struct dpst_guardband { - union { - uint32_t data; - struct { - uint32_t guardband:22; - uint32_t guardband_interrupt_delay:8; - uint32_t interrupt_status:1; - uint32_t interrupt_enable:1; - }; - }; -}; - #define PIPEAFRAMEHIGH 0x70040 #define PIPEAFRAMEPIXEL 0x70044 #define PIPEBFRAMEHIGH 0x71040 diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c index ae9b100e640b..104009e78487 100644 --- a/drivers/gpu/drm/gma500/psb_irq.c +++ b/drivers/gpu/drm/gma500/psb_irq.c @@ -101,30 +101,6 @@ psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask) } } -static void mid_enable_pipe_event(struct drm_psb_private *dev_priv, int pipe) -{ - if (gma_power_begin(dev_priv->dev, false)) { - u32 pipe_event = mid_pipe_event(pipe); - dev_priv->vdc_irq_mask |= pipe_event; - PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R); - PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R); - gma_power_end(dev_priv->dev); - } -} - -static void mid_disable_pipe_event(struct drm_psb_private *dev_priv, int pipe) -{ - if (dev_priv->pipestat[pipe] == 0) { - if (gma_power_begin(dev_priv->dev, false)) { - u32 pipe_event = mid_pipe_event(pipe); - dev_priv->vdc_irq_mask &= ~pipe_event; - PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R); - PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R); - gma_power_end(dev_priv->dev); - } - } -} - /* * Display controller interrupt handler for pipe event. */ @@ -392,92 +368,6 @@ void psb_irq_uninstall(struct drm_device *dev) spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags); } -void psb_irq_turn_on_dpst(struct drm_device *dev) -{ - struct drm_psb_private *dev_priv = - (struct drm_psb_private *) dev->dev_private; - u32 hist_reg; - u32 pwm_reg; - - if (gma_power_begin(dev, false)) { - PSB_WVDC32(1 << 31, HISTOGRAM_LOGIC_CONTROL); - hist_reg = PSB_RVDC32(HISTOGRAM_LOGIC_CONTROL); - PSB_WVDC32(1 << 31, HISTOGRAM_INT_CONTROL); - hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL); - - PSB_WVDC32(0x80010100, PWM_CONTROL_LOGIC); - pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC); - PSB_WVDC32(pwm_reg | PWM_PHASEIN_ENABLE - | PWM_PHASEIN_INT_ENABLE, - PWM_CONTROL_LOGIC); - pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC); - - psb_enable_pipestat(dev_priv, 0, PIPE_DPST_EVENT_ENABLE); - - hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL); - PSB_WVDC32(hist_reg | HISTOGRAM_INT_CTRL_CLEAR, - HISTOGRAM_INT_CONTROL); - pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC); - PSB_WVDC32(pwm_reg | 0x80010100 | PWM_PHASEIN_ENABLE, - PWM_CONTROL_LOGIC); - - gma_power_end(dev); - } -} - -int psb_irq_enable_dpst(struct drm_device *dev) -{ - struct drm_psb_private *dev_priv = - (struct drm_psb_private *) dev->dev_private; - unsigned long irqflags; - - spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags); - - /* enable DPST */ - mid_enable_pipe_event(dev_priv, 0); - psb_irq_turn_on_dpst(dev); - - spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags); - return 0; -} - -void psb_irq_turn_off_dpst(struct drm_device *dev) -{ - struct drm_psb_private *dev_priv = - (struct drm_psb_private *) dev->dev_private; - u32 pwm_reg; - - if (gma_power_begin(dev, false)) { - PSB_WVDC32(0x00000000, HISTOGRAM_INT_CONTROL); - PSB_RVDC32(HISTOGRAM_INT_CONTROL); - - psb_disable_pipestat(dev_priv, 0, PIPE_DPST_EVENT_ENABLE); - - pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC); - PSB_WVDC32(pwm_reg & ~PWM_PHASEIN_INT_ENABLE, - PWM_CONTROL_LOGIC); - pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC); - - gma_power_end(dev); - } -} - -int psb_irq_disable_dpst(struct drm_device *dev) -{ - struct drm_psb_private *dev_priv = - (struct drm_psb_private *) dev->dev_private; - unsigned long irqflags; - - spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags); - - mid_disable_pipe_event(dev_priv, 0); - psb_irq_turn_off_dpst(dev); - - spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags); - - return 0; -} - /* * It is used to enable VBLANK interrupt */ diff --git a/drivers/gpu/drm/gma500/psb_irq.h b/drivers/gpu/drm/gma500/psb_irq.h index 1b577fa7010a..17c9b0b62471 100644 --- a/drivers/gpu/drm/gma500/psb_irq.h +++ b/drivers/gpu/drm/gma500/psb_irq.h @@ -23,10 +23,6 @@ int psb_irq_postinstall(struct drm_device *dev); void psb_irq_uninstall(struct drm_device *dev); irqreturn_t psb_irq_handler(int irq, void *arg); -int psb_irq_enable_dpst(struct drm_device *dev); -int psb_irq_disable_dpst(struct drm_device *dev); -void psb_irq_turn_on_dpst(struct drm_device *dev); -void psb_irq_turn_off_dpst(struct drm_device *dev); int psb_enable_vblank(struct drm_crtc *crtc); void psb_disable_vblank(struct drm_crtc *crtc); u32 psb_get_vblank_counter(struct drm_crtc *crtc); From patchwork Mon Feb 1 13:26:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 12059015 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 E8A26C433E0 for ; Mon, 1 Feb 2021 13:26:40 +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 8A4E861481 for ; Mon, 1 Feb 2021 13:26:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A4E861481 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 D6C796E59D; Mon, 1 Feb 2021 13:26:37 +0000 (UTC) Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id B31966E59D for ; Mon, 1 Feb 2021 13:26:35 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id m22so12127641ljj.4 for ; Mon, 01 Feb 2021 05:26:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LZxvJUjhWxCl0Oued5nfmdJDN7RgogDJn++6GeZRY1g=; b=t7adSygFSaLhLJVYkBJ3SlHLM0XsUuaq27/YMomkJH3sUvOD7J8D/kcasR9BporOnS W7Kb+9pHZseOXSASpNZJdkOpcYyjMgDKU6r23dy/4yyeuA6Y17V3oVseMsxZ1rXv+/uG fBATf48ytnLdhaSfMLo75sk2fXBErJkDA8CBtNcnwmBgW8kEjprcAqtClqwWjFl8qLlt +K19o8BPRnDNa4jBr+daBcjOgSeDwHTkpOD5w0IUQR2ra5lgUQLRoLwx9y1L59eWw/q3 ZEOTbLFEuOy1KnU+yagJBuq344CDiZ3YAF+N6MpphU3mSthuXNYfTYqyU4fHdDVBjJRP CTPg== 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:mime-version:content-transfer-encoding; bh=LZxvJUjhWxCl0Oued5nfmdJDN7RgogDJn++6GeZRY1g=; b=Ssu/abIOL7YYCRNoLga8gPtwohL4njsMTJhWw/J1BMk2x1mXgCHRQ7KiXwbwCvSuGp taBElvM9DaWG1EBr8VvKfkdy2t0az/ACPyaOhvusMgkc0I8QgnOdtClGQUqrt/4G2JaV bmW5+I856cTIfEq5dg6U9gu1tLYfDCzeMkSInhR1lJ/m2oGem6EpzMn40ZiS78xJPp0D CmExvN96Jj0O3cSOjcA78KpiKu2ds0n96MQvpbassFfIR/5Msb/jpTN6bRfOfYsuvBJC X2+4Cj0oxK5P6zoolxaPHNJqThyLZG5CnfjkiizyiNbYCeujbS61jnwzMkvijKoZInVw 9X/g== X-Gm-Message-State: AOAM533JiJIk2U2IohSeSMqvOIbnxwf4F4N8R34lnzWBXjIWvPqzq58x SRDn9bulaBeOwbBhbimkIEYJWtoGqx4= X-Google-Smtp-Source: ABdhPJzy6V27PSws0pAuUKhxBVFJVS86LxSrF1EedhOnJcS5yXapaAVmHGN+FpIZmF4s99z02cStLQ== X-Received: by 2002:a2e:9cc8:: with SMTP id g8mr10378122ljj.479.1612185993804; Mon, 01 Feb 2021 05:26:33 -0800 (PST) Received: from workstation.lan (81-229-85-231-no13.tbcn.telia.com. [81.229.85.231]) by smtp.gmail.com with ESMTPSA id p21sm2984737lfu.227.2021.02.01.05.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 05:26:32 -0800 (PST) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/6] drm/gma500/cdv: Remove unused tv out paths Date: Mon, 1 Feb 2021 14:26:14 +0100 Message-Id: <20210201132617.1233-3-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> References: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> 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: airlied@linux.ie, tzimmermann@suse.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Afaik tv out is not available on Cedarview and the code isn't doing anything so remove it. Signed-off-by: Patrik Jakobsson Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/gma500/cdv_intel_display.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c index 5d3302249779..aac776fab36d 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_display.c +++ b/drivers/gpu/drm/gma500/cdv_intel_display.c @@ -582,7 +582,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, struct gma_clock_t clock; u32 dpll = 0, dspcntr, pipeconf; bool ok; - bool is_lvds = false, is_tv = false; + bool is_lvds = false; bool is_dp = false; struct drm_mode_config *mode_config = &dev->mode_config; struct drm_connector *connector; @@ -603,9 +603,6 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, case INTEL_OUTPUT_LVDS: is_lvds = true; break; - case INTEL_OUTPUT_TVOUT: - is_tv = true; - break; case INTEL_OUTPUT_ANALOG: case INTEL_OUTPUT_HDMI: break; @@ -660,12 +657,6 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, } dpll = DPLL_VGA_MODE_DIS; - if (is_tv) { - /* XXX: just matching BIOS for now */ -/* dpll |= PLL_REF_INPUT_TVCLKINBC; */ - dpll |= 3; - } -/* dpll |= PLL_REF_INPUT_DREFCLK; */ if (is_dp || is_edp) { cdv_intel_dp_set_m_n(crtc, mode, adjusted_mode); From patchwork Mon Feb 1 13:26:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 12059017 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 3133AC433E0 for ; Mon, 1 Feb 2021 13:26:43 +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 B98C064E7A for ; Mon, 1 Feb 2021 13:26:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B98C064E7A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 BC2546E5A0; Mon, 1 Feb 2021 13:26:38 +0000 (UTC) Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D6DC6E59D for ; Mon, 1 Feb 2021 13:26:37 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id t8so19516338ljk.10 for ; Mon, 01 Feb 2021 05:26:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fkEGOvHYYd+Q9dKrVulbEdTb0n+csJWL3IspA9E7+ec=; b=M0zWPYD2ToqaUoifCDutFnNa9+191BbGTwShPaPHr4K5bmOw9Ii0+Y0c01nn4XjUtF a3WAwWDJQortDv7m+m93MIUew5aPMkE3py12EgceFa4ePXTqfClRRnQcBg2siGazpH5K ty9UoihTn32NGOM7txGwuyAaAMUl6Fh8Dhd0JRY2AiG9mcxHNk+cKjZurK40MKznVfYN bhHkoQb1UD1TdJzmawogwMY7FKg4DV8bolH1sXmrDObKnVbtoLigxKMHcBArpaUrT8So 9Ndc1pSh1b4a+Myvtyib1g1wcZCpk7sEc7UujUTJBEF8WZOhiUYm9ygqajHFNRPyyoEL 7GoA== 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:mime-version:content-transfer-encoding; bh=fkEGOvHYYd+Q9dKrVulbEdTb0n+csJWL3IspA9E7+ec=; b=oor4Crn7Ap+C5vrnVRExSdOarbrbhZylt1QHJ+49O3up9jH89moxnfNGwO7LquweFA g7CdvPyrPqkLmbyOslHhdbO02owe5xROgb0xODDON0rfeJRJCibtbhzJtTEi2IIyz34f Qt3N1xcNgQCHllkX0NmvftTHz+NP465oCGSOW12DSCOgpAKHhv/mArqw5CLlqp9AgPjY XugH74pKZkdgtzv91ZVv35uQKL/Kz2fL7PHOTRCbuhzattm3d8oPqTkAMnzfTquKYJ0Y rgh9VutwOV1GHX62TruTBuIMmBKrS7vlE9t+ONtilAyJ2/SW5TpdtAcRz27QV1nhrYLW uKrg== X-Gm-Message-State: AOAM53303d0vyDiT4HfJ+aHMCL5Q5Z0oLwrPXf9jb93577RlIUxMs4Sx LewZfPHFO711CoeNVWAE9q/ob4picQw= X-Google-Smtp-Source: ABdhPJySRYqQB4d9ecFluuPivLIJhVFyuDomg0ybnUUj1Qet64MStlsxsOO1re7C0JYOkiVnYpuVKg== X-Received: by 2002:a2e:b0ee:: with SMTP id h14mr10605213ljl.31.1612185995613; Mon, 01 Feb 2021 05:26:35 -0800 (PST) Received: from workstation.lan (81-229-85-231-no13.tbcn.telia.com. [81.229.85.231]) by smtp.gmail.com with ESMTPSA id p21sm2984737lfu.227.2021.02.01.05.26.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 05:26:34 -0800 (PST) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH 4/6] drm/gma500: Unify crtc helpers Date: Mon, 1 Feb 2021 14:26:15 +0100 Message-Id: <20210201132617.1233-4-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> References: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> 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: airlied@linux.ie, tzimmermann@suse.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" CDV crtc helpers are identical to other chips so use gma_ prefix for the crtc helper struct and remove the CDV copy. Signed-off-by: Patrik Jakobsson Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/gma500/cdv_device.c | 2 +- drivers/gpu/drm/gma500/cdv_device.h | 1 - drivers/gpu/drm/gma500/cdv_intel_display.c | 12 ------------ drivers/gpu/drm/gma500/oaktrail_device.c | 2 +- drivers/gpu/drm/gma500/psb_device.c | 2 +- drivers/gpu/drm/gma500/psb_drv.h | 2 +- drivers/gpu/drm/gma500/psb_intel_display.c | 2 +- 7 files changed, 5 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c index 19e055dbd4c2..1342e7fb382f 100644 --- a/drivers/gpu/drm/gma500/cdv_device.c +++ b/drivers/gpu/drm/gma500/cdv_device.c @@ -603,7 +603,7 @@ const struct psb_ops cdv_chip_ops = { .errata = cdv_errata, .crtc_helper = &cdv_intel_helper_funcs, - .crtc_funcs = &cdv_intel_crtc_funcs, + .crtc_funcs = &gma_intel_crtc_funcs, .clock_funcs = &cdv_clock_funcs, .output_init = cdv_output_init, diff --git a/drivers/gpu/drm/gma500/cdv_device.h b/drivers/gpu/drm/gma500/cdv_device.h index 37e4bdc84c03..504d717385cd 100644 --- a/drivers/gpu/drm/gma500/cdv_device.h +++ b/drivers/gpu/drm/gma500/cdv_device.h @@ -8,7 +8,6 @@ struct drm_device; struct psb_intel_mode_device; extern const struct drm_crtc_helper_funcs cdv_intel_helper_funcs; -extern const struct drm_crtc_funcs cdv_intel_crtc_funcs; extern const struct gma_clock_funcs cdv_clock_funcs; extern void cdv_intel_crt_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev); diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c index aac776fab36d..c3a9f6b3c848 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_display.c +++ b/drivers/gpu/drm/gma500/cdv_intel_display.c @@ -961,18 +961,6 @@ const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = { .disable = gma_crtc_disable, }; -const struct drm_crtc_funcs cdv_intel_crtc_funcs = { - .cursor_set = gma_crtc_cursor_set, - .cursor_move = gma_crtc_cursor_move, - .gamma_set = gma_crtc_gamma_set, - .set_config = gma_crtc_set_config, - .destroy = gma_crtc_destroy, - .page_flip = gma_crtc_page_flip, - .enable_vblank = psb_enable_vblank, - .disable_vblank = psb_disable_vblank, - .get_vblank_counter = psb_get_vblank_counter, -}; - const struct gma_clock_funcs cdv_clock_funcs = { .clock = cdv_intel_clock, .limit = cdv_intel_limit, diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c index 08cd5f73c868..9650588c7223 100644 --- a/drivers/gpu/drm/gma500/oaktrail_device.c +++ b/drivers/gpu/drm/gma500/oaktrail_device.c @@ -548,7 +548,7 @@ const struct psb_ops oaktrail_chip_ops = { .chip_setup = oaktrail_chip_setup, .chip_teardown = oaktrail_teardown, .crtc_helper = &oaktrail_helper_funcs, - .crtc_funcs = &psb_intel_crtc_funcs, + .crtc_funcs = &gma_intel_crtc_funcs, .output_init = oaktrail_output_init, diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c index 2d21f8ec595f..951725a0f7a3 100644 --- a/drivers/gpu/drm/gma500/psb_device.c +++ b/drivers/gpu/drm/gma500/psb_device.c @@ -329,7 +329,7 @@ const struct psb_ops psb_chip_ops = { .chip_teardown = psb_chip_teardown, .crtc_helper = &psb_intel_helper_funcs, - .crtc_funcs = &psb_intel_crtc_funcs, + .crtc_funcs = &gma_intel_crtc_funcs, .clock_funcs = &psb_clock_funcs, .output_init = psb_output_init, diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index d4f14a5d509b..697f64e0f2f4 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h @@ -672,7 +672,7 @@ extern void oaktrail_lvds_init(struct drm_device *dev, /* psb_intel_display.c */ extern const struct drm_crtc_helper_funcs psb_intel_helper_funcs; -extern const struct drm_crtc_funcs psb_intel_crtc_funcs; +extern const struct drm_crtc_funcs gma_intel_crtc_funcs; /* psb_intel_lvds.c */ extern const struct drm_connector_helper_funcs diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c index 9c3cb1b80bbd..359606429316 100644 --- a/drivers/gpu/drm/gma500/psb_intel_display.c +++ b/drivers/gpu/drm/gma500/psb_intel_display.c @@ -426,7 +426,7 @@ const struct drm_crtc_helper_funcs psb_intel_helper_funcs = { .disable = gma_crtc_disable, }; -const struct drm_crtc_funcs psb_intel_crtc_funcs = { +const struct drm_crtc_funcs gma_intel_crtc_funcs = { .cursor_set = gma_crtc_cursor_set, .cursor_move = gma_crtc_cursor_move, .gamma_set = gma_crtc_gamma_set, From patchwork Mon Feb 1 13:26:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 12059021 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 BBCD4C433DB for ; Mon, 1 Feb 2021 13:26:46 +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 606C764E8F for ; Mon, 1 Feb 2021 13:26:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 606C764E8F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 43F786E5A2; Mon, 1 Feb 2021 13:26:40 +0000 (UTC) Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by gabe.freedesktop.org (Postfix) with ESMTPS id 850CB6E5A0 for ; Mon, 1 Feb 2021 13:26:38 +0000 (UTC) Received: by mail-lf1-x129.google.com with SMTP id q12so22702217lfo.12 for ; Mon, 01 Feb 2021 05:26:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gcsz3XtUPFim4PcbMueqFgdOJnEWbAOsJhB2c5QWaFI=; b=s6ChM99/N0r0JExoiYFfG3ZidHshkKAOEPjxqTxhcnkk/asDfLf26HOY7tKJKUUvmg aL9wSdxgyULZcT4KQUYfVXf0p6MMvEksScz5D6Qa9FGQgxkUzB0hULSd0nVQpfbNCOcF QVU+gL+AHbAl2F8xpQDnCVe5vGa2s3DoT08nsprgCLjKJ3EHZvU/WKd9srMj136c0Oo9 uQS1zmdKlX6K4nFs23w3cvHwAGgT+0IckUlr/mxOYaBnKTlJ2L/IhOcerf9aNFRhvsUW hgKj9yKx1VWFhNBJBz11lHHNoscHzDllezGCpxzknwf9ssjNwuubPW0r99lK6gRU1LDz NGiQ== 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:mime-version:content-transfer-encoding; bh=Gcsz3XtUPFim4PcbMueqFgdOJnEWbAOsJhB2c5QWaFI=; b=pciiueNP1k8U4UwyHDmnG4t1AWsRivjFiGGrjKegrjEDw2V7EZf8+2hmOlBillvWlC BNsc0PD6RXPs4o1170E42QdLff2aTVJmWJi5eLzq6RbFaoe8O/pLuHaDpbjHZdRAiM2C BDOo1wGdUF8vViIcsb5ac88Pxk2thdX8rr91qD7pcCXRhIi+fLk9br3spH1ZuOscNYdQ CBo7OU1R2YHFXRangN9g7b1ZXMErpNp005kF0g+gPTumBe/nXezMOZNZQDtnnXk0SWSO 1RVONKCiHLUrgtnQYzT9Js975FmovGRNYUBcccKIjdhViUy3Hg9dJxo4RBmoebGLT58u M9Ag== X-Gm-Message-State: AOAM532E1JSmMjiqFCecxah3oK222MznJNHAZYkdTcyQy23Q+bQuyD15 1IkBQ+zhpV/G7FeWEEqslzMTDic3RTU= X-Google-Smtp-Source: ABdhPJxSG0eIWN0gFPxY6cGbQ8NacvihqCXhw2WzQ/Wt3Nx5ajDT/fNz4G3k36DsAydkbdvpkQSTJg== X-Received: by 2002:a05:6512:224c:: with SMTP id i12mr8894626lfu.520.1612185996650; Mon, 01 Feb 2021 05:26:36 -0800 (PST) Received: from workstation.lan (81-229-85-231-no13.tbcn.telia.com. [81.229.85.231]) by smtp.gmail.com with ESMTPSA id p21sm2984737lfu.227.2021.02.01.05.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 05:26:35 -0800 (PST) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/6] drm/gma500: psb_spank() doesn't need it's own file Date: Mon, 1 Feb 2021 14:26:16 +0100 Message-Id: <20210201132617.1233-5-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> References: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> 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: airlied@linux.ie, tzimmermann@suse.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Since everything else in accel_2d.c got removed we can move psb_spank() into psb_drv.c where it is used. Signed-off-by: Patrik Jakobsson Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/gma500/Makefile | 1 - drivers/gpu/drm/gma500/accel_2d.c | 60 ------------------------------- drivers/gpu/drm/gma500/psb_drv.c | 31 ++++++++++++++++ 3 files changed, 31 insertions(+), 61 deletions(-) delete mode 100644 drivers/gpu/drm/gma500/accel_2d.c diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile index 884ab1f9063e..6ee1ef389979 100644 --- a/drivers/gpu/drm/gma500/Makefile +++ b/drivers/gpu/drm/gma500/Makefile @@ -4,7 +4,6 @@ # gma500_gfx-y += \ - accel_2d.o \ backlight.o \ blitter.o \ cdv_device.o \ diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c deleted file mode 100644 index 437bbb6af9e6..000000000000 --- a/drivers/gpu/drm/gma500/accel_2d.c +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/************************************************************************** - * Copyright (c) 2007-2011, Intel Corporation. - * All Rights Reserved. - * - * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to - * develop this driver. - * - **************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "psb_drv.h" -#include "psb_reg.h" - -/** - * psb_spank - reset the 2D engine - * @dev_priv: our PSB DRM device - * - * Soft reset the graphics engine and then reload the necessary registers. - * We use this at initialisation time but it will become relevant for - * accelerated X later - */ -void psb_spank(struct drm_psb_private *dev_priv) -{ - PSB_WSGX32(_PSB_CS_RESET_BIF_RESET | _PSB_CS_RESET_DPM_RESET | - _PSB_CS_RESET_TA_RESET | _PSB_CS_RESET_USE_RESET | - _PSB_CS_RESET_ISP_RESET | _PSB_CS_RESET_TSP_RESET | - _PSB_CS_RESET_TWOD_RESET, PSB_CR_SOFT_RESET); - PSB_RSGX32(PSB_CR_SOFT_RESET); - - msleep(1); - - PSB_WSGX32(0, PSB_CR_SOFT_RESET); - wmb(); - PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) | _PSB_CB_CTRL_CLEAR_FAULT, - PSB_CR_BIF_CTRL); - wmb(); - (void) PSB_RSGX32(PSB_CR_BIF_CTRL); - - msleep(1); - PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) & ~_PSB_CB_CTRL_CLEAR_FAULT, - PSB_CR_BIF_CTRL); - (void) PSB_RSGX32(PSB_CR_BIF_CTRL); - PSB_WSGX32(dev_priv->gtt.gatt_start, PSB_CR_BIF_TWOD_REQ_BASE); -} diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 0bcab065242c..bd55b0c4f4b3 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -12,6 +12,7 @@ #include #include #include +#include #include @@ -92,6 +93,36 @@ MODULE_DEVICE_TABLE(pci, pciidlist); static const struct drm_ioctl_desc psb_ioctls[] = { }; +/** + * psb_spank - reset the 2D engine + * @dev_priv: our PSB DRM device + * + * Soft reset the graphics engine and then reload the necessary registers. + */ +void psb_spank(struct drm_psb_private *dev_priv) +{ + PSB_WSGX32(_PSB_CS_RESET_BIF_RESET | _PSB_CS_RESET_DPM_RESET | + _PSB_CS_RESET_TA_RESET | _PSB_CS_RESET_USE_RESET | + _PSB_CS_RESET_ISP_RESET | _PSB_CS_RESET_TSP_RESET | + _PSB_CS_RESET_TWOD_RESET, PSB_CR_SOFT_RESET); + PSB_RSGX32(PSB_CR_SOFT_RESET); + + msleep(1); + + PSB_WSGX32(0, PSB_CR_SOFT_RESET); + wmb(); + PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) | _PSB_CB_CTRL_CLEAR_FAULT, + PSB_CR_BIF_CTRL); + wmb(); + (void) PSB_RSGX32(PSB_CR_BIF_CTRL); + + msleep(1); + PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) & ~_PSB_CB_CTRL_CLEAR_FAULT, + PSB_CR_BIF_CTRL); + (void) PSB_RSGX32(PSB_CR_BIF_CTRL); + PSB_WSGX32(dev_priv->gtt.gatt_start, PSB_CR_BIF_TWOD_REQ_BASE); +} + static int psb_do_init(struct drm_device *dev) { struct drm_psb_private *dev_priv = dev->dev_private; From patchwork Mon Feb 1 13:26:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 12059019 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 1788AC433E6 for ; Mon, 1 Feb 2021 13:26:45 +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 9FAF661481 for ; Mon, 1 Feb 2021 13:26:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FAF661481 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 5BAE86E5A3; Mon, 1 Feb 2021 13:26:40 +0000 (UTC) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 923126E5A3 for ; Mon, 1 Feb 2021 13:26:39 +0000 (UTC) Received: by mail-lj1-x22b.google.com with SMTP id a25so19564783ljn.0 for ; Mon, 01 Feb 2021 05:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OJRVRhCiZdOOMqSiHStFtF9cFhaoFc/Q0xGR+0WLl8M=; b=m2g+SfpIDt8MK2QjGUUDnvbxGggjhMyUo0T1DdJ7869coCJWa2XBodAAfaLsyelyXT 4+TK2EztsnRghbHVXNsFeEPyFjbV/PnCtb1b1pK6aQR/YU0TXoBXVYoBxj6u/hPCp+Ho I0xc/V+F1eojMVtiKUhH6eonkDzy0QZHbmzxIZdDxS5vLa5FMIEXjljLTlYmdmS7RjwC ZY5SsAQkk2/2+DSXCZnJba9pYPWDjD1jCGPu5a4pmdnX63t7X+c8qMBl91RA6UI78brB aZ3DeQLruuhQt9OsSMGaIkVNHcyzTDgLt0zm29WJefN89fKLJ4XwVLEjq6L6lxb11LiC C3uw== 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:mime-version:content-transfer-encoding; bh=OJRVRhCiZdOOMqSiHStFtF9cFhaoFc/Q0xGR+0WLl8M=; b=FZw4HEg89wUOiVqV+oplpFPtkBSvexyYzJfEQ4+s5nO93EvxqQGS5X3zNxTP1l//vZ SjFMj47r6VaJq14DmgUcAnCeopL0cCY5c8dy+iJX2DiHkYbvFRFjsT7S61W3p/y5cPRq +rFZDGhrbSBbGv88NcDbV/KNrZldzczVbQCGW9EwD50K4zS1SjkIcrcXbQuDq4jY7Kos ASs2upW6JL37wgMQl/SSovM+jQmnFqqZ7AncZ6swMTnEA80H0dTnlRfHdUEn+FxZ/F6F LkxH770qn9bjdpCeNaIu6sX5LAZEzgJp7fVEP/JsCtI+zkOr0wPH9uAedz0nz2g3aDaX EAOQ== X-Gm-Message-State: AOAM533tNRr75eXLevnnTJ+p5+X0jJ/KRT3pi8Ma9LX5d2itbPvQaE+2 lq8h2eMGgngl2L1963nJX6KEJkrsa1o= X-Google-Smtp-Source: ABdhPJyx60tp7mF76/lE12NsJbJwXdasr6P+a4lronjCUZmT6EmFf/lWcQEhMY9lGMEW3a3XWos2ug== X-Received: by 2002:a2e:b04e:: with SMTP id d14mr10372786ljl.414.1612185997692; Mon, 01 Feb 2021 05:26:37 -0800 (PST) Received: from workstation.lan (81-229-85-231-no13.tbcn.telia.com. [81.229.85.231]) by smtp.gmail.com with ESMTPSA id p21sm2984737lfu.227.2021.02.01.05.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 05:26:36 -0800 (PST) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH 6/6] drm/gma500: Never wait for blits Date: Mon, 1 Feb 2021 14:26:17 +0100 Message-Id: <20210201132617.1233-6-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> References: <20210201132617.1233-1-patrik.r.jakobsson@gmail.com> 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: airlied@linux.ie, tzimmermann@suse.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Blits cannot happen anymore since we removed the 2d accel code. Stop checking for a busy blitter and remove the remaining blitter code. Signed-off-by: Patrik Jakobsson Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/gma500/Makefile | 1 - drivers/gpu/drm/gma500/blitter.c | 43 -------------------------------- drivers/gpu/drm/gma500/blitter.h | 16 ------------ drivers/gpu/drm/gma500/gtt.c | 11 -------- 4 files changed, 71 deletions(-) delete mode 100644 drivers/gpu/drm/gma500/blitter.c delete mode 100644 drivers/gpu/drm/gma500/blitter.h diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile index 6ee1ef389979..8c649d3ef6a4 100644 --- a/drivers/gpu/drm/gma500/Makefile +++ b/drivers/gpu/drm/gma500/Makefile @@ -5,7 +5,6 @@ gma500_gfx-y += \ backlight.o \ - blitter.o \ cdv_device.o \ cdv_intel_crt.o \ cdv_intel_display.o \ diff --git a/drivers/gpu/drm/gma500/blitter.c b/drivers/gpu/drm/gma500/blitter.c deleted file mode 100644 index cb2504a4a15f..000000000000 --- a/drivers/gpu/drm/gma500/blitter.c +++ /dev/null @@ -1,43 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2014, Patrik Jakobsson - * All Rights Reserved. - * - * Authors: Patrik Jakobsson - */ - -#include "psb_drv.h" - -#include "blitter.h" -#include "psb_reg.h" - -/* Wait for the blitter to be completely idle */ -int gma_blt_wait_idle(struct drm_psb_private *dev_priv) -{ - unsigned long stop = jiffies + HZ; - int busy = 1; - - /* NOP for Cedarview */ - if (IS_CDV(dev_priv->dev)) - return 0; - - /* First do a quick check */ - if ((PSB_RSGX32(PSB_CR_2D_SOCIF) == _PSB_C2_SOCIF_EMPTY) && - ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) & _PSB_C2B_STATUS_BUSY) == 0)) - return 0; - - do { - busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY); - } while (busy && !time_after_eq(jiffies, stop)); - - if (busy) - return -EBUSY; - - do { - busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) & - _PSB_C2B_STATUS_BUSY) != 0); - } while (busy && !time_after_eq(jiffies, stop)); - - /* If still busy, we probably have a hang */ - return (busy) ? -EBUSY : 0; -} diff --git a/drivers/gpu/drm/gma500/blitter.h b/drivers/gpu/drm/gma500/blitter.h deleted file mode 100644 index 8d67dabd9ba3..000000000000 --- a/drivers/gpu/drm/gma500/blitter.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (c) 2014, Patrik Jakobsson - * All Rights Reserved. - * - * Authors: Patrik Jakobsson - */ - -#ifndef __BLITTER_H -#define __BLITTER_H - -struct drm_psb_private; - -extern int gma_blt_wait_idle(struct drm_psb_private *dev_priv); - -#endif diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c index e884750bc123..df9b611b856a 100644 --- a/drivers/gpu/drm/gma500/gtt.c +++ b/drivers/gpu/drm/gma500/gtt.c @@ -11,7 +11,6 @@ #include -#include "blitter.h" #include "psb_drv.h" @@ -229,18 +228,9 @@ void psb_gtt_unpin(struct gtt_range *gt) struct drm_device *dev = gt->gem.dev; struct drm_psb_private *dev_priv = dev->dev_private; u32 gpu_base = dev_priv->gtt.gatt_start; - int ret; - /* While holding the gtt_mutex no new blits can be initiated */ mutex_lock(&dev_priv->gtt_mutex); - /* Wait for any possible usage of the memory to be finished */ - ret = gma_blt_wait_idle(dev_priv); - if (ret) { - DRM_ERROR("Failed to idle the blitter, unpin failed!"); - goto out; - } - WARN_ON(!gt->in_gart); gt->in_gart--; @@ -251,7 +241,6 @@ void psb_gtt_unpin(struct gtt_range *gt) psb_gtt_detach_pages(gt); } -out: mutex_unlock(&dev_priv->gtt_mutex); }