From patchwork Wed May 27 03:19:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 6487041 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 68F84C0020 for ; Wed, 27 May 2015 03:21:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D70920706 for ; Wed, 27 May 2015 03:21:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 939AF20700 for ; Wed, 27 May 2015 03:21:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C6A5B7210B; Tue, 26 May 2015 20:21:25 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f178.google.com (mail-qk0-f178.google.com [209.85.220.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 609146E8D6 for ; Tue, 26 May 2015 20:20:41 -0700 (PDT) Received: by qkgx75 with SMTP id x75so105194701qkg.1 for ; Tue, 26 May 2015 20:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=CfXcaaTMCY8eImROeHwWbphmcbWCmhBzLMEN17YmZLM=; b=KC3uY+MguQgtQVQ20ROrHi+wUi3XSaj5Ps5NhUZeMXl+TuoARlNKUKOV29x+3HPgp+ a5GGeNnzv/ujTYHd23WIgXXwY04RB/jg1b/HjomaWknn3slRqZyLyk2JJqSFCTMw8wd0 WF3Xy/4C0B6nCgHqgZi8Yiod6lMqSme/1TUTLhrJslUrEB754J5ZtudsnUtMaQ1qLDcY /LBCnOUDClAZQGwz/aIgqdjDfl3hRBPUH0AP+xDM+PBXGXNKQO8yEVQmVsGYrM1M59Qm RSTy+Gsuvop6IiUCVzDzdvHY0IBla58c7opzGvwBaHyJ9ICGdy9ubmT4hxTYHr2Qlmwa 1+Qg== X-Received: by 10.140.151.131 with SMTP id 125mr38708216qhx.41.1432696840974; Tue, 26 May 2015 20:20:40 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id 20sm9629127qhf.14.2015.05.26.20.20.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 20:20:40 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 36/88] drm/amdgpu: fix const warnings in amdgpu_connectors.c Date: Tue, 26 May 2015 23:19:37 -0400 Message-Id: <1432696827-3752-8-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1432696827-3752-1-git-send-email-alexander.deucher@amd.com> References: <1432696827-3752-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Acked-by: Christian König Acked-by: Jammy Zhou Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 6a8d28f..27df17a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -135,7 +135,7 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector) if (connector->display_info.bpc) bpc = connector->display_info.bpc; else { - struct drm_connector_helper_funcs *connector_funcs = + const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; struct drm_encoder *encoder = connector_funcs->best_encoder(connector); struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder); @@ -216,7 +216,7 @@ amdgpu_connector_update_scratch_regs(struct drm_connector *connector, { struct drm_encoder *best_encoder = NULL; struct drm_encoder *encoder = NULL; - struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; + const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; bool connected; int i; @@ -597,7 +597,7 @@ static int amdgpu_connector_set_property(struct drm_connector *connector, if (connector->encoder) { amdgpu_encoder = to_amdgpu_encoder(connector->encoder); } else { - struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; + const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; amdgpu_encoder = to_amdgpu_encoder(connector_funcs->best_encoder(connector)); } @@ -788,7 +788,7 @@ static int amdgpu_connector_set_lcd_property(struct drm_connector *connector, if (connector->encoder) amdgpu_encoder = to_amdgpu_encoder(connector->encoder); else { - struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; + const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; amdgpu_encoder = to_amdgpu_encoder(connector_funcs->best_encoder(connector)); } @@ -852,7 +852,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) { struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); struct drm_encoder *encoder; - struct drm_encoder_helper_funcs *encoder_funcs; + const struct drm_encoder_helper_funcs *encoder_funcs; bool dret = false; enum drm_connector_status ret = connector_status_disconnected; int r; @@ -971,7 +971,7 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) struct amdgpu_device *adev = dev->dev_private; struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); struct drm_encoder *encoder = NULL; - struct drm_encoder_helper_funcs *encoder_funcs; + const struct drm_encoder_helper_funcs *encoder_funcs; int i, r; enum drm_connector_status ret = connector_status_disconnected; bool dret = false, broken_edid = false; @@ -1391,7 +1391,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) if (amdgpu_ddc_probe(amdgpu_connector, true)) /* try DDC */ ret = connector_status_connected; else if (amdgpu_connector->dac_load_detect) { /* try load detection */ - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; + const struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; ret = encoder_funcs->detect(encoder, connector); } }