| Message ID | 1459709292-5153-3-git-send-email-eric@engestrom.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Eric, On 3 April 2016 at 19:48, Eric Engestrom <eric@engestrom.ch> wrote: > Signed-off-by: Eric Engestrom <eric@engestrom.ch> > --- > 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 ? Thanks Emil
On 6 April 2016 at 17:42, Emil Velikov <emil.l.velikov@gmail.com> wrote: > Hi Eric, > > On 3 April 2016 at 19:48, Eric Engestrom <eric@engestrom.ch> wrote: >> Signed-off-by: Eric Engestrom <eric@engestrom.ch> >> --- >> 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 ? > Completely forgot: I'll pull the lot (without 5/7 and optionally this one) as we hear from Rob. Thank for the patches Eric. Some of these are a bit hard to spot ;-) -Emil
On Wed, Apr 6, 2016 at 12:42 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote: > Hi Eric, > > On 3 April 2016 at 19:48, Eric Engestrom <eric@engestrom.ch> wrote: >> Signed-off-by: Eric Engestrom <eric@engestrom.ch> >> --- >> 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? BR, -R > Thanks > Emil
On 7 April 2016 at 01:04, Rob Clark <robdclark@gmail.com> wrote: > On Wed, Apr 6, 2016 at 12:42 PM, Emil Velikov <emil.l.velikov@gmail.com> wrote: >> Hi Eric, >> >> On 3 April 2016 at 19:48, Eric Engestrom <eric@engestrom.ch> wrote: >>> Signed-off-by: Eric Engestrom <eric@engestrom.ch> >>> --- >>> 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
diff --git a/freedreno/kgsl/kgsl_drm.h b/freedreno/kgsl/kgsl_drm.h index f1c7f4e..281978e 100644 --- a/freedreno/kgsl/kgsl_drm.h +++ b/freedreno/kgsl/kgsl_drm.h @@ -81,7 +81,7 @@ struct drm_kgsl_gem_create_fd) /* Memory types - these define the source and caching policies of the GEM memory chunk */ -/* Legacy definitions left for compatability */ +/* Legacy definitions left for compatibility */ #define DRM_KGSL_GEM_TYPE_EBI 0 #define DRM_KGSL_GEM_TYPE_SMI 1 diff --git a/freedreno/kgsl/msm_kgsl.h b/freedreno/kgsl/msm_kgsl.h index e67190f..5b36eeb 100644 --- a/freedreno/kgsl/msm_kgsl.h +++ b/freedreno/kgsl/msm_kgsl.h @@ -31,7 +31,7 @@ #define KGSL_FLAGS_SOFT_RESET 0x00000100 #define KGSL_FLAGS_PER_CONTEXT_TIMESTAMPS 0x00000200 -/* Clock flags to show which clocks should be controled by a given platform */ +/* Clock flags to show which clocks should be controlled by a given platform */ #define KGSL_CLK_SRC 0x00000001 #define KGSL_CLK_CORE 0x00000002 #define KGSL_CLK_IFACE 0x00000004 @@ -295,7 +295,7 @@ struct kgsl_cmdstream_freememontimestamp { /* Previous versions of this header had incorrectly defined IOCTL_KGSL_CMDSTREAM_FREEMEMONTIMESTAMP as a read-only ioctl instead - of a write only ioctl. To ensure binary compatability, the following + of a write only ioctl. To ensure binary compatibility, the following #define will be used to intercept the incorrect ioctl */
Signed-off-by: Eric Engestrom <eric@engestrom.ch> --- freedreno/kgsl/kgsl_drm.h | 2 +- freedreno/kgsl/msm_kgsl.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)