From: Dave Airlie Date: Mon, 10 Jun 2013 22:16:10 +0000 (+1000) Subject: Merge branch 'gma500-fixes' of git://github.com/patjak/drm-gma500 into drm-fixes X-Git-Tag: firefly_0821_release~3680^2~278^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e6eea1536e077b2b7bfc8c173f09d01ef72d2c7b;p=firefly-linux-kernel-4.4.55.git Merge branch 'gma500-fixes' of git://github.com/patjak/drm-gma500 into drm-fixes Patrik writes: Two fixes for memory leaks split into Cedarview and Poulsbo versions, and a fix for properly setting the pipe base when using fbdev. It's on my todo-list to start unifying the chips since they are very similar, but until then I'd like to split them up in case there are side-effects on Cedarview that I cannot currently test. airled: Verified pull from github matches what I expected. * 'gma500-fixes' of git://github.com/patjak/drm-gma500: drm/gma500/cdv: Fix cursor gem obj referencing on cdv drm/gma500/psb: Fix cursor gem obj referencing on psb drm/gma500/cdv: Unpin framebuffer on crtc disable drm/gma500/psb: Unpin framebuffer on crtc disable drm/gma500: Add fb gtt offset to fb base --- e6eea1536e077b2b7bfc8c173f09d01ef72d2c7b