From patchwork Sun Nov 26 10:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 13468808 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 707C8C4167B for ; Sun, 26 Nov 2023 10:56:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C3C410E0E5; Sun, 26 Nov 2023 10:56:14 +0000 (UTC) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8FD4010E0E5 for ; Sun, 26 Nov 2023 10:56:12 +0000 (UTC) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-54b18dbf148so1402115a12.1 for ; Sun, 26 Nov 2023 02:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700996171; x=1701600971; darn=lists.freedesktop.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=mN5h4JeQlyNJ6i5AWUS6aIyGqp9DnO+inxm6CANO/d4=; b=GivMo8FIVUv9TzwHLrfXQ79aNtOQ35csdA5h/Mxgt6fxcJ9Wa3oNb7g42DzjI7Ze4u ckMFU+mypz+ZwSCjiBrOj7XR/PxtQvYFo7zXWyG5pPi9v319OJjow5k/gg5+6Tbp02na 1pJcTcAJrKGwdPH3PWrSKlcgU4+2cr5/gzDvEnvC1gGK1WLOpidrMhaN7GsuV4vX/bFV DKz06AQ+LYLm/SGh2LfXBIazuRNvxFae8elaPkrsTe0wJAWCFws4fs0b1XarmlG3RUqz GsXAKHfVCrs80JYmpaan8ctfpPy3eDIO0vkCzHtBXMiXN+u0s7Dlqo9Bs+zS7NpUor/a haCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700996171; x=1701600971; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mN5h4JeQlyNJ6i5AWUS6aIyGqp9DnO+inxm6CANO/d4=; b=KLDMso4xnzv3Bc722ny+XI6s5DvH/4Bs7+ni7yIxv7ZJqxd89ZcaI8yE7cFV67jmP9 YqPMpwqFgGD9D6WjHlTsqgmPBbLGHBWHD7QacGB4KImrH+qSZL2MfNyyD2Hjc+HLuWiE BpdwqS2bCaVCHRCBVtI0huZFaAV3uC+ajGFslNNd8rRGOBLDwsWPMDUVL4Rvif+0jqlV OoBPpfPAnQMEUnXiWNSTgyKOzK6tCOKqUk88Tr/qCkagUnKwEKG99iZJqaz6M62hbowu 5AFCoxva2Aia0dwab4aBQuOyKQ7LuChg3ACdLQSwsLCTVTWaEww+WUOIHE/BiCS6S096 NTWw== X-Gm-Message-State: AOJu0YxEYHKEnKHeCbYuYT/ITcCW3oEySoNSZmC4KIVaOwyAwq7oOR7r PtFFhrJlABFroq9FCrQorKg= X-Google-Smtp-Source: AGHT+IEOyqWMk44eN134q8IBZJzyDe7wGYih+f76HdhbtNuQJ+hi/1cY0IEENQqhqYe0kBJwSUOqgQ== X-Received: by 2002:a50:8d4c:0:b0:543:5c2f:e0e6 with SMTP id t12-20020a508d4c000000b005435c2fe0e6mr5900684edt.17.1700996170898; Sun, 26 Nov 2023 02:56:10 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id s25-20020a508d19000000b0054ae9d77989sm3281586eds.64.2023.11.26.02.56.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 26 Nov 2023 02:56:10 -0800 (PST) Message-ID: <1ae0d08b-4f99-39a2-d692-d0cb1efaef7e@gmail.com> Date: Sun, 26 Nov 2023 11:56:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 From: Johan Jonker Subject: [PATCH v1 1/3] drm/rockchip: inno_hdmi: Remove useless mode_fixup To: hjc@rock-chips.com, heiko@sntech.de References: <2601b669-c570-f39d-8cf9-bff56c939912@gmail.com> Content-Language: en-US In-Reply-To: <2601b669-c570-f39d-8cf9-bff56c939912@gmail.com> 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: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, mripard@kernel.org, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The mode_fixup implementation doesn't do anything, so we can simply remove it. Signed-off-by: Maxime Ripard Signed-off-by: Johan Jonker --- drivers/gpu/drm/rockchip/inno_hdmi.c | 8 -------- 1 file changed, 8 deletions(-) -- 2.39.2 diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index 6e5b922a121e..cc48cbf85f31 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -517,13 +517,6 @@ static void inno_hdmi_encoder_disable(struct drm_encoder *encoder) inno_hdmi_set_pwr_mode(hdmi, LOWER_PWR); } -static bool inno_hdmi_encoder_mode_fixup(struct drm_encoder *encoder, - const struct drm_display_mode *mode, - struct drm_display_mode *adj_mode) -{ - return true; -} - static int inno_hdmi_encoder_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, @@ -540,7 +533,6 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder *encoder, static struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_funcs = { .enable = inno_hdmi_encoder_enable, .disable = inno_hdmi_encoder_disable, - .mode_fixup = inno_hdmi_encoder_mode_fixup, .mode_set = inno_hdmi_encoder_mode_set, .atomic_check = inno_hdmi_encoder_atomic_check, }; From patchwork Sun Nov 26 10:56:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 13468809 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3A580C4167B for ; Sun, 26 Nov 2023 10:56:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ADF6610E0EE; Sun, 26 Nov 2023 10:56:41 +0000 (UTC) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77E7510E0EE for ; Sun, 26 Nov 2023 10:56:40 +0000 (UTC) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a02cc476581so431999966b.2 for ; Sun, 26 Nov 2023 02:56:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700996199; x=1701600999; darn=lists.freedesktop.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=I3GW50siPE3V/OZVTf7EbN7pnDFJwfRoAQudNo2WQ48=; b=IuNNmb0BqpeaADG0ZcNEM1XQQgJKsCID3/nEQBa++ED+jA8alqzKtyMexqOXYGRE5g AeKST+hDyKoByXI+BZ8rx8HqYWyCUPZrT8XOGVoseEyypVdaGtzH13h6ZzygWjkrACuP Ct3cq/M94LsRnwr6J0QG7H4lmkozefG6dYaOgb5PW2GPjqoRo/XNjoAASXfBoN0MB9bi CGZ2woUy2HoEeUe6+uhQLjB3HGJgJ/5peb3rlmFYjXri3QBPmvtyCHYl+22VEdXNi3dm vxeFB9VbSgm0F60LQua8fcPyUZ/bGxwiRvzfQ4oxKvi26PAWPa5pf6LJVEJaFnxwU+dF 1VFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700996199; x=1701600999; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=I3GW50siPE3V/OZVTf7EbN7pnDFJwfRoAQudNo2WQ48=; b=ELiY8YKg5lGRO3iNJOayasot1+spG9oiG+X4cnrMBGQV+tIDggsSBUuECSaUd077Pl iq/8EJCl7dW0i9WEtbc7HTDTo0PWrrt7aI3NkYyFY5fyfkMKZW6FafT0TAvXilqyDJYJ FKGDSz6yA7OqWffKESAMXRnGr56w+Em4JP7Y1tEvCjxZqsmg9duQ/jn1W+fyl4ZM5fU1 aUWXxJrX16YbFJ0b3z/1htjwsHp9yMuExDhrUf7ZOwY0TQ6/TWM+Zm6b6hdwJNmf980j lxYewPr+nWHaCgYipssRutQ5EAO5BjYPBpNbRMWUzGZIx0N0t4/ZrtW8vCEmeHEsy83K 3LRw== X-Gm-Message-State: AOJu0YxkpBd8ShG59zDZln0GY3Ns8EWZNz6QiF+C0al5DNWQPLDTsqjb 8NbZwOoEtkaoLfJLR72FuX8= X-Google-Smtp-Source: AGHT+IHyK6mjmTRZ1o7XFvGUgHdwO4eWCrwMMAGqlF4KESwgSObaJJInGnzGUjM2H/elSkwoTRxo2g== X-Received: by 2002:a17:906:209e:b0:a0a:f9af:c159 with SMTP id 30-20020a170906209e00b00a0af9afc159mr3795403ejq.25.1700996198924; Sun, 26 Nov 2023 02:56:38 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id r21-20020a170906351500b00a0bd234566bsm1763175eja.143.2023.11.26.02.56.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 26 Nov 2023 02:56:38 -0800 (PST) Message-ID: Date: Sun, 26 Nov 2023 11:56:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 From: Johan Jonker Subject: [PATCH v1 2/3] drm/rockchip: inno_hdmi: Switch encoder hooks to atomic To: hjc@rock-chips.com, heiko@sntech.de References: <2601b669-c570-f39d-8cf9-bff56c939912@gmail.com> Content-Language: en-US In-Reply-To: <2601b669-c570-f39d-8cf9-bff56c939912@gmail.com> 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: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, mripard@kernel.org, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The inno_hdmi encoder still uses the non atomic variants of enable and disable. Convert to their atomic equivalents. In atomic mode there is no need to save the adjusted mode, so remove the mode_set function. Signed-off-by: Maxime Ripard Signed-off-by: Johan Jonker --- Changed V1: Combined patches Include drm_atomic.h --- drivers/gpu/drm/rockchip/inno_hdmi.c | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) -- 2.39.2 diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index cc48cbf85f31..535cca30c256 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -5,6 +5,13 @@ * Yakir Yang */ +#include +#include +#include +#include +#include +#include + #include #include #include @@ -16,12 +23,6 @@ #include #include -#include -#include -#include -#include -#include - #include "rockchip_drm_drv.h" #include "rockchip_drm_vop.h" @@ -62,7 +63,6 @@ struct inno_hdmi { unsigned int tmds_rate; struct hdmi_data_info hdmi_data; - struct drm_display_mode previous_mode; }; static struct inno_hdmi *encoder_to_inno_hdmi(struct drm_encoder *encoder) @@ -491,26 +491,27 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi, return 0; } -static void inno_hdmi_encoder_mode_set(struct drm_encoder *encoder, - struct drm_display_mode *mode, - struct drm_display_mode *adj_mode) +static void inno_hdmi_encoder_enable(struct drm_encoder *encoder, + struct drm_atomic_state *state) { struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder); + struct drm_connector_state *conn_state; + struct drm_crtc_state *crtc_state; - inno_hdmi_setup(hdmi, adj_mode); + conn_state = drm_atomic_get_new_connector_state(state, &hdmi->connector); + if (WARN_ON(!conn_state)) + return; - /* Store the display mode for plugin/DPMS poweron events */ - drm_mode_copy(&hdmi->previous_mode, adj_mode); -} - -static void inno_hdmi_encoder_enable(struct drm_encoder *encoder) -{ - struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder); + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); + if (WARN_ON(!crtc_state)) + return; + inno_hdmi_setup(hdmi, &crtc_state->adjusted_mode); inno_hdmi_set_pwr_mode(hdmi, NORMAL); } -static void inno_hdmi_encoder_disable(struct drm_encoder *encoder) +static void inno_hdmi_encoder_disable(struct drm_encoder *encoder, + struct drm_atomic_state *state) { struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder); @@ -531,10 +532,9 @@ inno_hdmi_encoder_atomic_check(struct drm_encoder *encoder, } static struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_funcs = { - .enable = inno_hdmi_encoder_enable, - .disable = inno_hdmi_encoder_disable, - .mode_set = inno_hdmi_encoder_mode_set, - .atomic_check = inno_hdmi_encoder_atomic_check, + .atomic_check = inno_hdmi_encoder_atomic_check, + .atomic_enable = inno_hdmi_encoder_enable, + .atomic_disable = inno_hdmi_encoder_disable, }; static enum drm_connector_status From patchwork Sun Nov 26 10:56:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 13468810 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8EBDEC4167B for ; Sun, 26 Nov 2023 10:57:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E6F0410E0F0; Sun, 26 Nov 2023 10:56:59 +0000 (UTC) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 909D210E0F0 for ; Sun, 26 Nov 2023 10:56:57 +0000 (UTC) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a00f67f120aso444647366b.2 for ; Sun, 26 Nov 2023 02:56:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700996216; x=1701601016; darn=lists.freedesktop.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=Ea1jLeAmnQSy9N/+din3DyjLsbvTIXpsAIcN3X7QL+4=; b=GUMInql1FIoqWuFDCF8FKOT1EWdejc54FqCp7xdFulV692DXOc8PtqxcMPeFlVKH8n RZKTkVzWTLBNkSNzt2NodsJVelzoPjSUZVeNBf9tIXe9HKoUU2TbNKa7vlHxS9+d59CC p0KhtVvFpPbujIT8Rn6/WGQFDZITTSYdy74LrUvN4bdWiiHcakdWMaMIceOynawHkhqg DK1rALD01SezH7IxKOVhCwkb7MkoGwNaiebz2KTJnetQd/xFjGEpJnX1dSehOkfzLnh8 SEfhOnVgW5oWCbmlF1//erR0HnEpPaAI6AU9Eq52ZSTb9ULwy1mv1HmJATyjW0JHg+GE OkfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700996216; x=1701601016; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ea1jLeAmnQSy9N/+din3DyjLsbvTIXpsAIcN3X7QL+4=; b=D8tm1hObn8byIMslWOxrAjpAZ7RRdhggvvra/RRz/P37w+4KC/dFqsOpg7OeFGnXIF z/eAfzTO63h0F0UckA2h3yALNMOoEenOsyflO17srJTJ58EghrQEk92nl+BnLnD6UbOw ERfi9M7v3RU74Hf7J8bXs0xHTww5StWD+rXQJVELf3ij5c4m8xPWX5s7lPrayJNUyCBu sERcxp173kZIJn0xxWXMhpGGkga/OzCcoi312UCjtNAhRbsl/YghyO6I5tPkdlSwHbHv CYU7ntAIyZ8dNZooTlODq3oL2z7e4GIza6r0MdTDG6wRzCPpX9bPFkZ9Ol+zvpaw3CfH 2UoQ== X-Gm-Message-State: AOJu0YzfAc2dbWzZYTJoJtKRY75T3kYI39/Q0U9TWWrujNIid0dFCql6 kLGSY9kS77VynpYyV3AsgNs= X-Google-Smtp-Source: AGHT+IG+GOdWj/VLVzcj/3gp7NPqtTAhePXdP862ib2/pBvG9jdmpQQQJ8+1VOz5rXcM4Gp99vR+SA== X-Received: by 2002:a17:906:4557:b0:9e6:38f2:8439 with SMTP id s23-20020a170906455700b009e638f28439mr6350967ejq.60.1700996215660; Sun, 26 Nov 2023 02:56:55 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id q17-20020a170906145100b00a0949d4f66fsm3083431ejc.54.2023.11.26.02.56.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 26 Nov 2023 02:56:55 -0800 (PST) Message-ID: Date: Sun, 26 Nov 2023 11:56:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 From: Johan Jonker Subject: [PATCH v1 3/3] drm/rockchip: inno_hdmi: Remove unused drm device pointer To: hjc@rock-chips.com, heiko@sntech.de References: <2601b669-c570-f39d-8cf9-bff56c939912@gmail.com> Content-Language: en-US In-Reply-To: <2601b669-c570-f39d-8cf9-bff56c939912@gmail.com> 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: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, mripard@kernel.org, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The drm_dev field in the inno_hdmi struct stores a pointer to the DRM device but is never used anywhere in the driver. Let's remove it. Signed-off-by: Maxime Ripard Signed-off-by: Johan Jonker --- drivers/gpu/drm/rockchip/inno_hdmi.c | 2 -- 1 file changed, 2 deletions(-) -- 2.39.2 diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index 535cca30c256..ff7fa11dbc61 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -48,7 +48,6 @@ struct inno_hdmi_i2c { struct inno_hdmi { struct device *dev; - struct drm_device *drm_dev; int irq; struct clk *pclk; @@ -821,7 +820,6 @@ static int inno_hdmi_bind(struct device *dev, struct device *master, return -ENOMEM; hdmi->dev = dev; - hdmi->drm_dev = drm; hdmi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hdmi->regs))