Add PVR Graphics Driver to the Cedartrail BSP

PATCH New [email protected] 1 participant 2 messages Mar 29, 2012

lore

Share & tools

lore

[email protected]

author

2012-03-29 17:50 UTC #0 lore raw

cover Add PVR Graphics Driver to the Cedartrail BSP

From: Kishore Bodke <[email protected]>

Hi,

These patch set updates the existing Cedartrail BSP with PVR Graphics Driver and also the SRCREVS to build with both pvr and nopvr images.

pvr version supports EFI and pcbios.
no-pvr (VESA Graphics) version does not support EFI.

Please pull into meta-intel/master.

Thanks
Kishore.

The following changes since commit f89405e115d73426c8a6450b6e795b5885d6bdf3:

MAINTAINERS: Add FRI2 maintainer (2012-03-23 09:46:15 -0700)

are available in the git repository at:
git://git.pokylinux.org/meta-intel-contrib kishore/cedartrail-pvr-graphics
http://git.pokylinux.org/cgit.cgi/meta-intel-contrib/log/?h=kishore/cedartrail-pvr-graphics

Kishore Bodke (1):
Cedartrail: Add pvr graphics driver

 conf/machine/include/ia32-base.inc                 |    2 +
 meta-cedartrail/README                             |   42 ++++++++-
 meta-cedartrail/conf/machine/cedartrail-nopvr.conf |   21 ++++
 meta-cedartrail/conf/machine/cedartrail.conf       |   13 ++-
 .../cedartrail-audio/cedartrail-audio.bb           |   30 ++++++
 .../cedartrail-audio/cedartrail-audio              |   42 ++++++++
 .../formfactor/cedartrail-nopvr/machconfig         |    3 +
 .../tasks/task-core-tools-profile.bbappend         |    2 +-
 .../xorg-driver/cdv-pvr-driver.inc                 |   48 +++++++++
 .../xorg-driver/cdv-pvr-driver_1.0.bb              |  101 ++++++++++++++++++++
 .../xserver-xf86-config/cedartrail-nopvr/xorg.conf |   26 +++++
 .../xserver-xf86-config/cedartrail/xorg.conf       |   24 ++---
 .../linux/linux-yocto-rt_3.0.bbappend              |   16 +++
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   20 ++++-
 .../ogg-CC-BY-3.0-music-samples_0.1.bb             |   23 +++++
 .../video-samples/bigbuckbunny-ogg.bb              |   24 +++++
 .../images/core-image-sato-dev.bbappend            |    2 +
 .../images/core-image-sato-sdk.bbappend            |    2 +
 .../recipes-sato/images/core-image-sato.bbappend   |    1 +
 19 files changed, 418 insertions(+), 24 deletions(-)
 create mode 100644 meta-cedartrail/conf/machine/cedartrail-nopvr.conf
 create mode 100644 meta-cedartrail/recipes-bsp/cedartrail-audio/cedartrail-audio.bb
 create mode 100644 meta-cedartrail/recipes-bsp/cedartrail-audio/cedartrail-audio/cedartrail-audio
 create mode 100644 meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
 create mode 100644 meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb
 create mode 100644 meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb
 create mode 100644 meta-cedartrail/recipes-sato/images/core-image-sato-dev.bbappend
 create mode 100644 meta-cedartrail/recipes-sato/images/core-image-sato-sdk.bbappend
 create mode 100644 meta-cedartrail/recipes-sato/images/core-image-sato.bbappend

Signature · 1 line

1.7.5.4

[email protected]

author

2012-03-29 17:50 UTC #1 lore raw

PATCH 1/1 Cedartrail: Add pvr graphics driver

From: Kishore Bodke <[email protected]>

Include the PVR Graphics driver to the Cedartrail BSP. These patch set will add the PVR Graphics driver and update the SRCREVs for both pvr and nopvr.

Signed-off-by Kishore Bodke <[email protected]>

---
 conf/machine/include/ia32-base.inc                 |    2 +
 meta-cedartrail/README                             |   42 ++++++++-
 meta-cedartrail/conf/machine/cedartrail-nopvr.conf |   21 ++++
 meta-cedartrail/conf/machine/cedartrail.conf       |   13 ++-
 .../cedartrail-audio/cedartrail-audio.bb           |   30 ++++++
 .../cedartrail-audio/cedartrail-audio              |   42 ++++++++
 .../formfactor/cedartrail-nopvr/machconfig         |    3 +
 .../tasks/task-core-tools-profile.bbappend         |    2 +-
 .../xorg-driver/cdv-pvr-driver.inc                 |   48 +++++++++
 .../xorg-driver/cdv-pvr-driver_1.0.bb              |  101 ++++++++++++++++++++
 .../xserver-xf86-config/cedartrail-nopvr/xorg.conf |   26 +++++
 .../xserver-xf86-config/cedartrail/xorg.conf       |   24 ++---
 .../linux/linux-yocto-rt_3.0.bbappend              |   16 +++
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   20 ++++-
 .../ogg-CC-BY-3.0-music-samples_0.1.bb             |   23 +++++
 .../video-samples/bigbuckbunny-ogg.bb              |   24 +++++
 .../images/core-image-sato-dev.bbappend            |    2 +
 .../images/core-image-sato-sdk.bbappend            |    2 +
 .../recipes-sato/images/core-image-sato.bbappend   |    1 +
 19 files changed, 418 insertions(+), 24 deletions(-)
 create mode 100644 meta-cedartrail/conf/machine/cedartrail-nopvr.conf
 create mode 100644 meta-cedartrail/recipes-bsp/cedartrail-audio/cedartrail-audio.bb
 create mode 100644 meta-cedartrail/recipes-bsp/cedartrail-audio/cedartrail-audio/cedartrail-audio
 create mode 100644 meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
 create mode 100644 meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb
 create mode 100644 meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb
 create mode 100644 meta-cedartrail/recipes-sato/images/core-image-sato-dev.bbappend
 create mode 100644 meta-cedartrail/recipes-sato/images/core-image-sato-sdk.bbappend
 create mode 100644 meta-cedartrail/recipes-sato/images/core-image-sato.bbappend

conf/machine/include/ia32-base.inc +2 -0

index 9b2ef5a..d1bd0d7 100644
@@ -64,3 +64,5 @@ XSERVER_IA32_EMGD = "emgd-driver-bin \
            "
 
 XSERVER_IA32_VESA = "xf86-video-vesa"
+
+XSERVER_IA32_PVR = "cdv-pvr-driver"

meta-cedartrail/README +40 -2

60 lines not on this page · raw message

meta-cedartrail/conf/machine/cedartrail-nopvr.conf new file +21 -0

new file mode 100644
index 0000000..5041a9a
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: Cedartrail
+
+#@DESCRIPTION: Machine configuration for Cedartrail systems
+# i.e. Cedarview processor + Tiger Point Chipset
+
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
+
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_VESA} \
+           "
+
+APPEND += "video=vesafb vga=0x318"
+
+MACHINE_EXTRA_RRECOMMENDS = "cedartrail-audio"
+
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"

meta-cedartrail/conf/machine/cedartrail.conf +11 -2

index 3bd5cf8..d0850f8 100644
@@ -7,9 +7,18 @@
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
 
+MACHINE_FEATURES += "pcbios efi"
+
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
+           ${XSERVER_IA32_PVR} \
            "
 
-APPEND += "video=vesafb vga=0x318"
+PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
+PREFERRED_VERSION_mesa-dri ?= "7.11"
+
+MACHINE_EXTRA_RRECOMMENDS = "cedartrail-audio"
+
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"

meta-cedartrail/recipes-bsp/cedartrail-audio/cedartrail-audio.bb new file +30 -0

new file mode 100644
index 0000000..9a43f02
@@ -0,0 +1,30 @@
+SUMMARY = "Provide a basic init script to enable audio"
+DESCRIPTION = "Set the volume and unmute the Front mixer setting during boot."
+SECTION = "base"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+PR = "r0"
+
+inherit update-rc.d
+
+RDEPENDS = "alsa-utils-amixer"
+
+SRC_URI = "file://cedartrail-audio"
+
+INITSCRIPT_NAME = "cedartrail-audio"
+INITSCRIPT_PARAMS = "defaults 90"
+
+do_install() {
+	install -d ${D}${sysconfdir} \
+	           ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/cedartrail-audio ${D}${sysconfdir}/init.d
+        cat ${WORKDIR}/${INITSCRIPT_NAME} | \
+            sed -e 's,/etc,${sysconfdir},g' \
+                -e 's,/usr/sbin,${sbindir},g' \
+                -e 's,/var,${localstatedir},g' \
+                -e 's,/usr/bin,${bindir},g' \
+                -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+        chmod 755 ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+}
+

meta-cedartrail/recipes-bsp/cedartrail-audio/cedartrail-audio/cedartrail-audio new file +42 -0

42 lines not on this page · raw message

meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig new file +3 -0

new file mode 100644
index 0000000..ffce012
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1

meta-cedartrail/recipes-core/tasks/task-core-tools-profile.bbappend +1 -1

index e972712..d49a3f5 100644
@@ -1,2 +1,2 @@
 RRECOMMENDS_task-core-tools-profile_append_cedartrail = " systemtap"
-
+RRECOMMENDS_task-core-tools-profile_append_cedartrail-nopvr = " systemtap"

meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc new file +48 -0

48 lines not on this page · raw message

meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb new file +101 -0

101 lines not on this page · raw message

meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf new file +26 -0

new file mode 100644
index 0000000..da4fc3c
@@ -0,0 +1,26 @@
+Section "Device"
+    Identifier	"Generic VESA"
+    Driver	"vesa"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device	  "Generic VESA"
+    Monitor       "Generic Monitor"
+    DefaultDepth  24
+EndSection
+
+Section "ServerLayout"
+    Identifier     "Default Layout"
+    Screen         "Default Screen"
+EndSection
+
+Section "ServerFlags"
+    Option        "DontZap"  "0"
+    Option        "AutoAddDevices"  "False"
+EndSection

meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf +8 ~~-16~~

index da4fc3c..1d085a4 100644
@@ -1,23 +1,15 @@
 Section "Device"
-    Identifier	"Generic VESA"
-    Driver	"vesa"
-EndSection
-
-Section "Monitor"
-    Identifier    "Generic Monitor"
-    Option        "DPMS"
-EndSection
-
-Section "Screen"
-    Identifier    "Default Screen"
-    Device	  "Generic VESA"
-    Monitor       "Generic Monitor"
-    DefaultDepth  24
+        Option     "DRIDisableVSync"    "False"
+        Identifier  "Card0"
+        Driver      "pvr"
+        BusID       "PCI:0:2:0"
+        Option      "SoftEXA"           "Off"
+        Option      "FlipChain"         "On"
 EndSection
 
 Section "ServerLayout"
-    Identifier     "Default Layout"
-    Screen         "Default Screen"
+        Identifier "default screen"
+        Option  "AIGLX" "on"
 EndSection
 
 Section "ServerFlags"

meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +16 -0

index 5a95d3e..ac56364 100644
@@ -1,10 +1,26 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
 COMPATIBLE_MACHINE_cedartrail = "cedartrail"
 KMACHINE_cedartrail  = "cedartrail"
 
 KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc"
+KERNEL_FEATURES_append_cedartrail += " cfg/drm-cdvpvr.scc"
+KERNEL_FEATURES_append_cedartrail += " bsp/cedartrail/cedartrail-pvr-merge.scc"
+KERNEL_FEATURES_append_cedartrail += "cfg/efi-ext.scc"
+
+COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
+KMACHINE_cedartrail-nopvr  = "cedartrail"
+KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
 
 # Update the following to use a different BSP branch or meta SRCREV
 #KBRANCH_cedartrail  = "yocto/standard/preempt-rt/base"
 #SRCREV_machine_pn-linux-yocto-rt_cedartrail ?= XXXX
 #SRCREV_meta_pn-linux-yocto-rt_cedartrail ?= XXXX
+
+
+
+
+
+
+
+

meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend +17 -3

index ca59e72..49b3de7 100644
@@ -2,7 +2,21 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE_cedartrail = "cedartrail"
 KMACHINE_cedartrail  = "yocto/standard/cedartrail"
-KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc"
+KERNEL_FEATURES_append_cedartrail += "cfg/smp.scc"
+KERNEL_FEATURES_append_cedartrail += "cfg/drm-cdvpvr.scc"
+KERNEL_FEATURES_append_cedartrail += "bsp/cedartrail/cedartrail-pvr-merge.scc"
+KERNEL_FEATURES_append_cedartrail += "cfg/efi-ext.scc"
+
+COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
+KMACHINE_cedartrail-nopvr  = "yocto/standard/cedartrail"
+KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_cedartrail ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94"
+SRCREV_meta_pn-linux-yocto_cedartrail ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
+
+SRCREV_machine_pn-linux-yocto_cedartrail-nopvr ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94"
+SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
+
+
+
 
-SRCREV_machine_pn-linux-yocto_cedartrail ?= "f389d310965a56091f688b28ea8be6d9cbb7fbbe"
-SRCREV_meta_pn-linux-yocto_cedartrail ?= "04a52a32cbdf0972033b97b83eaa83eb275dfdc9"

meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb new file +23 -0

new file mode 100644
index 0000000..fd65cc7
@@ -0,0 +1,23 @@
+SUMMARY = "ogg file format music samples"
+DESCRIPTION = "Installs ogg file format music samples in /home/Music dir"
+
+LICENSE = "CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+
+DEPENDS += " " 
+
+PR = "r0"
+
+SRC_URI = "http://downloads.yoctoproject.org/releases/media/music/ogg-CC-BY-3.0-music-samples-${PV}.tar.bz2 \
+            "
+
+SRC_URI[md5sum] = "dc3dd4adca69996edaffe8828e1ee165"
+SRC_URI[sha256sum] = "86381f8474d5ac2c80f54c951a8c22f67d352daa977341d3dfb4161e39ca3975"
+
+do_install() {
+
+install -d ${D}${base_prefix}/home/music
+install -m 0644  ${WORKDIR}/ogg-CC-BY-3.0-music-samples-${PV}/*/*.ogg ${D}${base_prefix}/home/music
+}
+
+FILES_${PN} += "${base_prefix}/home/music/*.ogg"

meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb new file +24 -0

new file mode 100644
index 0000000..036721c
@@ -0,0 +1,24 @@
+SUMMARY = "Big Buck Bunny video OGG sample "
+DESCRIPTION = "Installs Big Buck Bunny Video OGG file samples in /home/video dir "
+
+LICENSE = "CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+
+DEPENDS += " " 
+
+PR = "r0"
+
+SRC_URI = "http://blender-mirror.kino3d.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_stereo.ogg \
+            "
+
+
+SRC_URI[md5sum] = "576424c653da53e31b86c027e55758ae"
+SRC_URI[sha256sum] = "785b09a585be55f81326a3fcef2cdeeb7ebbc33932b6305fd84209928df67f28"
+
+do_install() {
+
+install -d ${D}${base_prefix}/home/Videos
+install -m 0644  ${WORKDIR}/*.ogg ${D}${base_prefix}/home/Videos
+}
+
+FILES_${PN} += "${base_prefix}/home/Videos/*.ogg"

meta-cedartrail/recipes-sato/images/core-image-sato-dev.bbappend new file +2 -0

new file mode 100644
index 0000000..33283f4
@@ -0,0 +1,2 @@
+IMAGE_INSTALL += "web-webkit bigbuckbunny-ogg ogg-CC-BY-3.0-music-samples"
+

meta-cedartrail/recipes-sato/images/core-image-sato-sdk.bbappend new file +2 -0

new file mode 100644
index 0000000..33283f4
@@ -0,0 +1,2 @@
+IMAGE_INSTALL += "web-webkit bigbuckbunny-ogg ogg-CC-BY-3.0-music-samples"
+

meta-cedartrail/recipes-sato/images/core-image-sato.bbappend new file +1 -0

new file mode 100644
index 0000000..4c1ccac
@@ -0,0 +1 @@
+IMAGE_INSTALL += "web-webkit bigbuckbunny-ogg  ogg-CC-BY-3.0-music-samples"

Signature · 1 line

1.7.5.4