- Jan 17, 2019
-
-
Simona Vetter authored
Some early notes from my first few pull requests. Lots of things that need to be discussed/clarified/agreed upon, but should be good for a starting point at least. Not entirely sure how we should split this all up, so all in one file for now. v2: Fix typo Cc: Dave Airlie <airlied@gmail.com> Acked-by:
Dave Airlie <airlied@gmail.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Jan 16, 2019
-
-
Simona Vetter authored
This partially reverts commit 6ce0305a. We need to filter both using --first-parent (for proper backmerges) and --committer (for fast-forward merges). v2: Rebase over the push limit from Jani. Cc: Sean Paul <sean@poorly.run> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Reviewed-by:
Jani Nikula <jani.nikula@intel.com> Reported-by:
Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Jan 15, 2019
-
-
Jani Nikula authored
In most cases, even when pushing long series, it's better to push commits in moderately sized batches. One functional reason is resolving potential drm-tip conflicts in smaller and more isolated units, which is easier to resolve, and is less likely to need a new massive conflict resolution later. Ask the user for confirmation when they're trying to push more than (arbitrarily chosen) 10 patches in one go. This also acts as a safeguard for pushing more than the user intended. Obviously maintainers will also face the question when pushing merges or rebases, but there's no harm in that. They also need to be sure this is what they mean. v2: add --first-parent (Daniel) Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Use dim_cite() to produce pretty commit message references. Unify and improve error messages while at it. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Make dim_cite safer to use within dim. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Jan 14, 2019
-
-
Jani Nikula authored
The default repository is master nowadays. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
It's a separate repository now. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Help the users if they so desire. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
If the dim repo name matches the git remote, only print the repo name. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
If the dim repo name matches the git remote, only print the repo name. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Jan 11, 2019
-
-
Simona Vetter authored
Originally we used the committer to filter for this, but --first-parent is better. Reviewed-and-tested-by:
Sean Paul <sean@poorly.run> Cc: Sean Paul <sean@poorly.run> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
Jani Nikula authored
The pull requests are more than just FYI for Daniel nowadays. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Jan 10, 2019
-
-
Jani Nikula authored
Now that drm-intel-next is defined in nightly.conf, we can remove some of the special treatment. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Ignore the bool member warning for drm-intel: CHECK:BOOL_MEMBER: Avoid using bool structure members because of possible alignment issues - see: https://lkml.org/lkml/2017/11/21/384 For most of our use cases having the compiler DTRT without explicit !! is preferrable, even at the cost of the relatively small space waste. For more discussion, see also the subthread starting at [1]. [1] http://mid.mail-archive.com/5d0ac1d4-d85d-2238-978a-417362a830bd@intel.com Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Dec 19, 2018
-
-
Simona Vetter authored
Avoids me having to ask patchwork to decode them for me. Worked on the 2 pulls from Dave and Inki I tried it on. v2: Use message_print_body (Jani). Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Dave Airlie <airlied@gmail.com> Reviewed-by:
Jani Nikula <jani.nikula@intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Dec 18, 2018
-
-
Using rev-parse git option is safer than manually parsing git files. Signed-off-by:
Andrzej Hajda <a.hajda@samsung.com> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
update_rerere_cache does not work correctly if drm-tip and $DIM_REPO are workdirs - it cannot locate properly rr-cache. Let's use git rev-parse to resolve rr-cache location. Signed-off-by:
Andrzej Hajda <a.hajda@samsung.com> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
Assumption that git directory is always located at REPO/.git is incorrect, especially in case of git worktrees. There is already function to deal with it correctly - git_dir, let's then use it. Signed-off-by:
Andrzej Hajda <a.hajda@samsung.com> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
git_dir function returns git directory for current working directory. Allowing specifying any directory allows to reuse it more widely. Signed-off-by:
Andrzej Hajda <a.hajda@samsung.com> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Dec 13, 2018
-
-
Simona Vetter authored
In dim line 976: for patch in $dir/*; do ^-- SC2231: Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt . Apparently the shellcheck I have is newer than the one we use for build testing on gitlab. Reviewed-by:
Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
Simona Vetter authored
Somehow I screwed up and broke make check while at it :-/ Reviewed-by:
Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
Simona Vetter authored
Boris needs this. v2: Improve the text for all cases that need manual fixups. v3: Actually git add the additional changes Cc: Rob Clark <robdclark@gmail.com> Cc: Boris Brezillon <boris.brezillon@bootlin.com> Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com> (v2) Tested-by: Boris Brezillon <boris.brezillon@bootlin.com> (v2) Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Dec 11, 2018
-
-
Jani Nikula authored
The old TODO items have now been migrated to gitlab [1]. Remove TODO.rst. Emphasize gitlab issues for bug reports and feature requests in the documentation. [1] https://gitlab.freedesktop.org/drm/maintainer-tools/issues Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Dec 10, 2018
-
-
Jani Nikula authored
Similar to what pull-request currently does. Try to be clever about not including all unmerged changes, just the ones that haven't been tagged yet. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Make the pull request code a bit easier to grasp. Use git log pretty format for easier extraction of the tags. v2: Only replace newlines with space, add comment about it (Daniel) Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Reduce indent on the happy day scenario. Update error logging while at it. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Since the drm-intel-testing branch was introduced, we've completely shifted from testing pull requests to pre-merge patch testing and continuous testing. The drm-intel-testing branch and testing request has outlived its usefulness. Remove it. We still leave the workflow for tagging and making pull requests as they are for now. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Abstract the driver date update to a function of its own. Make it useful for other drivers as well in case they ever need it. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Dec 07, 2018
-
-
Simona Vetter authored
Happened again so I unlazied and typed this up finally. v2: - better formatting - git pull, to avoid conflicts when you don't have latest drm-rerere. Cc: Dave Airlie <airlied@gmail.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Acked-by:
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Nov 07, 2018
-
-
Rodrigo Vivi authored
Or we have the risk of getting tricked out by "Suggested-by:" Like we were on kernel commit 35b876db4a42 ("drm/i915/dsc: Add slice_row_per_frame in DSC PPS programming" Reference: https://lists.freedesktop.org/archives/intel-gfx/2018-November/181151.html Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Ville Syrjälä <ville.syrjala@linux.intel.com> Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Nov 01, 2018
-
-
Jani Nikula authored
Move drm-misc under the common maintainer guidelines. Acked-by:
Daniel Stone <daniels@collabora.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Reviewed-by:
Sean Paul <sean@poorly.run> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Move drm-misc under the common committer guidelines. v2: s/drm-intel/drm-misc/ under tooling (Emil) v3: typos, drm-misc small drivers scope (Sean) Acked-by:
Daniel Stone <daniels@collabora.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Reviewed-by:
Sean Paul <sean@poorly.run> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
For starters, add the specific guidelines in their own files, starting with drm-intel, with the intention of consolidating and pulling in common guides in the top level file in the long term. Start with adding detailed maintainer tasks for handling drm-intel branches. v2: some tweaks, use dim rebase for rebases v3: clarify gvt features pull for dinq (Rodrigo) Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
Daniel Stone <daniels@collabora.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
For starters, add the specific guidelines in their own files, starting with drm-intel, with the intention of consolidating and pulling in common guides in the top level file in the long term. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
Daniel Stone <daniels@collabora.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
This was implied before, but better make it explicit. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Reviewed-by:
Sean Paul <sean@poorly.run> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Add new code of conduct file, also reference the kernel code of conduct. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Reviewed-by:
Sean Paul <sean@poorly.run> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
No changes in criteria, just rearrangement. Acked-by:
Daniel Stone <daniels@collabora.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Reviewed-by:
Sean Paul <sean@poorly.run> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Simona Vetter authored
Shrinks the usual pipeline considerably, since we don't first waste a few minutes installing stuff. Reviewed-by:
Arkadiusz Hiler <arkadiusz.hiler@intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Oct 31, 2018
-
-
Jani Nikula authored
Make the license more prominant. Remove include from drm-intel.rst. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
Daniel Stone <daniels@collabora.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
The documentation main page and the project home page have slightly different functions. At the cost of slight duplication, have different texts for each. Add README.rst to conf.py excludes as it's only used by gitlab. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
Daniel Stone <daniels@collabora.com> Reviewed-by:
Emil Velikov <emil.velikov@collabora.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-