From patchwork Mon Aug 1 13:52:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 12933806 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 095EAC00144 for ; Mon, 1 Aug 2022 14:00:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D305C5017; Mon, 1 Aug 2022 13:58:21 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01C2DC1463; Mon, 1 Aug 2022 13:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659361985; x=1690897985; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=NcTbzlV5Dz72mTPe4hWZ3TsW91wDU7s6ZjMp0vIZFeA=; b=PZBixtgqFJ1gHZHGp08MpRhuyH94xwnrBbszhkjdqwd0VjOLWfu9r8xq AZ6DwGy6VilezpixjWOgrP4m6El4YaMqyldaupyHd1Twhe33aJyqCRdBA crehTcrPywbdcMwgNQ3M56c1/tGUEMkLu9RT+NNtiJTONRB23BK0b5Ztl 8K2sVpmVoaoa3Xo6YvNJ8Uw1YLq/ncEDIv1t3QbR4NLP7fLxicCxtLtac 0C4L1zZcY9esC5/8VNhR6SHq4QYXy7NICTeSsF+UgrITJ4ONMNGl+6TWK 7iFNmoXbtAHwXSmo1nDzMlXUoP7g5/+m8RhQwywZSR5Nhvju3DHDBUkcR Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10426"; a="289921043" X-IronPort-AV: E=Sophos;i="5.93,208,1654585200"; d="scan'208";a="289921043" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2022 06:53:03 -0700 X-IronPort-AV: E=Sophos;i="5.93,208,1654585200"; d="scan'208";a="661157789" Received: from ideak-desk.fi.intel.com ([10.237.72.175]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2022 06:53:02 -0700 From: Imre Deak To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/3] drm/amd/display: Fix merge conflict resolution in amdgpu_dm_plane.c Date: Mon, 1 Aug 2022 16:52:57 +0300 Message-Id: <20220801135259.3039679-1-imre.deak@intel.com> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 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: intel-gfx@lists.freedesktop.org, Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The API change introduced in commit 30c637151cfa ("drm/plane-helper: Export individual helpers") was missed in the conflict resolution of commit d93a13bd75b9 ("Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip") fix this up. Fixes: d93a13bd75b9 ("Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip") Cc: Simon Ser Cc: Thomas Zimmermann Acked-by: Thomas Zimmermann Signed-off-by: Imre Deak Acked-by: Simon Ser Acked-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 8cd25b2ea0dca..5eb5d31e591de 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -1562,7 +1562,7 @@ int dm_drm_plane_get_property(struct drm_plane *plane, static const struct drm_plane_funcs dm_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, - .destroy = drm_primary_helper_destroy, + .destroy = drm_plane_helper_destroy, .reset = dm_drm_plane_reset, .atomic_duplicate_state = dm_drm_plane_duplicate_state, .atomic_destroy_state = dm_drm_plane_destroy_state, From patchwork Mon Aug 1 13:52:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 12933804 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 4445EC19F2B for ; Mon, 1 Aug 2022 13:58:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51590C3CE4; Mon, 1 Aug 2022 13:55:41 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E692C2EDB; Mon, 1 Aug 2022 13:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659361985; x=1690897985; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fHW/DZnRidfn52Gk2JhscN5xBiq6sdhJgZX8TCu4pRs=; b=KCA9e8zNtbRium0G/6h0a5FUj3dwnKiWsYYjHA5+Em6SEetTZBRN/1ce rg/wZnWqT5qGNYZ7NmkDPvd+2hYCivHGP0QbSFio8S1Hjri32977TwfZQ sdeyOsmRJ/4JOIyyUDp0isq9iX+vvxCUFaurVm4by524Ut1rtBiNecoFP vokeaUF4rQjwlThZ7ms+H81gJBxWf2fCJ/bU6qwub0L3VUnDzZALTPJQ8 MTh97kRgnoM2Zk9utfS1Sx8ULgcm7I/NTVNcG41onnPlnnT3K124KByZT mIfO2HkTq9FJRo3L4MpiuHMscBBMPk0I7L3x9U/1u9e+24IbBVG1+7vvK g==; X-IronPort-AV: E=McAfee;i="6400,9594,10426"; a="289921046" X-IronPort-AV: E=Sophos;i="5.93,208,1654585200"; d="scan'208";a="289921046" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2022 06:53:05 -0700 X-IronPort-AV: E=Sophos;i="5.93,208,1654585200"; d="scan'208";a="661157793" Received: from ideak-desk.fi.intel.com ([10.237.72.175]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2022 06:53:03 -0700 From: Imre Deak To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] drm/amd/display: Fix 'no previous prototype' compiler warns in amdgpu_dm_plane.c Date: Mon, 1 Aug 2022 16:52:58 +0300 Message-Id: <20220801135259.3039679-2-imre.deak@intel.com> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20220801135259.3039679-1-imre.deak@intel.com> References: <20220801135259.3039679-1-imre.deak@intel.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: Alan Liu , Rodrigo Siqueira , intel-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix compiler warnings like the following triggered by '-Wmissing-prototypes': CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.o drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:83:31: warning: no previous prototype for ‘amd_get_format_info’ [-Wmissing-prototypes] const struct drm_format_info *amd_get_format_info(const struct drm_mode_fb_cmd2 *cmd) Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes") Cc: Harry Wentland Cc: Alan Liu Cc: Rodrigo Siqueira Signed-off-by: Imre Deak Reviewed-by: Rodrigo Siqueira --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 5eb5d31e591de..da3b086b0d6ef 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -33,6 +33,7 @@ #include "amdgpu.h" #include "dal_asic_id.h" #include "amdgpu_display.h" +#include "amdgpu_dm_plane.h" #include "amdgpu_dm_trace.h" #include "gc/gc_11_0_0_offset.h" #include "gc/gc_11_0_0_sh_mask.h" From patchwork Mon Aug 1 13:52:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 12933808 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 33DF5C00144 for ; Mon, 1 Aug 2022 14:02:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D9DEC14A45B; Mon, 1 Aug 2022 13:58:15 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 61015C3B32; Mon, 1 Aug 2022 13:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659361987; x=1690897987; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CPvBQH1FedYAX9FU/4Wrfdczss9r4R9ly/4TTGjKkDE=; b=Es2eiMDnOMmLSYMZudEtppAaI1WTKRq+ei7O0M8YPMHEZx+lGeN7bJxp 24ILjzIgRaCeoYtxgsa3tE+3tccYlNK2YovFSrn2JzLCTFSdLxFx2bfGf V7RocZA3RfCc7h4cu9YYWv3smS8P21d1M/xNZ8iIw69HFgeI5kZniCbWu EftIwtI6IH5cEIpP69ZjH29WULLG3d2TM/w2ENNPptCeqJCVSLp19xTyZ wPbiMmXZhGOlzl8dZcyjW8pn3hnFhqngQsUkK6IGy2wsebg88PeyvPkmj IO3wXV0GTJrMCSCJprylieI/d5HETZwxIRD07ltEk4IR0fbcjLH8L+Aj6 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10426"; a="289921050" X-IronPort-AV: E=Sophos;i="5.93,208,1654585200"; d="scan'208";a="289921050" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2022 06:53:07 -0700 X-IronPort-AV: E=Sophos;i="5.93,208,1654585200"; d="scan'208";a="661157798" Received: from ideak-desk.fi.intel.com ([10.237.72.175]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2022 06:53:05 -0700 From: Imre Deak To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/3] drm/amd/display: Fix static declaration follows non-static declaration compiler warn Date: Mon, 1 Aug 2022 16:52:59 +0300 Message-Id: <20220801135259.3039679-3-imre.deak@intel.com> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20220801135259.3039679-1-imre.deak@intel.com> References: <20220801135259.3039679-1-imre.deak@intel.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: Alan Liu , intel-gfx@lists.freedesktop.org, Rodrigo Siqueira Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix the drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:951:13: error: static declaration of ‘get_min_max_dc_plane_scaling’ follows non-static declaration 951 | static void get_min_max_dc_plane_scaling(struct drm_device *dev, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:36: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.h:39:6: note: previous declaration of ‘get_min_max_dc_plane_scaling’ with type ‘void(struct drm_device *, struct drm_framebuffer *, int *, int *)’ 39 | void get_min_max_dc_plane_scaling(struct drm_device *dev, complier warning. Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes") Cc: Rodrigo Siqueira Cc: Harry Wentland Cc: Alan Liu Signed-off-by: Imre Deak Reviewed-by: Rodrigo Siqueira --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h index 95168c2cfa6fa..eeeec391f4b53 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h @@ -36,10 +36,6 @@ int fill_dc_scaling_info(struct amdgpu_device *adev, const struct drm_plane_state *state, struct dc_scaling_info *scaling_info); -void get_min_max_dc_plane_scaling(struct drm_device *dev, - struct drm_framebuffer *fb, - int *min_downscale, int *max_upscale); - int dm_plane_helper_check_state(struct drm_plane_state *state, struct drm_crtc_state *new_crtc_state);