public inbox for linux-tegra@vger.kernel.org
 help / color / mirror / Atom feed
From: Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
To: Ben Skeggs <bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v2 09/10] drm/nouveau: support GK20A in nouveau_accel_init()
Date: Mon, 21 Apr 2014 15:02:21 +0900	[thread overview]
Message-ID: <1398060142-7937-10-git-send-email-acourbot@nvidia.com> (raw)
In-Reply-To: <1398060142-7937-1-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Skip the creation of a software channel for GK20A as software methods
are not yet supported.

Signed-off-by: Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index ddd83756b9a2..5b46148ffd32 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -208,6 +208,10 @@ nouveau_accel_init(struct nouveau_drm *drm)
 		return;
 	}
 
+	/* Need to figure out how to handle sw for gk20a */
+	if (device->chipset == 0xea)
+		goto skip_sw_init;
+
 	ret = nouveau_object_new(nv_object(drm), NVDRM_CHAN, NVDRM_NVSW,
 				 nouveau_abi16_swclass(drm), NULL, 0, &object);
 	if (ret == 0) {
@@ -234,6 +238,7 @@ nouveau_accel_init(struct nouveau_drm *drm)
 		return;
 	}
 
+skip_sw_init:
 	if (device->card_type < NV_C0) {
 		ret = nouveau_gpuobj_new(drm->device, NULL, 32, 0, 0,
 					&drm->notify);
-- 
1.9.2

  parent reply	other threads:[~2014-04-21  6:02 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-21  6:02 [PATCH v2 00/10] drm/nouveau: support for GK20A, cont'd Alexandre Courbot
2014-04-21  6:02 ` [PATCH v2 05/10] drm/nouveau/fifo: add GK20A support Alexandre Courbot
     [not found] ` <1398060142-7937-1-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2014-04-21  6:02   ` [PATCH v2 01/10] drm/nouveau/bar: only ioremap BAR3 if it exists Alexandre Courbot
2014-04-21  6:02   ` [PATCH v2 02/10] drm/nouveau/bar/nvc0: support chips without BAR3 Alexandre Courbot
2014-04-21  6:02   ` [PATCH v2 03/10] drm/nouveau/ibus: add GK20A support Alexandre Courbot
2014-04-21  6:02   ` [PATCH v2 04/10] drm/nouveau/fb: " Alexandre Courbot
     [not found]     ` <1398060142-7937-5-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2014-04-22 10:40       ` Thierry Reding
2014-04-23  2:07         ` Alexandre Courbot
     [not found]           ` <53572077.6090305-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2014-04-23  6:11             ` Alexandre Courbot
     [not found]               ` <CAAVeFuKscuN-=HJOarbzFkG1ARq6-Nfc2pf1ibam9b61Cjbs6Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-04-28 11:44                 ` Thierry Reding
2014-05-01  4:49                   ` Alexandre Courbot
2014-05-02  6:26                     ` Terje Bergström
2014-04-21  6:02   ` [PATCH v2 06/10] drm/nouveau/graph: enable when using external firmware Alexandre Courbot
2014-04-21  6:02   ` [PATCH v2 07/10] drm/nouveau/graph: pad firmware code at load time Alexandre Courbot
2014-04-21 18:03     ` Ilia Mirkin
     [not found]       ` <CAKb7UviQ6s8wRqwLVnE_A0NOw=WcVdFXG_wWmnZypwuaW_hnuw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-04-21 23:48         ` Ben Skeggs
     [not found]           ` <CACAvsv7J7yUaug=CoUfsPg5PXf=ZmwUD9XvCt4CqAvnamQNN9A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-04-22  2:08             ` Alexandre Courbot
2014-04-21  6:02   ` [PATCH v2 08/10] drm/nouveau/graph: add GK20A support Alexandre Courbot
2014-04-21  6:02   ` Alexandre Courbot [this message]
     [not found]     ` <1398060142-7937-10-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2014-04-21 18:07       ` [Nouveau] [PATCH v2 09/10] drm/nouveau: support GK20A in nouveau_accel_init() Ilia Mirkin
2014-04-22  1:58         ` Ben Skeggs
     [not found]         ` <CAKb7Uvg4kOfsE0gd4zLcwjShc4eVgVKA7zQM2r1aeatOybm8NQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-04-22  2:31           ` Alexandre Courbot
2014-04-21  6:02 ` [PATCH v2 10/10] drm/nouveau: support for probing GK20A Alexandre Courbot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1398060142-7937-10-git-send-email-acourbot@nvidia.com \
    --to=acourbot-ddmlm1+adcrqt0dzr+alfa@public.gmane.org \
    --cc=bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox