From patchwork Wed Aug 10 16:52:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9273241 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A1DFA600CB for ; Wed, 10 Aug 2016 16:52:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9451828338 for ; Wed, 10 Aug 2016 16:52:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88EA42841B; Wed, 10 Aug 2016 16:52:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3618628338 for ; Wed, 10 Aug 2016 16:52:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F180D6E80E; Wed, 10 Aug 2016 16:52:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 888A66E80B for ; Wed, 10 Aug 2016 16:52:53 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id i5so10693845wmg.2 for ; Wed, 10 Aug 2016 09:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XCkN1Hc9ngB2YTjPho+6WLt8Xiq77GS29Wqm4nJmBKE=; b=CrAvJgGtTMyDXS7gdrFNxHAb7IUO4cR0+5bz8FU0XdHTPWrDem1ZUGULeYutnHhJqb 9CqbAKndPzeMloO0hU+0XbDGgpdJPjVO9769vqaN/rPGcWY4GhsHgduwNZ/nGaKDrcBC jhicMeZHCYKHTJ9kOoZOCHLO/5r8UFeTPxKLQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XCkN1Hc9ngB2YTjPho+6WLt8Xiq77GS29Wqm4nJmBKE=; b=NfEGMP0W2XsCUXYEJFrvfme7XgGKToh/U4siDBAO/UJLL5xXjhkG7WskRV+ECllxQz G7R0USArKafTNfrw/0Jvj5zuZH+JWYNarwgMql08ocFnwah6RknvIwt1AzRZwUPRGpZx ccJtFO2l7//D61oxc5p35zsl2pO57FN8bMIwJT3SynXBmNbCcRyI2pv9Nd1LvOj+CjZm ebQN4vsD4BpvC4fRVKULohFyqJrz9D6uYf6m4s1B9ZklBmiHUCsvPssdzqp2lOqQViJW CiLXlYnKJEo2N5qbezUxb77X8hhfKT1CMedrON5s3hMN5R+dPTaqoLG3JuIlGKa4Nma9 Yqog== X-Gm-Message-State: AEkooutASJcaQZwqdK0nfphWrHHNXLYkWou6wy4CB9R6JL6YYQjLQt+SfRuwNotTxCLTkA== X-Received: by 10.194.187.134 with SMTP id fs6mr4994476wjc.3.1470847972199; Wed, 10 Aug 2016 09:52:52 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id d80sm9238757wmd.14.2016.08.10.09.52.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 09:52:51 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 4/5] drm/radeon|amgpu: Make fbdev emulation optional Date: Wed, 10 Aug 2016 18:52:37 +0200 Message-Id: <1470847958-28465-5-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1470847958-28465-1-git-send-email-daniel.vetter@ffwll.ch> References: <1470847958-28465-1-git-send-email-daniel.vetter@ffwll.ch> Cc: alexander.deucher@amd.com, Daniel Vetter 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Seems to at least compile fine, only change needed was to use the fb_set_suspend helper. Cc: alexander.deucher@amd.com Signed-off-by: Daniel Vetter --- drivers/gpu/drm/Kconfig | 8 -------- drivers/gpu/drm/radeon/radeon_fb.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index fc357319de35..fe1e86ea6d27 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -129,12 +129,8 @@ config DRM_R128 config DRM_RADEON tristate "ATI Radeon" depends on DRM && PCI - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT select FW_LOADER select DRM_KMS_HELPER - select DRM_KMS_FB_HELPER select DRM_TTM select POWER_SUPPLY select HWMON @@ -153,12 +149,8 @@ source "drivers/gpu/drm/radeon/Kconfig" config DRM_AMDGPU tristate "AMD GPU" depends on DRM && PCI - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT select FW_LOADER select DRM_KMS_HELPER - select DRM_KMS_FB_HELPER select DRM_TTM select POWER_SUPPLY select HWMON diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 51284e882e94..568e036d547e 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -382,7 +382,7 @@ void radeon_fbdev_fini(struct radeon_device *rdev) void radeon_fbdev_set_suspend(struct radeon_device *rdev, int state) { if (rdev->mode_info.rfbdev) - fb_set_suspend(rdev->mode_info.rfbdev->helper.fbdev, state); + drm_fb_helper_set_suspend(&rdev->mode_info.rfbdev->helper, state); } bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)