Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android msm 2.6.35 ics #1

Open
wants to merge 105 commits into
base: android-msm-2.6.35
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
a3dd2e8
msm: kgsl: Remove uneeded registers from the postmortem dump
Feb 23, 2011
de1d410
msm: kgsl: Remove code setting previously unused field in REG_TO_MEM …
Feb 24, 2011
b0baa76
msm: kgsl: Add a sysfs node to enable turning off napping
Feb 24, 2011
e995129
msm: kgsl: Split GPU registers to avoid RBBM errors
Feb 22, 2011
2451b72
msm: kgsl: Make register output in the postmortem dump optional
Mar 3, 2011
f435934
msm: kgsl: Remove unused memory functions
Mar 7, 2011
47f4da9
msm: kgsl: Decrement the coherent statistics when pagetables are freed
Mar 11, 2011
1cee1b4
msm: kgsl: Remove unused statistics gathering from ringbuffer
Mar 9, 2011
256755f
msm: kgsl: print the MH_AXI_ERROR register during axi error interrupts
jgebben Mar 18, 2011
dbef693
msm: kgsl: Fix bad return value for log _get function
Mar 22, 2011
2a8ec26
msm: kgsl: Fix string overrun in postmortem dump
Apr 1, 2011
bebd612
msm: kgsl: Return EDEADLK error if GPU had hung
Apr 5, 2011
9306c06
msm: kgsl: unravel the 2d register functions
jgebben Apr 7, 2011
4a5f777
msm: kgsl: fix mmu fault arising from multicontext scenario
May 10, 2011
1823ff6
msm: kgsl: Do not check nap_allowed to go to SLEEP
May 19, 2011
562ace6
Revert "msm: kgsl: Enable TZ change"
Jun 6, 2011
f12df5b
msm: kgsl: reset more registers during gmem save/restore
Jun 13, 2011
5e4a6af
msm: kgsl: Fix mmu pagefaults after recovery
Jun 14, 2011
79658be
msm: kgsl: Fix access to ringbuffer in recovery code
Jun 14, 2011
191a21e
msm: kgsl: Enable TZ change
Jun 2, 2011
6ecc86f
msm: kgsl: Do not thrash general workqueue
Jun 14, 2011
9e656af
msm: kgsl: Rename and expand calc_idle
Jun 14, 2011
cc696c3
msm: kgsl: Increase the memory stats in mmu_map for proper
Aug 1, 2011
5766378
msm: kgsl: Update pwrlevel_change
Sep 12, 2011
a54e45d
msm: kgsl: Prevent writes to ringbuffer WPTR from being dropped
Sep 7, 2011
cfea04f
msm: kgsl: Use ringbuffer WPTR drop prevention workaround only for a2…
Sep 26, 2011
492bab0
msm: kgsl: Remove WPTR drop prevention workaround
Sep 30, 2011
690f8d1
msm: kgsl: Add a periodic check to turn the TZ algorithm on
Oct 21, 2011
8a93ead
msm: kgsl: Clocks should be set to the active level during NAP
Oct 27, 2011
2fc0fd4
msm: updated adreno driver
Kali- Nov 17, 2011
0109488
driver: qt602240_ts: ICS compatibity
Kali- Nov 19, 2011
d2dd449
netfilter: add xt_qtaguid matching module
jpa468 Jun 20, 2011
ceea8cc
nf: qtaguid: workaround xt_socket_get_sk() returning bad SKs.
jpa468 Jun 28, 2011
369fbb6
nf: qtaguid: make procfs entry for ctrl return correct data.
jpa468 Jun 28, 2011
0b68ef4
netfilter: qtaguid: fix bad-arg handling when tagging socket
jpa468 Jul 6, 2011
d2407d0
netfitler: xt_qtaguid: add another missing spin_unlock.
jpa468 Jul 7, 2011
2ff434a
netfilter: qtaguid: add tag delete command, expand stats output.
jpa468 Jul 16, 2011
257b7a7
netfilter: xt_qtaguid: add uid permission checks during ctrl/stats ac…
jpa468 Jul 17, 2011
1733dae
netfilter: qtaguid: disable #define DEBUG
jpa468 Jul 22, 2011
f98d509
netfilter: xt_qtaguid: add counter sets and matching control
jpa468 Aug 9, 2011
18829dc
netfilter: xt_qtaguid: recognize IPV6 interfaces. root is procfs priv…
jpa468 Aug 9, 2011
582c595
netfilter: xt_qtaguid: Fix socket refcounts when tagging
jpa468 Aug 17, 2011
11865f1
netfilter: xt_qtaguid: Fix sockfd_put() call within spinlock
jpa468 Aug 18, 2011
9b51617
netfilter: xt_qtaguid: add some tagging/matching stats
jpa468 Aug 20, 2011
39b7027
netfilter: xt_qtaguid: fix dev_stats for missing NETDEV_UNREGISTER
jpa468 Aug 26, 2011
f3c1f35
netfilter: qtaguid: fix proc/.../stats uid filtered output
jpa468 Aug 31, 2011
655b1c4
netfilter: xt_qtaguid: 1st pass at tracking tag based data resources
jpa468 Sep 9, 2011
ba63735
netfilter: xt_qtaguid: warn only once for missing proc qtaguid data
jpa468 Sep 11, 2011
ef7c9fb
netfilter: xt_qtaguid: work around devices that reset their stats
jpa468 Sep 15, 2011
fe6ad61
netfilter: xt_qtaguid: provide an iface_stat_all proc entry
jpa468 Sep 20, 2011
064d35c
netfilter: xt_qtaguid: change WARN_ONCE into pr_warn_once
jpa468 Sep 20, 2011
e639e85
netfilter: xt_qtaguid: fix crash after using delete ctrl command
jpa468 Sep 26, 2011
85fd489
netfilter: xt_qtaguid: add missing tracking for no filp case
jpa468 Sep 29, 2011
51958ba
netfilter: xt_qtaguid: Fix the stats info display order
ashish-s-sharma Oct 4, 2011
8eaebbe
netfilter: xt_qtaguid: fix crash on ctrl delete command
jpa468 Oct 8, 2011
b540dfe
net: percpu net_device refcount
Oct 11, 2010
0fe2754
netfilter: nf_conntrack: IPS_UNTRACKED bit
Jun 8, 2010
21285d3
netfilter: use NFPROTO_IPV4 instead of AF_INET
xiaosuo Sep 16, 2010
f235f4d
netfilter: xt_TPROXY: the length of lines should be within 80
xiaosuo Jul 9, 2010
c7059ec
tproxy: kick out TIME_WAIT sockets in case a new connection comes in …
bazsi Oct 21, 2010
4cf428b
tproxy: added IPv6 support to the socket match
bazsi Oct 21, 2010
a887151
tproxy: added IPv6 support to the TPROXY target
bazsi Oct 21, 2010
ac1ce7d
tproxy: use the interface primary IP address as a default value for -…
bazsi Oct 21, 2010
82e1ba4
netfilter: fix module dependency issues with IPv6 defragmentation, ip…
Oct 24, 2010
ab43ed4
netfilter: xt_socket: Make tproto signed in socket_mt6_v1().
davem330 Oct 28, 2010
ba8805d
tproxy: add lookup type checks for UDP in nf_tproxy_get_sock_v4()
bazsi Oct 21, 2010
446122d
netfilter: tproxy: nf_tproxy_assign_sock() can handle tw sockets
Sep 21, 2010
55fd52b
netfilter: tproxy: do not assign timewait sockets to skb->sk
Feb 17, 2011
b9adca0
netfilter: add more values to enum ip_conntrack_info
May 19, 2011
1e5b70f
nf: xt_socket: export the fancy sock finder code
jpa468 Jun 15, 2011
25bacf9
nf: xt_qtaguid: 2.6.35 compat
rmcc Nov 17, 2011
81d9412
usb: gadget: remove ancient code
Kali- Nov 19, 2011
e5b6ea5
E730: update cm defconfig for ICS
Kali- Nov 19, 2011
08cef41
E730: merge latest LGE kernel
Kali- Nov 20, 2011
05cd3c0
netfilter: adding the original quota2 from xtables-addons
jpa468 Jun 21, 2011
dac5cda
netfitler: fixup the quota2, and enable.
jpa468 Jul 12, 2011
9987ebc
netfilter: quota2: add support to log quota limit reached.
jpa468 Jul 13, 2011
78db324
E730: update defconfig
Jun 21, 2011
7debcc9
Remove LGE_BROADCAST
Kali- Dec 23, 2011
feb6fc1
msmfb: display: support for overlay wait ioctl
Oct 14, 2011
88004f1
msm: video: Fix build
Kali- Dec 25, 2011
93a1fc8
Kangd Kgsl and Genlock patch from semc
Kali- Dec 27, 2011
597f52e
tproxy: added IPv6 socket lookup function to nf_tproxy_core
bazsi Dec 28, 2011
0d2de74
tproxy: split off ipv6 defragmentation to a separate module
bazsi Dec 28, 2011
625c295
netfilter: fix compilation when conntrack is disabled but tproxy is e…
bazsi Dec 28, 2011
70584bd
E730: update cm defconfig
Kali- Dec 28, 2011
2564bec
E730: revert headset changes
Kali- Jan 1, 2012
3d8495c
msm_fb: HDMI: Support for 480p 16:9 in HDMI Driver
Jun 15, 2011
e673e30
msm_fb: display: Add YV12 support in the MDP
Oct 5, 2011
aaf2de1
msm: display: HDMI: Driver support for CEC feature
Nov 17, 2011
aefd7a1
msm: display: HDMI: Driver support for CEC feature
Nov 18, 2011
0a0e0d1
msm_fb: Remove Audio Packet Control Register setup
Nov 18, 2011
690a59f
msm: HDMI: CEC: Hardware FSM reset.
Nov 1, 2011
7d7f71e
msm_fb: display: cleanup usage of shared pipes in overlay
Nov 17, 2011
80607fb
msm_fb: Check for ACP and ACFG register before reset core.
Nov 4, 2011
832b098
msm: fb: HDMI: Sending AVI Info Frame even if HDCP is disabled
Jun 14, 2011
a8681f7
msm_fb: HDMI: EDID > 2 blocks, params not set.
Oct 19, 2011
ea686fd
msm: vidc: Fix handling EOS with bitstream error.
Nov 28, 2011
36b271b
msm_fb: Fixing Aspect Ratio
Dec 15, 2011
666088a
msm_fb: Removing HDCP timedout error.
Dec 15, 2011
0534750
msm: vidc update to latest version
Kali- Jan 1, 2012
0456db6
msm: fix after mdp update
Kali- Jan 3, 2012
3666464
script: use default 'compile by'
Kali- Jan 3, 2012
76ec81b
video: Allow fbcon to be built as a single module
rmcc Jan 3, 2012
372c246
E730: update cm defconfig
Kali- Jan 3, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
msm: kgsl: print the MH_AXI_ERROR register during axi error interrupts
Change-Id: I04aefa1481b1b64ed854af2c640602810ae39f13
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
  • Loading branch information
jgebben authored and Kali- committed Nov 17, 2011

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 256755f70c870ea0b0da7f66c476c78475052f9e
6 changes: 4 additions & 2 deletions drivers/gpu/msm/kgsl_g12.c
Original file line number Diff line number Diff line change
@@ -114,7 +114,8 @@ static struct kgsl_g12_device device_2d0 = {
.invalidate = ADDR_MH_MMU_INVALIDATE,
.interrupt_mask = ADDR_MH_INTERRUPT_MASK,
.interrupt_status = ADDR_MH_INTERRUPT_STATUS,
.interrupt_clear = ADDR_MH_INTERRUPT_CLEAR
.interrupt_clear = ADDR_MH_INTERRUPT_CLEAR,
.axi_error = ADDR_MH_AXI_ERROR,
},
},
.pwrctrl = {
@@ -160,7 +161,8 @@ static struct kgsl_g12_device device_2d1 = {
.invalidate = ADDR_MH_MMU_INVALIDATE,
.interrupt_mask = ADDR_MH_INTERRUPT_MASK,
.interrupt_status = ADDR_MH_INTERRUPT_STATUS,
.interrupt_clear = ADDR_MH_INTERRUPT_CLEAR
.interrupt_clear = ADDR_MH_INTERRUPT_CLEAR,
.axi_error = ADDR_MH_AXI_ERROR,
},
},
.pwrctrl = {
6 changes: 4 additions & 2 deletions drivers/gpu/msm/kgsl_mmu.c
Original file line number Diff line number Diff line change
@@ -577,9 +577,11 @@ void kgsl_mh_intrcallback(struct kgsl_device *device)
kgsl_regread(device, device->mmu.reg.interrupt_status, &status);

if (status & MH_INTERRUPT_MASK__AXI_READ_ERROR) {
KGSL_MEM_CRIT(device, "axi read error interrupt\n");
kgsl_regread(device, device->mmu.reg.axi_error, &reg);
KGSL_MEM_CRIT(device, "axi read error interrupt: %08x\n", reg);
} else if (status & MH_INTERRUPT_MASK__AXI_WRITE_ERROR) {
KGSL_MEM_CRIT(device, "axi write error interrupt\n");
kgsl_regread(device, device->mmu.reg.axi_error, &reg);
KGSL_MEM_CRIT(device, "axi write error interrupt: %08x\n", reg);
} else if (status & MH_INTERRUPT_MASK__MMU_PAGE_FAULT) {
kgsl_regread(device, device->mmu.reg.page_fault, &reg);
KGSL_MEM_CRIT(device, "mmu page fault interrupt: %08x\n", reg);
1 change: 1 addition & 0 deletions drivers/gpu/msm/kgsl_mmu.h
Original file line number Diff line number Diff line change
@@ -119,6 +119,7 @@ struct kgsl_mmu_reg {
uint32_t interrupt_mask;
uint32_t interrupt_status;
uint32_t interrupt_clear;
uint32_t axi_error;
};

struct kgsl_mmu {
3 changes: 2 additions & 1 deletion drivers/gpu/msm/kgsl_yamato.c
Original file line number Diff line number Diff line change
@@ -105,7 +105,8 @@ static struct kgsl_yamato_device yamato_device = {
.invalidate = REG_MH_MMU_INVALIDATE,
.interrupt_mask = REG_MH_INTERRUPT_MASK,
.interrupt_status = REG_MH_INTERRUPT_STATUS,
.interrupt_clear = REG_MH_INTERRUPT_CLEAR
.interrupt_clear = REG_MH_INTERRUPT_CLEAR,
.axi_error = REG_MH_AXI_ERROR,
},
},
.pwrctrl = {