On 7 April 2016 at 01:04, Rob Clark <robdclark@xxxxxxxxx> wrote: > On Wed, Apr 6, 2016 at 12:42 PM, Emil Velikov <emil.l.velikov@xxxxxxxxx> wrote: >> Hi Eric, >> >> On 3 April 2016 at 19:48, Eric Engestrom <eric@xxxxxxxxxxxx> wrote: >>> Signed-off-by: Eric Engestrom <eric@xxxxxxxxxxxx> >>> --- >>> freedreno/kgsl/kgsl_drm.h | 2 +- >>> freedreno/kgsl/msm_kgsl.h | 4 ++-- >> >> Not 100% sure how Rob deals with these. Although I'm suspecting that >> they come from a kernel (similar to the ones in PATCH 5/7). >> >> Rob, is any of the above true - are they from a upstream/downstream >> kernel somewhere ? If so should we update them here, or in the >> 'master' project ? > > these come from kernel.. but from non-upstream vendor fork, and > probably aren't even up to date w/ more recent vendor kernel branches. > So I guess, meh? let's just fix it downstream and not worry about it? > So it's even messier than expected. Eric, everything but 5/7 is in master now. I'll respin the latter against the kernel and send it over with a few related changes. Thanks gents, Emil _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel