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>

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>

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>

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>

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>

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>

Andrzej Hajda authored 6 years ago and Simona Vetter committed 6 years ago

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>

Andrzej Hajda authored 6 years ago and Simona Vetter committed 6 years ago

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>

Andrzej Hajda authored 6 years ago and Simona Vetter committed 6 years ago

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>

Andrzej Hajda authored 6 years ago and Simona Vetter committed 6 years ago

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

Refresh contributing, accept issues at fdo gitlab, and add separate
maintainers file for clarity.

v2: Also add link to the gitlab project members page.

Cc: Sean Paul <sean@poorly.run>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

They all get written in _build nowadays.

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>

The regex in

Author: Emil Velikov <emil.velikov@collabora.com>
Date:   Wed Oct 24 15:22:08 2018 +0100

    dim: handle repo URLs ending with forward slash

didn't actually work. Fix it.

Cc: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Emil Velikov authored 6 years ago and Simona Vetter committed 6 years ago

Seems like some of my existing URLs had a trailing forward slash.
This confused url_to_remote(), resulting in adding the exact same repo
again.

v2: consider only 0-1 trailing fwd slash (danvet)

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Emil Velikov authored 6 years ago and Simona Vetter committed 6 years ago

Simply make use of the function, instead of duplicating it.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Somewhere since I originally typed this and today git apply-mbox lost
the error status for "this patch didn't apply cleanly". So instead of
exiting, we happily continue on and add Link: tags and other nonsense
to the current patch, instead of the one that we wanted to apply.

Fix this.

v2: It wasn't git am, it was us, wrapping the apply_patch function in
an if, which defeats set -e. Add explicit error handling. Thanks to
Jani for figuring this one out.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

It has been merged

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20181011153242.253431-1-sean@poorly.run

Sean Paul authored 6 years ago and Sean Paul committed 6 years ago

Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Sean Paul <sean@poorly.run>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20181010144712.106634-2-sean@poorly.run

Sean Paul authored 6 years ago and Sean Paul committed 6 years ago

Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Gustavo Padovan <gustavo@padovan.org>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Sean Paul <sean@poorly.run>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20181010144712.106634-1-sean@poorly.run