From patchwork Fri Oct 12 02:05:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12173 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id BB90D23E57 for ; Fri, 12 Oct 2012 02:06:16 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 53B44A1937E for ; Fri, 12 Oct 2012 02:06:16 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so4021144iej.11 for ; Thu, 11 Oct 2012 19:06:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=K8eG6pO1AQvTgoDyQvZHJaYnw2gvlkPVikrN36Nx2R8=; b=nKYWExq4UUh+C0AwWgvVQZ4jhGU+lkdE5dEGiE/jpvk10X0onQG2Fk+7Q5pq1+KCG7 ZHy0xDGzm56/v6cApxBUOIeA7NRfiJ+N7j9DOA8hXUAjUUc8lZn13bU4LMeiXL6sI/Ki 5Z6LGtHWmCHaU0CGOfAoJPRlie4G/dse9XAYqbi72yFl8rHz37Jp3SKLirT8L+1ScLdL 55Qz5xCLIcVErtBUGR0SijZx8OurzqagEvUbj6pPLl0B4m3IZENoqmo0pE4GQDBYvrDL ICWDxEoi11S0fJSSinsMkYSFqKZ02mW3LlTYQnB9Q0kxr/7WphH52wWAI99JjjT9DPwr lk8A== Received: by 10.50.91.195 with SMTP id cg3mr808485igb.57.1350007575801; Thu, 11 Oct 2012 19:06:15 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp132351igt; Thu, 11 Oct 2012 19:06:15 -0700 (PDT) Received: by 10.182.46.65 with SMTP id t1mr2371686obm.20.1350007575329; Thu, 11 Oct 2012 19:06:15 -0700 (PDT) Received: from mail-oa0-f50.google.com (mail-oa0-f50.google.com [209.85.219.50]) by mx.google.com with ESMTPS id c7si6666952obv.132.2012.10.11.19.06.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 19:06:15 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.219.50 as permitted sender) client-ip=209.85.219.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.219.50 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-oa0-f50.google.com with SMTP id n16so2982909oag.37 for ; Thu, 11 Oct 2012 19:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=K8eG6pO1AQvTgoDyQvZHJaYnw2gvlkPVikrN36Nx2R8=; b=XMI84uHEXe40C3rQN3o0JrbMkk9iY8M53+UQSLWTxA8eUvByTswQDFNwMkGR0EOtpJ q1ZaaXWmlN4GXIQKyRdzyDgJsklag/t8TptUMC+d6K088hOc3+1GTykz9aeH4m3AxmcG eCnzhnbA/jZI9TZoQfje1JasKD29fO53vWc1vKyYMoUy//6FQmoXYtOhwxxVLF3atlwg /3DQlLigZlgctCJvJbC2giOX7UbV/HwLqiquL//t79eZ7SbW0dE6qgvXn0ZpdC2OSKbV nZTRY5QVbM+Ir4fMm5WpD3ZLCIfJbHayVbKMNbtWscZblFZnVfQSGUW0ofFOr6pmn/fr 9yVw== Received: by 10.60.7.104 with SMTP id i8mr2300602oea.31.1350007575168; Thu, 11 Oct 2012 19:06:15 -0700 (PDT) Received: from localhost (ppp-70-129-143-201.dsl.rcsntx.swbell.net. [70.129.143.201]) by mx.google.com with ESMTPS id b5sm5621087obd.18.2012.10.11.19.06.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 19:06:14 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, airlied@linux.ie, daniel.vetter@ffwll.ch, bskeggs@redhat.com, laurent.pinchart@ideasonboard.com, alexander.deucher@amd.com, alan@linux.intel.com, jakob@vmware.com, Rob Clark Subject: [PATCH 3/9] drm/nouveau: drm_connector_property -> drm_object_property Date: Thu, 11 Oct 2012 21:05:56 -0500 Message-Id: <1350007562-22323-4-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350007562-22323-1-git-send-email-rob.clark@linaro.org> References: <1350007562-22323-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQnh2TVd32oJ4hF7gRMqZ59rg85hUvWsFZH2Sqlevy8SYmivAODLoat6G31ItqO9tJBBVKXW From: Rob Clark Signed-off-by: Rob Clark --- drivers/gpu/drm/nouveau/nouveau_connector.c | 22 +++++++++++----------- drivers/gpu/drm/nouveau/nv17_tv.c | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 7b11edb..0fda539 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -201,7 +201,7 @@ nouveau_connector_set_encoder(struct drm_connector *connector, } if (nv_connector->type == DCB_CONNECTOR_DVI_I) { - drm_connector_property_set_value(connector, + drm_object_property_set_value(&connector->base, dev->mode_config.dvi_i_subconnector_property, nv_encoder->dcb->type == OUTPUT_TMDS ? DRM_MODE_SUBCONNECTOR_DVID : @@ -1020,7 +1020,7 @@ nouveau_connector_create(struct drm_device *dev, int index) /* Init DVI-I specific properties */ if (nv_connector->type == DCB_CONNECTOR_DVI_I) - drm_connector_attach_property(connector, dev->mode_config.dvi_i_subconnector_property, 0); + drm_object_attach_property(&connector->base, dev->mode_config.dvi_i_subconnector_property, 0); /* Add overscan compensation options to digital outputs */ if (disp->underscan_property && @@ -1028,31 +1028,31 @@ nouveau_connector_create(struct drm_device *dev, int index) type == DRM_MODE_CONNECTOR_DVII || type == DRM_MODE_CONNECTOR_HDMIA || type == DRM_MODE_CONNECTOR_DisplayPort)) { - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, disp->underscan_property, UNDERSCAN_OFF); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, disp->underscan_hborder_property, 0); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, disp->underscan_vborder_property, 0); } /* Add hue and saturation options */ if (disp->vibrant_hue_property) - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, disp->vibrant_hue_property, 90); if (disp->color_vibrance_property) - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, disp->color_vibrance_property, 150); switch (nv_connector->type) { case DCB_CONNECTOR_VGA: if (dev_priv->card_type >= NV_50) { - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, dev->mode_config.scaling_mode_property, nv_connector->scaling_mode); } @@ -1065,18 +1065,18 @@ nouveau_connector_create(struct drm_device *dev, int index) default: nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN; - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, dev->mode_config.scaling_mode_property, nv_connector->scaling_mode); if (disp->dithering_mode) { nv_connector->dithering_mode = DITHERING_MODE_AUTO; - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, disp->dithering_mode, nv_connector->dithering_mode); } if (disp->dithering_depth) { nv_connector->dithering_depth = DITHERING_DEPTH_AUTO; - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, disp->dithering_depth, nv_connector->dithering_depth); } diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c index 67be5db..0804c90 100644 --- a/drivers/gpu/drm/nouveau/nv17_tv.c +++ b/drivers/gpu/drm/nouveau/nv17_tv.c @@ -178,7 +178,7 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector) break; } - drm_connector_property_set_value(connector, + drm_object_property_set_value(&connector->base, conf->tv_subconnector_property, tv_enc->subconnector); @@ -652,25 +652,25 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder, drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, conf->tv_select_subconnector_property, tv_enc->select_subconnector); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, conf->tv_subconnector_property, tv_enc->subconnector); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, conf->tv_mode_property, tv_enc->tv_norm); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, conf->tv_flicker_reduction_property, tv_enc->flicker); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, conf->tv_saturation_property, tv_enc->saturation); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, conf->tv_hue_property, tv_enc->hue); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, conf->tv_overscan_property, tv_enc->overscan);