diff options
author | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
commit | 2863b00941bc3062ea3299ed4057acfd9e52c335 (patch) | |
tree | bf378837a55e57e4189e9877170fd2b0d288f587 /drivers/gpu/drm/i915/i915_gpu_error.c | |
parent | fc3fed5d297b51f9e2c7d4f969c95c0d6e50ca57 (diff) | |
parent | 36c9c3c91128e2b892c9be0dd9ee9bd82cbe82ad (diff) | |
download | linux-stable-2863b00941bc3062ea3299ed4057acfd9e52c335.tar.gz linux-stable-2863b00941bc3062ea3299ed4057acfd9e52c335.tar.bz2 linux-stable-2863b00941bc3062ea3299ed4057acfd9e52c335.zip |
Merge drm/drm-next into drm-intel-next-queued
Catch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT
specifically.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 1175fec08fe1..2835cacd0d08 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -31,6 +31,7 @@ #include <linux/stop_machine.h> #include <linux/zlib.h> #include <drm/drm_print.h> +#include <linux/ascii85.h> #include "i915_gpu_error.h" #include "i915_drv.h" @@ -517,35 +518,12 @@ void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...) va_end(args); } -static int -ascii85_encode_len(int len) -{ - return DIV_ROUND_UP(len, 4); -} - -static bool -ascii85_encode(u32 in, char *out) -{ - int i; - - if (in == 0) - return false; - - out[5] = '\0'; - for (i = 5; i--; ) { - out[i] = '!' + in % 85; - in /= 85; - } - - return true; -} - static void print_error_obj(struct drm_i915_error_state_buf *m, struct intel_engine_cs *engine, const char *name, struct drm_i915_error_object *obj) { - char out[6]; + char out[ASCII85_BUFSZ]; int page; if (!obj) @@ -567,12 +545,8 @@ static void print_error_obj(struct drm_i915_error_state_buf *m, len -= obj->unused; len = ascii85_encode_len(len); - for (i = 0; i < len; i++) { - if (ascii85_encode(obj->pages[page][i], out)) - err_puts(m, out); - else - err_puts(m, "z"); - } + for (i = 0; i < len; i++) + err_puts(m, ascii85_encode(obj->pages[page][i], out)); } err_puts(m, "\n"); } |