From patchwork Tue Oct 22 15:55:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11204741 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 31FAE14ED for ; Tue, 22 Oct 2019 15:55: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 19BBB214B2 for ; Tue, 22 Oct 2019 15:55:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19BBB214B2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 6C3826E85D; Tue, 22 Oct 2019 15:55:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 672606E85D for ; Tue, 22 Oct 2019 15:55:43 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id 3so16687326wmi.3 for ; Tue, 22 Oct 2019 08:55:43 -0700 (PDT) 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=YS0GekJ72h4QWTJCzBYGtGOwzBVrDEe0pE3cwjzRtLM=; b=F6MTsSCEyNhUPnw6XWzX3j7Ezrxws2zL/aNIaiVmIDl1wag+9sf7BbkbTFtkYLtZxl p+8+ZajhpkQzT5bgTduWk7XWyweyRDk0/g+xEJZksANcvr6gwVSEGHhzdU9XwVaEoyiG mA/nAAbz+rO/NXFaHCrawhAjlpeMEf0TKRukB87gXhgMB2WIBjWgwO6faudSYW4cVFbC 7+9bcnqhpt6cQzFd89NtEiqSaWy0OAYBIWfgJEla/0eRDuMkBFLjRYjObq9WcqnK7/gR 8qp9VhupVt3CgTzuAKE404EyfM3Rt8Vtvd8zhO2l/MMygD0Lrar56x5wtzc0Fn3v533S fEsA== X-Gm-Message-State: APjAAAXAI1Iic79e40oEmzcxnZwbYiCt/HMxfNFibgsmoTzUOKHB0AHf HB8ofPN4b9AX9lGZV+/xvLOD0PYIiUs= X-Google-Smtp-Source: APXvYqyTDiEsG9b+uQLErcNY8uGBbnTs51bzge5ZAUJaOCN+Pqc8+e3xas6iNUQPR5aCgqkildOnRQ== X-Received: by 2002:a1c:9ecf:: with SMTP id h198mr3587410wme.45.1571759741585; Tue, 22 Oct 2019 08:55:41 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id c21sm16465839wmb.46.2019.10.22.08.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 08:55:40 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/simple-kms: Standardize arguments for callbacks Date: Tue, 22 Oct 2019 17:55:36 +0200 Message-Id: <20191022155536.27939-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YS0GekJ72h4QWTJCzBYGtGOwzBVrDEe0pE3cwjzRtLM=; b=hHiUBuT9zDldmDUt90WJdRY6jxBsQqR47iezq2iMyWbumsA9zz25UPuarmQn834ngZ W33J+1Lp8hGIICPz7h/ii8Zw1+3ZrsGL1kRmIy8Oj5ZkbAaMEIqSDXkgRPCwygWLEhnd cUp9epeM63QOlBS06tiFyKFVJkISUd+qtW/Ug= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , virtualization@lists.linux-foundation.org, Gerd Hoffmann , Thomas Zimmermann , Daniel Vetter , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Passing the wrong type feels icky, everywhere else we use the pipe as the first parameter. Spotted while discussing patches with Thomas Zimmermann. Cc: Thomas Zimmermann Cc: Noralf Trønnes Cc: Gerd Hoffmann Cc: Eric Anholt Cc: Emil Velikov Cc: virtualization@lists.linux-foundation.org Cc: Linus Walleij Signed-off-by: Daniel Vetter --- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- drivers/gpu/drm/pl111/pl111_display.c | 4 ++-- include/drm/drm_simple_kms_helper.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c index 7d08d067e1a4..248c9f765c45 100644 --- a/drivers/gpu/drm/cirrus/cirrus.c +++ b/drivers/gpu/drm/cirrus/cirrus.c @@ -390,7 +390,7 @@ static int cirrus_conn_init(struct cirrus_device *cirrus) /* ------------------------------------------------------------------ */ /* cirrus (simple) display pipe */ -static enum drm_mode_status cirrus_pipe_mode_valid(struct drm_crtc *crtc, +static enum drm_mode_status cirrus_pipe_mode_valid(struct drm_simple_display_pipe *pipe, const struct drm_display_mode *mode) { if (cirrus_check_size(mode->hdisplay, mode->vdisplay, NULL) < 0) diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c index 046055719245..15fb516ae2d8 100644 --- a/drivers/gpu/drm/drm_simple_kms_helper.c +++ b/drivers/gpu/drm/drm_simple_kms_helper.c @@ -43,7 +43,7 @@ drm_simple_kms_crtc_mode_valid(struct drm_crtc *crtc, /* Anything goes */ return MODE_OK; - return pipe->funcs->mode_valid(crtc, mode); + return pipe->funcs->mode_valid(pipe, mode); } static int drm_simple_kms_crtc_check(struct drm_crtc *crtc, diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c index 024771a4083e..703ddc803c55 100644 --- a/drivers/gpu/drm/pl111/pl111_display.c +++ b/drivers/gpu/drm/pl111/pl111_display.c @@ -48,10 +48,10 @@ irqreturn_t pl111_irq(int irq, void *data) } static enum drm_mode_status -pl111_mode_valid(struct drm_crtc *crtc, +pl111_mode_valid(struct drm_simple_display_pipe *pipe, const struct drm_display_mode *mode) { - struct drm_device *drm = crtc->dev; + struct drm_device *drm = pipe->crtc.dev; struct pl111_drm_dev_private *priv = drm->dev_private; u32 cpp = priv->variant->fb_bpp / 8; u64 bw; diff --git a/include/drm/drm_simple_kms_helper.h b/include/drm/drm_simple_kms_helper.h index 4d89cd0a60db..15afee9cf049 100644 --- a/include/drm/drm_simple_kms_helper.h +++ b/include/drm/drm_simple_kms_helper.h @@ -49,7 +49,7 @@ struct drm_simple_display_pipe_funcs { * * drm_mode_status Enum */ - enum drm_mode_status (*mode_valid)(struct drm_crtc *crtc, + enum drm_mode_status (*mode_valid)(struct drm_simple_display_pipe *pipe, const struct drm_display_mode *mode); /**