Dove DT and HDMI on v3.16-rc1

Commit Message

Russell King - ARM Linux June 18, 2014, 3:30 p.m. UTC

On Wed, Jun 18, 2014 at 05:10:32PM +0200, Sebastian Hesselbarth wrote:
> xf86-video-armada needs some missing
> #include "picturestr.h"
> for raring, but whole process has been very straight forward.

I'm only aware of this (sorry, copy'n'pasted) which I found when trying
to build against ubuntu 14.04.  If further patches are needed to make it
compatible with more Xorg versions, please ensure that they find their
way into my inbox...

Comments

Sebastian Hesselbarth June 18, 2014, 3:39 p.m. UTC | #1

On 06/18/2014 05:30 PM, Russell King - ARM Linux wrote:
> On Wed, Jun 18, 2014 at 05:10:32PM +0200, Sebastian Hesselbarth wrote:
>> xf86-video-armada needs some missing
>> #include "picturestr.h"
>> for raring, but whole process has been very straight forward.
>
> I'm only aware of this (sorry, copy'n'pasted) which I found when trying
> to build against ubuntu 14.04.  If further patches are needed to make it
> compatible with more Xorg versions, please ensure that they find their
> way into my inbox...

Your patch also makes the xorg driver build fine on raring.
When I encountered the build error, I just tried the first hit on Google
- I didn't investigate it at all.

Sebastian

Russell King - ARM Linux June 18, 2014, 3:59 p.m. UTC | #2

On Wed, Jun 18, 2014 at 05:39:08PM +0200, Sebastian Hesselbarth wrote:
> On 06/18/2014 05:30 PM, Russell King - ARM Linux wrote:
>> On Wed, Jun 18, 2014 at 05:10:32PM +0200, Sebastian Hesselbarth wrote:
>>> xf86-video-armada needs some missing
>>> #include "picturestr.h"
>>> for raring, but whole process has been very straight forward.
>>
>> I'm only aware of this (sorry, copy'n'pasted) which I found when trying
>> to build against ubuntu 14.04.  If further patches are needed to make it
>> compatible with more Xorg versions, please ensure that they find their
>> way into my inbox...
>
> Your patch also makes the xorg driver build fine on raring.
> When I encountered the build error, I just tried the first hit on Google
> - I didn't investigate it at all.

Thanks, just pushed that change out.

Patch

diff --git a/src/common_drm.h b/src/common_drm.h
index b0c3cd4..3bc5dc6 100644
--- a/src/common_drm.h
+++ b/src/common_drm.h
@@ -1,8 +1,8 @@ 
 #ifndef COMMON_DRM_H
 #define COMMON_DRM_H
 
-#include "compat-api.h"
 #include "xf86Crtc.h"
+#include "compat-api.h"
 
 struct common_crtc_info {
 	int drm_fd;
diff --git a/src/vivante_unaccel_render.c b/src/vivante_unaccel_render.c
index ad4d5cf..0496d7a 100644
--- a/src/vivante_unaccel_render.c
+++ b/src/vivante_unaccel_render.c
@@ -11,11 +11,11 @@ 
 #include "config.h"
 #endif
 
-#include "compat-api.h"
 #include "fb.h"
 #include "fbpict.h"
 #include "mipict.h"
 
+#include "compat-api.h"
 #include "vivante_unaccel.h"
 #include "vivante_utils.h"