From: Stephen Warren <swarren@wwwdotorg•org>
To: David Herrmann <dh.herrmann@gmail•com>
Cc: "dri-devel@lists•freedesktop.org"
<dri-devel@lists•freedesktop.org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
Dave Airlie <airlied@redhat•com>
Subject: Re: Build break due to 28ec711 "drm/agp: move AGP cleanup paths to drm_agpsupport.c"
Date: Thu, 08 Aug 2013 13:21:00 -0600 [thread overview]
Message-ID: <5203EF9C.8080000@wwwdotorg.org> (raw)
In-Reply-To: <CANq1E4SZ+pz3V1UspUYC4sWJKBZim_4Eyp4OTU04cfVozTrfXg@mail.gmail.com>
On 08/08/2013 12:13 PM, David Herrmann wrote:
> Hi
>
> On Thu, Aug 8, 2013 at 8:00 PM, Stephen Warren <swarren@wwwdotorg•org> wrote:
>> In next-20130808, building tegra_defconfig for ARM yields:
>>
>>> drivers/built-in.o: In function `drm_lastclose':
>>> /home/swarren/shared/git_wa/kernel/kernel.git/drivers/gpu/drm/drm_drv.c:198: undefined reference to `drm_agp_clear'
>>
>> That's because drm_agp_clear() is called unconditionally, yet is only
>> conditionally built into drm_agpsupport.c (#if __OS_HAS_AGP).
>>
>> Should the call from drm_drv.c be conditional, or should there be a
>> dummy static inline replacement in include/drm/drmP.h for when AGP
>> support isn't available?
>
> Sorry, I missed testing with AGP=n and the code I fixed depended on
> dead-code-elimination to link correctly. I overlooked that. There is a
> patch pending on dri-devel:
> http://lists.freedesktop.org/archives/dri-devel/2013-August/043077.html
That makes it worse! To solve it, you need:
diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h
index f926542..a184eee 100644
--- a/include/drm/drm_agpsupport.h
+++ b/include/drm/drm_agpsupport.h
@@ -8,7 +8,7 @@
#include <linux/agp_backend.h>
#include <drm/drmP.h>
-#ifdef __OS_HAS_AGP
+#if __OS_HAS_AGP
void drm_free_agp(DRM_AGP_MEM * handle, int pages);
int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
next prev parent reply other threads:[~2013-08-08 19:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 18:00 Build break due to 28ec711 "drm/agp: move AGP cleanup paths to drm_agpsupport.c" Stephen Warren
2013-08-08 18:13 ` David Herrmann
2013-08-08 19:21 ` Stephen Warren [this message]
2013-08-08 20:00 ` David Herrmann
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=5203EF9C.8080000@wwwdotorg.org \
--to=swarren@wwwdotorg$(echo .)org \
--cc=airlied@redhat$(echo .)com \
--cc=dh.herrmann@gmail$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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