Re: [Intel-gfx] [PATCH v3 2/3] drm: Add CRTC background color property (v3)
Brian Starkey writes: > Hi Matt, > > On Thu, Nov 15, 2018 at 02:13:45PM -0800, Matt Roper wrote: >>Some display controllers can be programmed to present non-black colors >>for pixels not covered by any plane (or pixels covered by the >>transparent regions of higher planes). Compositors that want a UI with >>a solid color background can potentially save memory bandwidth by >>setting the CRTC background property and using smaller planes to display >>the rest of the content. >> >>To avoid confusion between different ways of encoding RGB data, we >>define a standard 64-bit format that should be used for this property's >>value. Helper functions and macros are provided to generate and dissect >>values in this standard format with varying component precision values. >> >>v2: >> - Swap internal representation's blue and red bits to make it easier >> to read if printed out. (Ville) >> - Document bgcolor property in drm_blend.c. (Sean Paul) >> - s/background_color/bgcolor/ for consistency between property name and >> value storage field. (Sean Paul) >> - Add a convenience function to attach property to a given crtc. >> >>v3: >> - Restructure ARGB component extraction macros to be easier to >> understand and enclose the parameters in () to avoid calculations >> if expressions are passed. (Sean Paul) >> - s/rgba/argb/ in helper function/macro names. Even though the idea is >> to not worry about the internal representation of the u64, it can >> still be confusing to look at code that uses 'rgba' terminology, but >> stores values with argb ordering. (Ville) >> >>Cc: dri-de...@lists.freedesktop.org >>Cc: wei.c...@intel.com >>Cc: harish.krupo@intel.com >>Cc: Ville Syrjälä >>Cc: Sean Paul >>Signed-off-by: Matt Roper >>Reviewed-by(v2): Sean Paul >>--- > >>+ * Background color is setup with drm_crtc_add_bgcolor_property(). It >>+ * controls the RGB color of a full-screen, fully-opaque layer that exists >>+ * below all planes. This color will be used for pixels not covered by >>+ * any plane and may also be blended with plane contents as allowed by a >>+ * plane's alpha values. The background color defaults to black, and is >>+ * assumed to be black for drivers that do not expose this property. > > Might be worth explicitly mentioning that this value is used as-is, > without any gamma/gamut conversion before blending, i.e. it's assumed > to already be in whatever blend-space the CRTC is using (at least I > assume that's the case?). As we start making the color pipe more > complicated/explicit, the details matter more. Raspberry Pi should be able to do background color as well, but the question of where this property is in the pipeline (particularly for CTM and gamma) also came up for me. My background color would apply at the same stage as plane composition, so before gamma and CTM. FWIW, my background color on the writeback connector (the only one where the value would be relevant) can have alpha. signature.asc Description: PGP signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color
On Thu, Dec 27, 2018 at 4:45 PM Matt Roper wrote: > > On Thu, Dec 27, 2018 at 04:22:28PM -0800, Stéphane Marchesin wrote: > > On Thu, Dec 27, 2018 at 3:49 PM Li, Wei C wrote: > > > > > > Matt, > > > > > > Is that possible for you to get some time to review > > > https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1387366 > > > and confirm the FROMLIST change if it looks good to you so we could move > > > forward? > > > > > > > To be more precise, I am trying to assess what's needed before this > > patch goes usptream, and in particular, I'd like to know if we are > > blocked on any Chrome-side thing. > > > > Stéphane > > > > Hi Stéphane. On the Chrome side of things, I believe we need an Ack > from the ChromeOS userspace team on the ABI, plus a pointer to where the > final, reviewed userspace patches are that correspond to it (mailing > list link or gerrit or whatever). I have an old gerrit link to some > in-development chromium/ozone patches for this from November 2nd, but > I'm not sure if there's a newer one now. IMO from user space the ABI is good. I think the question is more whether other hw would be fine with it. For example if we notice that other platforms can only do black as a background color, how can we make this API standard. Hopefully other folks can chime in here about other hw capabilities. Stéphane > > Aside from satisfying the ABI/userspace requirements, we still need all > the patches to get reviewed by the upstream kernel devs. An older > version of patch #2 has a r-b from Sean, but patches 1 and 3 haven't > been accepted yet. Actually it looks like I never sent the latest > version of my series that incorporates some additional feedback from > Brian Starkey to the list; I'll do that tomorrow. I think a lot of > people are still out on holiday vacation at the moment, so if necessary > I'll start pinging IRC for reviews in a week or two when people are back > in office. > > > Matt > > > > > > BTW, I've backported your kernel patch into Chrome OS and verified it > > > using the TEST=drm-tests/atomictest -t crtc_background_color on a Google > > > Pixelbook with KBL graphics. > > > > > > Thanks, > > > Wei > > > > > > -Original Message- > > > From: Stéphane Marchesin [mailto:marc...@chromium.org] > > > Sent: Thursday, December 27, 2018 3:27 PM > > > To: Roper, Matthew D > > > Cc: intel-gfx ; Li, Wei C > > > ; dri-devel > > > Subject: Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color > > > > > > Hey, > > > > > > Is there anything missing on the Chrome side to move forward with this > > > series? > > > > > > Stéphane > > > > > > On Thu, Nov 15, 2018 at 2:14 PM Matt Roper > > > wrote: > > > > > > > > Third version of the series previously posted here: > > > > > > > > https://lists.freedesktop.org/archives/intel-gfx/2018-November/181777. > > > > html > > > > > > > > This version incorporates review feedback from Ville and Sean Paul. > > > > > > > > The first patch here can be merged whenever it receives review approval. > > > > The second and third patches still need to wait for opensource > > > > userspace to be ready before merging (there's ChromeOS work underway). > > > > > > > > Cc: dri-de...@lists.freedesktop.org > > > > Cc: Wei C Li > > > > Cc: Sean Paul > > > > Cc: Ville Syrjälä > > > > > > > > Matt Roper (3): > > > > drm/i915: Force background color to black for gen9+ (v2) > > > > drm: Add CRTC background color property (v2) > > > > drm/i915/gen9+: Add support for pipe background color (v3) > > > > > > > > drivers/gpu/drm/drm_atomic_state_helper.c | 1 + > > > > drivers/gpu/drm/drm_atomic_uapi.c | 5 > > > > drivers/gpu/drm/drm_blend.c | 21 +--- > > > > drivers/gpu/drm/drm_mode_config.c | 6 + > > > > drivers/gpu/drm/i915/i915_debugfs.c | 9 +++ > > > > drivers/gpu/drm/i915/i915_reg.h | 6 + > > > > drivers/gpu/drm/i915/intel_display.c | 40 > > > > +++ > > > > include/drm/drm_blend.h | 1 + > > > > include/drm/drm_crtc.h| 17 + > > > > include/drm/drm_mode_config.h | 5 > > > > include/uapi/drm/drm_mode.h | 28 ++ > > > > 11 files changed, 136 insertions(+), 3 deletions(-) > > > > > > > > -- > > > > 2.14.4 > > > > > > > > ___ > > > > Intel-gfx mailing list > > > > Intel-gfx@lists.freedesktop.org > > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Matt Roper > Graphics Software Engineer > IoTG Platform Enabling & Development > Intel Corporation > (916) 356-2795 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color
On Thu, Dec 27, 2018 at 04:22:28PM -0800, Stéphane Marchesin wrote: > On Thu, Dec 27, 2018 at 3:49 PM Li, Wei C wrote: > > > > Matt, > > > > Is that possible for you to get some time to review > > https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1387366 > > and confirm the FROMLIST change if it looks good to you so we could move > > forward? > > > > To be more precise, I am trying to assess what's needed before this > patch goes usptream, and in particular, I'd like to know if we are > blocked on any Chrome-side thing. > > Stéphane > Hi Stéphane. On the Chrome side of things, I believe we need an Ack from the ChromeOS userspace team on the ABI, plus a pointer to where the final, reviewed userspace patches are that correspond to it (mailing list link or gerrit or whatever). I have an old gerrit link to some in-development chromium/ozone patches for this from November 2nd, but I'm not sure if there's a newer one now. Aside from satisfying the ABI/userspace requirements, we still need all the patches to get reviewed by the upstream kernel devs. An older version of patch #2 has a r-b from Sean, but patches 1 and 3 haven't been accepted yet. Actually it looks like I never sent the latest version of my series that incorporates some additional feedback from Brian Starkey to the list; I'll do that tomorrow. I think a lot of people are still out on holiday vacation at the moment, so if necessary I'll start pinging IRC for reviews in a week or two when people are back in office. Matt > > > BTW, I've backported your kernel patch into Chrome OS and verified it using > > the TEST=drm-tests/atomictest -t crtc_background_color on a Google > > Pixelbook with KBL graphics. > > > > Thanks, > > Wei > > > > -Original Message- > > From: Stéphane Marchesin [mailto:marc...@chromium.org] > > Sent: Thursday, December 27, 2018 3:27 PM > > To: Roper, Matthew D > > Cc: intel-gfx ; Li, Wei C > > ; dri-devel > > Subject: Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color > > > > Hey, > > > > Is there anything missing on the Chrome side to move forward with this > > series? > > > > Stéphane > > > > On Thu, Nov 15, 2018 at 2:14 PM Matt Roper > > wrote: > > > > > > Third version of the series previously posted here: > > > > > > https://lists.freedesktop.org/archives/intel-gfx/2018-November/181777. > > > html > > > > > > This version incorporates review feedback from Ville and Sean Paul. > > > > > > The first patch here can be merged whenever it receives review approval. > > > The second and third patches still need to wait for opensource > > > userspace to be ready before merging (there's ChromeOS work underway). > > > > > > Cc: dri-de...@lists.freedesktop.org > > > Cc: Wei C Li > > > Cc: Sean Paul > > > Cc: Ville Syrjälä > > > > > > Matt Roper (3): > > > drm/i915: Force background color to black for gen9+ (v2) > > > drm: Add CRTC background color property (v2) > > > drm/i915/gen9+: Add support for pipe background color (v3) > > > > > > drivers/gpu/drm/drm_atomic_state_helper.c | 1 + > > > drivers/gpu/drm/drm_atomic_uapi.c | 5 > > > drivers/gpu/drm/drm_blend.c | 21 +--- > > > drivers/gpu/drm/drm_mode_config.c | 6 + > > > drivers/gpu/drm/i915/i915_debugfs.c | 9 +++ > > > drivers/gpu/drm/i915/i915_reg.h | 6 + > > > drivers/gpu/drm/i915/intel_display.c | 40 > > > +++ > > > include/drm/drm_blend.h | 1 + > > > include/drm/drm_crtc.h| 17 + > > > include/drm/drm_mode_config.h | 5 > > > include/uapi/drm/drm_mode.h | 28 ++ > > > 11 files changed, 136 insertions(+), 3 deletions(-) > > > > > > -- > > > 2.14.4 > > > > > > ___ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color
On Thu, Dec 27, 2018 at 3:49 PM Li, Wei C wrote: > > Matt, > > Is that possible for you to get some time to review > https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1387366 > and confirm the FROMLIST change if it looks good to you so we could move > forward? > To be more precise, I am trying to assess what's needed before this patch goes usptream, and in particular, I'd like to know if we are blocked on any Chrome-side thing. Stéphane > BTW, I've backported your kernel patch into Chrome OS and verified it using > the TEST=drm-tests/atomictest -t crtc_background_color on a Google Pixelbook > with KBL graphics. > > Thanks, > Wei > > -Original Message- > From: Stéphane Marchesin [mailto:marc...@chromium.org] > Sent: Thursday, December 27, 2018 3:27 PM > To: Roper, Matthew D > Cc: intel-gfx ; Li, Wei C > ; dri-devel > Subject: Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color > > Hey, > > Is there anything missing on the Chrome side to move forward with this series? > > Stéphane > > On Thu, Nov 15, 2018 at 2:14 PM Matt Roper wrote: > > > > Third version of the series previously posted here: > > > > https://lists.freedesktop.org/archives/intel-gfx/2018-November/181777. > > html > > > > This version incorporates review feedback from Ville and Sean Paul. > > > > The first patch here can be merged whenever it receives review approval. > > The second and third patches still need to wait for opensource > > userspace to be ready before merging (there's ChromeOS work underway). > > > > Cc: dri-de...@lists.freedesktop.org > > Cc: Wei C Li > > Cc: Sean Paul > > Cc: Ville Syrjälä > > > > Matt Roper (3): > > drm/i915: Force background color to black for gen9+ (v2) > > drm: Add CRTC background color property (v2) > > drm/i915/gen9+: Add support for pipe background color (v3) > > > > drivers/gpu/drm/drm_atomic_state_helper.c | 1 + > > drivers/gpu/drm/drm_atomic_uapi.c | 5 > > drivers/gpu/drm/drm_blend.c | 21 +--- > > drivers/gpu/drm/drm_mode_config.c | 6 + > > drivers/gpu/drm/i915/i915_debugfs.c | 9 +++ > > drivers/gpu/drm/i915/i915_reg.h | 6 + > > drivers/gpu/drm/i915/intel_display.c | 40 > > +++ > > include/drm/drm_blend.h | 1 + > > include/drm/drm_crtc.h| 17 + > > include/drm/drm_mode_config.h | 5 > > include/uapi/drm/drm_mode.h | 28 ++ > > 11 files changed, 136 insertions(+), 3 deletions(-) > > > > -- > > 2.14.4 > > > > ___ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color
Matt, Is that possible for you to get some time to review https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1387366 and confirm the FROMLIST change if it looks good to you so we could move forward? BTW, I've backported your kernel patch into Chrome OS and verified it using the TEST=drm-tests/atomictest -t crtc_background_color on a Google Pixelbook with KBL graphics. Thanks, Wei -Original Message- From: Stéphane Marchesin [mailto:marc...@chromium.org] Sent: Thursday, December 27, 2018 3:27 PM To: Roper, Matthew D Cc: intel-gfx ; Li, Wei C ; dri-devel Subject: Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color Hey, Is there anything missing on the Chrome side to move forward with this series? Stéphane On Thu, Nov 15, 2018 at 2:14 PM Matt Roper wrote: > > Third version of the series previously posted here: > > https://lists.freedesktop.org/archives/intel-gfx/2018-November/181777. > html > > This version incorporates review feedback from Ville and Sean Paul. > > The first patch here can be merged whenever it receives review approval. > The second and third patches still need to wait for opensource > userspace to be ready before merging (there's ChromeOS work underway). > > Cc: dri-de...@lists.freedesktop.org > Cc: Wei C Li > Cc: Sean Paul > Cc: Ville Syrjälä > > Matt Roper (3): > drm/i915: Force background color to black for gen9+ (v2) > drm: Add CRTC background color property (v2) > drm/i915/gen9+: Add support for pipe background color (v3) > > drivers/gpu/drm/drm_atomic_state_helper.c | 1 + > drivers/gpu/drm/drm_atomic_uapi.c | 5 > drivers/gpu/drm/drm_blend.c | 21 +--- > drivers/gpu/drm/drm_mode_config.c | 6 + > drivers/gpu/drm/i915/i915_debugfs.c | 9 +++ > drivers/gpu/drm/i915/i915_reg.h | 6 + > drivers/gpu/drm/i915/intel_display.c | 40 > +++ > include/drm/drm_blend.h | 1 + > include/drm/drm_crtc.h| 17 + > include/drm/drm_mode_config.h | 5 > include/uapi/drm/drm_mode.h | 28 ++ > 11 files changed, 136 insertions(+), 3 deletions(-) > > -- > 2.14.4 > > ___ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 0/3] CRTC background color
Hey, Is there anything missing on the Chrome side to move forward with this series? Stéphane On Thu, Nov 15, 2018 at 2:14 PM Matt Roper wrote: > > Third version of the series previously posted here: > https://lists.freedesktop.org/archives/intel-gfx/2018-November/181777.html > > This version incorporates review feedback from Ville and Sean Paul. > > The first patch here can be merged whenever it receives review approval. > The second and third patches still need to wait for opensource userspace > to be ready before merging (there's ChromeOS work underway). > > Cc: dri-de...@lists.freedesktop.org > Cc: Wei C Li > Cc: Sean Paul > Cc: Ville Syrjälä > > Matt Roper (3): > drm/i915: Force background color to black for gen9+ (v2) > drm: Add CRTC background color property (v2) > drm/i915/gen9+: Add support for pipe background color (v3) > > drivers/gpu/drm/drm_atomic_state_helper.c | 1 + > drivers/gpu/drm/drm_atomic_uapi.c | 5 > drivers/gpu/drm/drm_blend.c | 21 +--- > drivers/gpu/drm/drm_mode_config.c | 6 + > drivers/gpu/drm/i915/i915_debugfs.c | 9 +++ > drivers/gpu/drm/i915/i915_reg.h | 6 + > drivers/gpu/drm/i915/intel_display.c | 40 > +++ > include/drm/drm_blend.h | 1 + > include/drm/drm_crtc.h| 17 + > include/drm/drm_mode_config.h | 5 > include/uapi/drm/drm_mode.h | 28 ++ > 11 files changed, 136 insertions(+), 3 deletions(-) > > -- > 2.14.4 > > ___ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.IGT: failure for Add Colorspace connector property interface (rev6)
== Series Details == Series: Add Colorspace connector property interface (rev6) URL : https://patchwork.freedesktop.org/series/47132/ State : failure == Summary == CI Bug Log - changes from CI_DRM_5343_full -> Patchwork_11158_full Summary --- **FAILURE** Serious unknown changes coming with Patchwork_11158_full absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_11158_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. Possible new issues --- Here are the unknown changes that may have been introduced in Patchwork_11158_full: ### IGT changes ### Possible regressions * igt@kms_flip_tiling@flip-x-tiled: - shard-iclb: PASS -> FAIL Known issues Here are the changes found in Patchwork_11158_full that come from known issues: ### IGT changes ### Issues hit * igt@i915_suspend@shrink: - shard-skl: NOTRUN -> INCOMPLETE [fdo#106886] * igt@kms_busy@extended-modeset-hang-newfb-render-b: - shard-skl: NOTRUN -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b: - shard-iclb: NOTRUN -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c: - shard-skl: PASS -> DMESG-WARN [fdo#107956] +1 * igt@kms_chv_cursor_fail@pipe-c-128x128-bottom-edge: - shard-skl: PASS -> FAIL [fdo#104671] * igt@kms_color@pipe-a-ctm-green-to-red: - shard-skl: PASS -> FAIL [fdo#107201] * igt@kms_cursor_crc@cursor-128x128-random: - shard-apl: PASS -> FAIL [fdo#103232] * igt@kms_cursor_crc@cursor-256x256-random: - shard-iclb: NOTRUN -> FAIL [fdo#103232] +2 * igt@kms_flip@flip-vs-expired-vblank-interruptible: - shard-glk: PASS -> FAIL [fdo#102887] / [fdo#105363] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt: - shard-apl: PASS -> FAIL [fdo#103167] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite: - shard-skl: NOTRUN -> FAIL [fdo#103167] * igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c-frame-sequence: - shard-skl: PASS -> FAIL [fdo#103191] / [fdo#107362] * igt@kms_plane@pixel-format-pipe-a-planes: - shard-skl: NOTRUN -> DMESG-WARN [fdo#106885] * igt@kms_plane_alpha_blend@pipe-a-alpha-7efc: - shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145] * igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb: - shard-skl: NOTRUN -> FAIL [fdo#108145] +1 * igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb: - shard-kbl: NOTRUN -> FAIL [fdo#108145] * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max: - shard-glk: PASS -> FAIL [fdo#108145] * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: PASS -> FAIL [fdo#107815] * igt@kms_plane_multiple@atomic-pipe-b-tiling-y: - shard-glk: PASS -> FAIL [fdo#103166] - shard-apl: PASS -> FAIL [fdo#103166] - shard-iclb: NOTRUN -> FAIL [fdo#103166] +1 * igt@kms_plane_scaling@pipe-c-scaler-with-rotation: - shard-iclb: NOTRUN -> DMESG-WARN [fdo#107724] * igt@kms_setmode@basic: - shard-kbl: PASS -> FAIL [fdo#99912] * igt@perf_pmu@rc6-runtime-pm: - shard-iclb: PASS -> FAIL [fdo#105010] * igt@pm_rpm@gem-mmap-cpu: - shard-skl: PASS -> INCOMPLETE [fdo#107807] * igt@sw_sync@sync_busy_fork: - shard-apl: PASS -> INCOMPLETE [fdo#103927] Possible fixes * igt@gem_ctx_isolation@vcs1-s3: - shard-kbl: INCOMPLETE [fdo#103665] -> PASS +1 * igt@kms_busy@extended-pageflip-hang-newfb-render-b: - shard-glk: DMESG-WARN [fdo#107956] -> PASS * igt@kms_cursor_crc@cursor-64x64-suspend: - shard-glk: FAIL [fdo#103232] -> PASS * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move: - shard-iclb: FAIL [fdo#103167] -> PASS +5 * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-fullscreen: - shard-glk: FAIL [fdo#103167] -> PASS +1 * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-wc: - shard-iclb: DMESG-FAIL [fdo#107724] -> PASS * igt@kms_frontbuffer_tracking@fbcpsr-suspend: - shard-skl: INCOMPLETE [fdo#104108] / [fdo#106978] -> PASS * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c: - shard-skl: INCOMPLETE [fdo#104108] / [fdo#107773] -> PASS * igt@kms_plane_multiple@atomic-pipe-b-tiling-yf: - shard-iclb: FAIL [fdo#103166] -> PASS * igt@kms_plane_multiple@atomic-pipe-c-tiling-x: - shard-glk: FAIL [fdo#103166] -> PASS +1 *
[Intel-gfx] ✓ Fi.CI.IGT: success for drm: add DRM_DEBUG_CORE() and friends and use them
== Series Details == Series: drm: add DRM_DEBUG_CORE() and friends and use them URL : https://patchwork.freedesktop.org/series/54503/ State : success == Summary == CI Bug Log - changes from CI_DRM_5343_full -> Patchwork_11157_full Summary --- **SUCCESS** No regressions found. Known issues Here are the changes found in Patchwork_11157_full that come from known issues: ### IGT changes ### Issues hit * igt@debugfs_test@read_all_entries_display_off: - shard-skl: PASS -> INCOMPLETE [fdo#104108] * igt@gem_cpu_reloc@full: - shard-skl: NOTRUN -> TIMEOUT [fdo#108248] * igt@gem_exec_schedule@pi-ringfull-render: - shard-skl: NOTRUN -> FAIL [fdo#103158] * igt@i915_suspend@shrink: - shard-skl: NOTRUN -> DMESG-WARN [fdo#108784] * igt@kms_busy@extended-modeset-hang-newfb-render-b: - shard-skl: NOTRUN -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b: - shard-iclb: NOTRUN -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c: - shard-skl: PASS -> DMESG-WARN [fdo#107956] +1 * igt@kms_color@pipe-b-degamma: - shard-skl: PASS -> FAIL [fdo#104782] * igt@kms_cursor_crc@cursor-128x128-offscreen: - shard-skl: PASS -> FAIL [fdo#103232] +1 * igt@kms_cursor_crc@cursor-256x256-random: - shard-iclb: NOTRUN -> FAIL [fdo#103232] +2 * igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions: - shard-iclb: PASS -> FAIL [fdo#103355] * igt@kms_cursor_legacy@nonblocking-modeset-vs-cursor-atomic: - shard-iclb: PASS -> DMESG-WARN [fdo#107724] +11 * igt@kms_draw_crc@draw-method-xrgb-mmap-cpu-ytiled: - shard-iclb: PASS -> WARN [fdo#108336] +1 * igt@kms_flip@flip-vs-expired-vblank: - shard-apl: PASS -> FAIL [fdo#102887] / [fdo#105363] * igt@kms_flip@plain-flip-ts-check-interruptible: - shard-skl: PASS -> FAIL [fdo#100368] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt: - shard-iclb: PASS -> DMESG-FAIL [fdo#107724] +1 * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite: - shard-skl: NOTRUN -> FAIL [fdo#103167] * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-mmap-wc: - shard-iclb: PASS -> FAIL [fdo#103167] * igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu: - shard-iclb: PASS -> DMESG-WARN [fdo#107724] / [fdo#108336] +6 * igt@kms_plane@pixel-format-pipe-b-planes: - shard-iclb: NOTRUN -> FAIL [fdo#103166] * igt@kms_plane@pixel-format-pipe-c-planes-source-clamping: - shard-skl: NOTRUN -> DMESG-WARN [fdo#106885] +1 * igt@kms_plane_alpha_blend@pipe-a-alpha-7efc: - shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145] +1 * igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb: - shard-skl: NOTRUN -> FAIL [fdo#108145] +2 * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max: - shard-glk: PASS -> FAIL [fdo#108145] * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: PASS -> FAIL [fdo#107815] +1 * igt@kms_plane_multiple@atomic-pipe-b-tiling-y: - shard-glk: PASS -> FAIL [fdo#103166] +2 - shard-apl: PASS -> FAIL [fdo#103166] * igt@kms_plane_scaling@pipe-c-scaler-with-rotation: - shard-iclb: NOTRUN -> DMESG-WARN [fdo#107724] * igt@kms_setmode@basic: - shard-kbl: PASS -> FAIL [fdo#99912] * igt@kms_universal_plane@cursor-fb-leak-pipe-b: - shard-skl: NOTRUN -> DMESG-WARN [fdo#105541] * igt@perf_pmu@rc6-runtime-pm: - shard-iclb: PASS -> FAIL [fdo#105010] * igt@pm_rpm@gem-evict-pwrite: - shard-iclb: PASS -> INCOMPLETE [fdo#108840] * igt@pm_rpm@legacy-planes: - shard-iclb: PASS -> DMESG-WARN [fdo#108654] +1 * igt@pm_rpm@modeset-lpsp-stress-no-wait: - shard-skl: PASS -> INCOMPLETE [fdo#107807] Possible fixes * igt@kms_available_modes_crc@available_mode_test_crc: - shard-apl: FAIL [fdo#106641] -> PASS * igt@kms_busy@extended-modeset-hang-newfb-render-b: - shard-iclb: DMESG-WARN [fdo#107956] -> PASS * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a: - shard-skl: DMESG-WARN [fdo#107956] -> PASS * igt@kms_cursor_crc@cursor-64x64-suspend: - shard-glk: FAIL [fdo#103232] -> PASS * igt@kms_flip@basic-flip-vs-wf_vblank: - shard-iclb: DMESG-WARN [fdo#107724] -> PASS +10 * igt@kms_flip@flip-vs-expired-vblank: - shard-skl: FAIL [fdo#105363] -> PASS * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-fullscreen: - shard-glk: FAIL [fdo#103167] -> PASS *
[Intel-gfx] ✓ Fi.CI.BAT: success for Add Colorspace connector property interface (rev6)
== Series Details ==
Series: Add Colorspace connector property interface (rev6)
URL : https://patchwork.freedesktop.org/series/47132/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5343 -> Patchwork_11158
Summary
---
**WARNING**
Minor unknown changes coming with Patchwork_11158 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_11158, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL:
https://patchwork.freedesktop.org/api/1.0/series/47132/revisions/6/mbox/
Possible new issues
---
Here are the unknown changes that may have been introduced in Patchwork_11158:
### IGT changes ###
Warnings
* igt@prime_vgem@basic-fence-flip:
- fi-kbl-7500u: PASS -> SKIP +33
Known issues
Here are the changes found in Patchwork_11158 that come from known issues:
### IGT changes ###
Issues hit
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: PASS -> DMESG-WARN [fdo#108965]
* {igt@runner@aborted}:
- fi-icl-y: NOTRUN -> FAIL [fdo#108915]
Possible fixes
* igt@gem_ctx_create@basic-files:
- fi-bsw-kefka: INCOMPLETE [fdo#105876] / [fdo#108714] -> PASS
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@i915_selftest@live_contexts:
- fi-byt-j1900: DMESG-WARN -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#105876]: https://bugs.freedesktop.org/show_bug.cgi?id=105876
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108714]: https://bugs.freedesktop.org/show_bug.cgi?id=108714
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
Participating hosts (46 -> 42)
--
Additional (2): fi-icl-y fi-pnv-d510
Missing(6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks
fi-bsw-cyan fi-ctg-p8600
Build changes
-
* Linux: CI_DRM_5343 -> Patchwork_11158
CI_DRM_5343: e7a162c10f4ab5e4338927ec5bc5be726ecf3e8b @
git://anongit.freedesktop.org/gfx-ci/linux
IGT_4754: a176905d46d072300ba57f29ac2b98a0228e0e2d @
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11158: 0116721231c757313625586445f7997306c6747e @
git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0116721231c7 drm/i915: Attach colorspace property and enable modeset
cf8d05e1f401 drm: Add colorspace connector property
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11158/
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Add Colorspace connector property interface (rev6)
== Series Details == Series: Add Colorspace connector property interface (rev6) URL : https://patchwork.freedesktop.org/series/47132/ State : warning == Summary == $ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm: Add colorspace connector property Okay! Commit: drm/i915: Attach colorspace property and enable modeset +drivers/gpu/drm/i915/intel_hdmi.c:510:51: int enum absolute_colorimetry_list versus +drivers/gpu/drm/i915/intel_hdmi.c:510:51: int enum hdmi_colorimetry +drivers/gpu/drm/i915/intel_hdmi.c:510:51: warning: mixing different enum types ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add Colorspace connector property interface (rev6)
== Series Details == Series: Add Colorspace connector property interface (rev6) URL : https://patchwork.freedesktop.org/series/47132/ State : warning == Summary == $ dim checkpatch origin/drm-tip cf8d05e1f401 drm: Add colorspace connector property 0116721231c7 drm/i915: Attach colorspace property and enable modeset -:115: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #115: FILE: drivers/gpu/drm/i915/intel_connector.c:316: + if (!drm_mode_create_colorspace_property(connector, + gen10_hdmi_colorspaces, -:118: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #118: FILE: drivers/gpu/drm/i915/intel_connector.c:319: + drm_object_attach_property(>base, + connector->colorspace_property, 0); -:121: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #121: FILE: drivers/gpu/drm/i915/intel_connector.c:322: + if (!drm_mode_create_colorspace_property(connector, + legacy_hdmi_colorspaces, -:124: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #124: FILE: drivers/gpu/drm/i915/intel_connector.c:325: + drm_object_attach_property(>base, + connector->colorspace_property, 0); total: 0 errors, 0 warnings, 4 checks, 117 lines checked ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [v6 0/2] Add Colorspace connector property interface
This patch series creates a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be picked. This will be helpful mostly to switch to higher gamut colorspaces like BT2020 when the media content is encoded as BT2020. Thereby giving a good visual experience to users. The expectation from userspace is that it should parse the EDID and get supported colorspaces. Use this property and switch to the one supported. Kernel will not give the supported colorspaces since this is panel dependent and our current property infrastructure is not supporting it. Basically the expectation from userspace is: - Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace - Set this new property to let the sink know what it converted the CRTC output to. - This property is just to inform sink what colorspace source is trying to drive. Have tested this using xrandr by using below command: xrandr --output HDMI2 --set "Colorspace" "BT2020_rgb" v2: Addressed Ville and Maarten's review comments. Merged the 2nd and 3rd patch into one common logical patch. v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed default to an unset state where driver will assign the colorspace when not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI. v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handled the default case more efficiently. v5: Modified the colorspace property creation helper to take platform specific enum list based on the capabilities of the platform as suggested by Shashank. With this there is no need for segregation between DP and HDMI. v6: Addressed Shashank's review comments. Uma Shankar (2): drm: Add colorspace connector property drm/i915: Attach colorspace property and enable modeset drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c| 82 ++ drivers/gpu/drm/i915/intel_atomic.c| 1 + drivers/gpu/drm/i915/intel_connector.c | 63 ++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 18 include/drm/drm_connector.h| 17 +++ include/uapi/drm/drm_mode.h| 33 ++ 8 files changed, 219 insertions(+) -- 1.9.1 Uma Shankar (2): drm: Add colorspace connector property drm/i915: Attach colorspace property and enable modeset drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c| 79 ++ drivers/gpu/drm/i915/intel_atomic.c| 1 + drivers/gpu/drm/i915/intel_connector.c | 63 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 19 include/drm/drm_connector.h| 17 include/uapi/drm/drm_mode.h| 33 ++ 8 files changed, 217 insertions(+) -- 1.9.1 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [v6 2/2] drm/i915: Attach colorspace property and enable modeset
This patch attaches the colorspace connector property to the
hdmi connector. Based on colorspace change, modeset will be
triggered to switch to new colorspace.
Based on colorspace property value create an infoframe
with appropriate colorspace. This can be used to send an
infoframe packet with proper colorspace value set which
will help to enable wider color gamut like BT2020 on sink.
This patch attaches and enables HDMI colorspace, DP will be
taken care separately.
v2: Merged the changes of creating infoframe as well to this
patch as per Maarten's suggestion.
v3: Addressed review comments from Shashank. Separated HDMI
and DP colorspaces as suggested by Ville and Maarten.
v4: Addressed Chris and Ville's review comments, and created a
common colorspace property for DP and HDMI, filtered the list
based on the colorspaces supported by the respective protocol
standard. Handle the default case properly.
v5: Added Platform specific colorspace enums and called the
property creation helper using the same.
v6: Addressed Shashank's review comments.
Signed-off-by: Uma Shankar
Reviewed-by: Shashank Sharma
---
drivers/gpu/drm/i915/intel_atomic.c| 1 +
drivers/gpu/drm/i915/intel_connector.c | 63 ++
drivers/gpu/drm/i915/intel_drv.h | 1 +
drivers/gpu/drm/i915/intel_hdmi.c | 19 ++
4 files changed, 84 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_atomic.c
b/drivers/gpu/drm/i915/intel_atomic.c
index fdfc742..f5bf9db 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -125,6 +125,7 @@ int intel_digital_connector_atomic_check(struct
drm_connector *conn,
*/
if (new_conn_state->force_audio != old_conn_state->force_audio ||
new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb ||
+ new_state->colorspace != old_state->colorspace ||
new_conn_state->base.picture_aspect_ratio !=
old_conn_state->base.picture_aspect_ratio ||
new_conn_state->base.content_type !=
old_conn_state->base.content_type ||
new_conn_state->base.scaling_mode !=
old_conn_state->base.scaling_mode)
diff --git a/drivers/gpu/drm/i915/intel_connector.c
b/drivers/gpu/drm/i915/intel_connector.c
index 18e370f..7228d1b 100644
--- a/drivers/gpu/drm/i915/intel_connector.c
+++ b/drivers/gpu/drm/i915/intel_connector.c
@@ -31,6 +31,48 @@
#include "intel_drv.h"
#include "i915_drv.h"
+static const struct drm_prop_enum_list gen10_hdmi_colorspaces[] = {
+ /* For Default case, driver will set the colorspace */
+ { COLORIMETRY_DEFAULT, "Default" },
+ /* Standard Definition Colorimetry based on CEA 861 */
+ { COLORIMETRY_ITU_601, "ITU_601" },
+ { COLORIMETRY_ITU_709, "ITU_709" },
+ /* Standard Definition Colorimetry based on IEC 61966-2-4 */
+ { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+ /* High Definition Colorimetry based on IEC 61966-2-4 */
+ { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+ /* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+ { COLORIMETRY_S_YCC_601, "S_YCC_601" },
+ /* Colorimetry based on IEC 61966-2-5 [33] */
+ { COLORIMETRY_OPYCC_601, "opYCC_601" },
+ /* Colorimetry based on IEC 61966-2-5 */
+ { COLORIMETRY_OPRGB, "opRGB" },
+ /* Colorimetry based on ITU-R BT.2020 */
+ { COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+ /* Colorimetry based on ITU-R BT.2020 */
+ { COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+ /* Colorimetry based on ITU-R BT.2020 */
+ { COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },
+};
+
+static const struct drm_prop_enum_list legacy_hdmi_colorspaces[] = {
+ /* For Default case, driver will set the colorspace */
+ { COLORIMETRY_DEFAULT, "Default" },
+ /* Standard Definition Colorimetry based on CEA 861 */
+ { COLORIMETRY_ITU_601, "ITU_601" },
+ { COLORIMETRY_ITU_709, "ITU_709" },
+ /* Standard Definition Colorimetry based on IEC 61966-2-4 */
+ { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+ /* High Definition Colorimetry based on IEC 61966-2-4 */
+ { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+ /* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+ { COLORIMETRY_S_YCC_601, "S_YCC_601" },
+ /* Colorimetry based on IEC 61966-2-5 [33] */
+ { COLORIMETRY_OPYCC_601, "opYCC_601" },
+ /* Colorimetry based on IEC 61966-2-5 */
+ { COLORIMETRY_OPRGB, "opRGB" },
+};
+
int intel_connector_init(struct intel_connector *connector)
{
struct intel_digital_connector_state *conn_state;
@@ -262,3 +304,24 @@ int intel_ddc_get_modes(struct drm_connector *connector,
connector->dev->mode_config.aspect_ratio_property,
DRM_MODE_PICTURE_ASPECT_NONE);
}
+
+void
+intel_attach_colorspace_property(struct drm_connector *connector)
+{
+ struct drm_device *dev = connector->dev;
+ struct drm_i915_private
[Intel-gfx] [v6 1/2] drm: Add colorspace connector property
This patch adds a colorspace connector property, enabling
userspace to switch to various supported colorspaces.
This will help enable BT2020 along with other colorspaces.
v2: Addressed Maarten and Ville's review comments. Enhanced
the colorspace enum to incorporate both HDMI and DP supported
colorspaces. Also, added a default option for colorspace.
v3: Removed Adobe references from enum definitions as per
Ville, Hans Verkuil and Jonas Karlman suggestions. Changed
Default to an unset state where driver will assign the colorspace
is not chosen by user, suggested by Ville and Maarten. Addressed
other misc review comments from Maarten. Split the changes to
have separate colorspace property for DP and HDMI.
v4: Addressed Chris and Ville's review comments, and created a
common colorspace property for DP and HDMI, filtered the list
based on the colorspaces supported by the respective protocol
standard.
v5: Made the property creation helper accept enum list based on
platform capabilties as suggested by Shashank. Consolidated HDMI
and DP property creation in the common helper.
v6: Addressed Shashank's review comments.
Signed-off-by: Uma Shankar
Reviewed-by: Shashank Sharma
---
drivers/gpu/drm/drm_atomic_uapi.c | 4 ++
drivers/gpu/drm/drm_connector.c | 79 +++
include/drm/drm_connector.h | 17 +
include/uapi/drm/drm_mode.h | 33
4 files changed, 133 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
b/drivers/gpu/drm/drm_atomic_uapi.c
index c408898..5e03292 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -746,6 +746,8 @@ static int drm_atomic_connector_set_property(struct
drm_connector *connector,
return -EINVAL;
}
state->content_protection = val;
+ } else if (property == connector->colorspace_property) {
+ state->colorspace = val;
} else if (property == config->writeback_fb_id_property) {
struct drm_framebuffer *fb = drm_framebuffer_lookup(dev, NULL,
val);
int ret = drm_atomic_set_writeback_fb_for_connector(state, fb);
@@ -814,6 +816,8 @@ static int drm_atomic_connector_set_property(struct
drm_connector *connector,
*val = state->picture_aspect_ratio;
} else if (property == config->content_type_property) {
*val = state->content_type;
+ } else if (property == connector->colorspace_property) {
+ *val = state->colorspace;
} else if (property == connector->scaling_mode_property) {
*val = state->scaling_mode;
} else if (property == connector->content_protection_property) {
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 8475396..ad1b862 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -826,6 +826,54 @@ int drm_display_info_set_bus_formats(struct
drm_display_info *info,
};
DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
+/* List of HDMI Colorspaces supported */
+static const struct drm_prop_enum_list hdmi_colorspaces[] = {
+ /* For Default case, driver will set the colorspace */
+ { COLORIMETRY_DEFAULT, "Default" },
+ /* Standard Definition Colorimetry based on CEA 861 */
+ { COLORIMETRY_ITU_601, "ITU_601" },
+ { COLORIMETRY_ITU_709, "ITU_709" },
+ /* Standard Definition Colorimetry based on IEC 61966-2-4 */
+ { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+ /* High Definition Colorimetry based on IEC 61966-2-4 */
+ { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+ /* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+ { COLORIMETRY_S_YCC_601, "S_YCC_601" },
+ /* Colorimetry based on IEC 61966-2-5 [33] */
+ { COLORIMETRY_OPYCC_601, "opYCC_601" },
+ /* Colorimetry based on IEC 61966-2-5 */
+ { COLORIMETRY_OPRGB, "opRGB" },
+ /* Colorimetry based on ITU-R BT.2020 */
+ { COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+ /* Colorimetry based on ITU-R BT.2020 */
+ { COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+ /* Colorimetry based on ITU-R BT.2020 */
+ { COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },
+};
+
+/* List of DP Colorspaces supported */
+static const struct drm_prop_enum_list dp_colorspaces[] = {
+ /* For Default case, driver will set the colorspace */
+ { COLORIMETRY_DEFAULT, "Default" },
+ /* Standard Definition Colorimetry based on CEA 861 */
+ { COLORIMETRY_ITU_601, "ITU_601" },
+ { COLORIMETRY_ITU_709, "ITU_709" },
+ /* Standard Definition Colorimetry based on IEC 61966-2-4 */
+ { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+ /* High Definition Colorimetry based on IEC 61966-2-4 */
+ { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+ /* Colorimetry based on IEC 61966-2-5 */
+ { COLORIMETRY_OPRGB, "opRGB" },
+ /* DP
[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: drmP.h include removal w/ drm prep work
== Series Details == Series: drm/i915: drmP.h include removal w/ drm prep work URL : https://patchwork.freedesktop.org/series/54494/ State : success == Summary == CI Bug Log - changes from CI_DRM_5343_full -> Patchwork_11155_full Summary --- **WARNING** Minor unknown changes coming with Patchwork_11155_full need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_11155_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. Possible new issues --- Here are the unknown changes that may have been introduced in Patchwork_11155_full: ### IGT changes ### Warnings * igt@pm_rc6_residency@rc6-accuracy: - shard-snb: SKIP -> PASS Known issues Here are the changes found in Patchwork_11155_full that come from known issues: ### IGT changes ### Issues hit * igt@gem_exec_schedule@pi-ringfull-render: - shard-skl: NOTRUN -> FAIL [fdo#103158] * igt@i915_selftest@live_workarounds: - shard-iclb: PASS -> DMESG-FAIL [fdo#108954] * igt@i915_suspend@shrink: - shard-skl: NOTRUN -> INCOMPLETE [fdo#106886] * igt@kms_busy@extended-modeset-hang-newfb-render-b: - shard-skl: NOTRUN -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b: - shard-iclb: NOTRUN -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c: - shard-skl: PASS -> DMESG-WARN [fdo#107956] +1 * igt@kms_chv_cursor_fail@pipe-c-128x128-bottom-edge: - shard-skl: PASS -> FAIL [fdo#104671] * igt@kms_color@pipe-a-ctm-green-to-red: - shard-skl: PASS -> FAIL [fdo#107201] * igt@kms_color@pipe-b-degamma: - shard-skl: PASS -> FAIL [fdo#104782] * igt@kms_cursor_crc@cursor-128x128-offscreen: - shard-skl: PASS -> FAIL [fdo#103232] +1 * igt@kms_cursor_crc@cursor-128x128-random: - shard-apl: PASS -> FAIL [fdo#103232] +1 * igt@kms_cursor_crc@cursor-128x128-suspend: - shard-apl: PASS -> DMESG-WARN [fdo#108566] * igt@kms_cursor_crc@cursor-256x256-random: - shard-iclb: NOTRUN -> FAIL [fdo#103232] +2 * igt@kms_cursor_crc@cursor-64x64-suspend: - shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232] * igt@kms_flip@busy-flip: - shard-glk: PASS -> FAIL [fdo#103257] * igt@kms_flip@flip-vs-expired-vblank: - shard-apl: PASS -> FAIL [fdo#102887] / [fdo#105363] * igt@kms_flip@flip-vs-expired-vblank-interruptible: - shard-glk: PASS -> FAIL [fdo#105363] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt: - shard-apl: PASS -> FAIL [fdo#103167] +1 * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite: - shard-skl: NOTRUN -> FAIL [fdo#103167] * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-move: - shard-iclb: PASS -> FAIL [fdo#103167] +1 * igt@kms_frontbuffer_tracking@psr-suspend: - shard-skl: PASS -> INCOMPLETE [fdo#104108] / [fdo#106978] / [fdo#107773] * igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c-frame-sequence: - shard-skl: PASS -> FAIL [fdo#103191] / [fdo#107362] * igt@kms_plane@pixel-format-pipe-b-planes: - shard-iclb: NOTRUN -> FAIL [fdo#103166] * igt@kms_plane@pixel-format-pipe-c-planes-source-clamping: - shard-skl: NOTRUN -> DMESG-WARN [fdo#106885] +1 * igt@kms_plane_alpha_blend@pipe-a-alpha-7efc: - shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145] * igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb: - shard-skl: NOTRUN -> FAIL [fdo#108145] +1 * igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb: - shard-kbl: NOTRUN -> FAIL [fdo#108145] * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max: - shard-glk: PASS -> FAIL [fdo#108145] * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc: - shard-skl: PASS -> FAIL [fdo#107815] * igt@kms_plane_multiple@atomic-pipe-b-tiling-y: - shard-glk: PASS -> FAIL [fdo#103166] +1 - shard-apl: PASS -> FAIL [fdo#103166] +1 * igt@kms_plane_scaling@pipe-c-scaler-with-rotation: - shard-iclb: NOTRUN -> DMESG-WARN [fdo#107724] * igt@kms_setmode@basic: - shard-kbl: PASS -> FAIL [fdo#99912] Possible fixes * igt@gem_ctx_isolation@vcs1-s3: - shard-kbl: INCOMPLETE [fdo#103665] -> PASS +1 * igt@kms_flip@basic-flip-vs-wf_vblank: - shard-iclb: DMESG-WARN [fdo#107724] -> PASS +5 * igt@kms_flip@flip-vs-expired-vblank: - shard-skl: FAIL [fdo#105363] -> PASS *
[Intel-gfx] ✓ Fi.CI.BAT: success for drm: add DRM_DEBUG_CORE() and friends and use them
== Series Details ==
Series: drm: add DRM_DEBUG_CORE() and friends and use them
URL : https://patchwork.freedesktop.org/series/54503/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5343 -> Patchwork_11157
Summary
---
**SUCCESS**
No regressions found.
External URL:
https://patchwork.freedesktop.org/api/1.0/series/54503/revisions/1/mbox/
Possible new issues
---
Here are the unknown changes that may have been introduced in Patchwork_11157:
### IGT changes ###
Possible regressions
* {igt@runner@aborted}:
- fi-kbl-8809g: NOTRUN -> FAIL
Known issues
Here are the changes found in Patchwork_11157 that come from known issues:
### IGT changes ###
Issues hit
* igt@amdgpu/amd_cs_nop@nop-gfx0:
- fi-kbl-8809g: PASS -> DMESG-FAIL [fdo#107762]
* igt@i915_selftest@live_hangcheck:
- fi-skl-iommu: PASS -> INCOMPLETE [fdo#108602] / [fdo#108744]
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: PASS -> FAIL [fdo#103167]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-blb-e6850: NOTRUN -> INCOMPLETE [fdo#107718]
* {igt@runner@aborted}:
- fi-skl-iommu: NOTRUN -> FAIL [fdo#104108] / [fdo#108602]
- fi-icl-y: NOTRUN -> FAIL [fdo#108915]
Possible fixes
* igt@gem_ctx_create@basic-files:
- fi-bsw-kefka: INCOMPLETE [fdo#105876] / [fdo#108714] -> PASS
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@i915_selftest@live_contexts:
- fi-byt-j1900: DMESG-WARN -> PASS
Warnings
* igt@i915_selftest@live_contexts:
- fi-icl-u2: INCOMPLETE [fdo#108315] -> DMESG-FAIL [fdo#108569]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105876]: https://bugs.freedesktop.org/show_bug.cgi?id=105876
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107762]: https://bugs.freedesktop.org/show_bug.cgi?id=107762
[fdo#108315]: https://bugs.freedesktop.org/show_bug.cgi?id=108315
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#108714]: https://bugs.freedesktop.org/show_bug.cgi?id=108714
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
Participating hosts (46 -> 42)
--
Additional (2): fi-icl-y fi-pnv-d510
Missing(6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks
fi-bsw-cyan fi-ctg-p8600
Build changes
-
* Linux: CI_DRM_5343 -> Patchwork_11157
CI_DRM_5343: e7a162c10f4ab5e4338927ec5bc5be726ecf3e8b @
git://anongit.freedesktop.org/gfx-ci/linux
IGT_4754: a176905d46d072300ba57f29ac2b98a0228e0e2d @
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11157: 9043278101478931af67654cfe0334e83216bd4c @
git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
904327810147 drm: add DRM_DEBUG_CORE() and friends and use them
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11157/
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm: add DRM_DEBUG_CORE() and friends and use them
== Series Details == Series: drm: add DRM_DEBUG_CORE() and friends and use them URL : https://patchwork.freedesktop.org/series/54503/ State : warning == Summary == $ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm: add DRM_DEBUG_CORE() and friends and use them -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) +drivers/gpu/drm/drm_ioctl.c:824:17: warning: expression using sizeof(void) ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm: add DRM_DEBUG_CORE() and friends and use them
== Series Details ==
Series: drm: add DRM_DEBUG_CORE() and friends and use them
URL : https://patchwork.freedesktop.org/series/54503/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
904327810147 drm: add DRM_DEBUG_CORE() and friends and use them
-:8: WARNING:TYPO_SPELLING: 'swith' may be misspelled - perhaps 'switch'?
#8:
usage about 10:1. It's easier to swith the core over to a new
-:33: WARNING:PRINTF_L: %LX is non-standard C, use %llX
#33: FILE: drivers/gpu/drm/ati_pcigart.c:136:
+ DRM_DEBUG_CORE("PCI: Gart Table: VRAM %08LX mapped at %08lX\n",
-:34: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#34: FILE: drivers/gpu/drm/ati_pcigart.c:137:
+ DRM_DEBUG_CORE("PCI: Gart Table: VRAM %08LX mapped at %08lX\n",
(unsigned long long)bus_address,
-:831: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#831: FILE: drivers/gpu/drm/drm_ioctl.c:827:
+ DRM_DEBUG_CORE("pid=%d, dev=0x%lx, auth=%d, %s\n",
task_pid_nr(current),
-:1094: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#1094: FILE: drivers/gpu/drm/drm_sysfs.c:280:
+ DRM_DEBUG_CORE("adding \"%s\" to sysfs\n",
connector->name);
-:1103: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#1103: FILE: drivers/gpu/drm/drm_sysfs.c:298:
+ DRM_DEBUG_CORE("removing \"%s\" from sysfs\n",
connector->name);
-:1181: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV)
#1181: FILE: drivers/gpu/drm/drm_vblank.c:661:
+ pipe, duration_ns/1000, *max_error/1000, i);
^
-:1181: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV)
#1181: FILE: drivers/gpu/drm/drm_vblank.c:661:
+ pipe, duration_ns/1000, *max_error/1000, i);
^
-:1384: WARNING:LONG_LINE: line over 100 characters
#1384: FILE: drivers/gpu/drm/drm_vm.c:601:
+ vma->vm_start, vma->vm_end, (unsigned long
long)(map->offset + offset));
total: 0 errors, 3 warnings, 6 checks, 1224 lines checked
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 6/6] drm/i915: drop all drmP.h includes
On Thu, 27 Dec 2018, Daniel Vetter wrote: > I guess next up would be to split up i915_drv.h and intel_drv.h and see > how much our driver is a spaghetti mess where everything needs everything > else :-) In general this got me wondering how self-contained the header files really need to be. Turns out even isn't self-contained, it fails on do_div() for my config if isn't included some other route. Didn't dig deep, but by the looks of it this is not a new breakage (if you can call it that). BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [RFC] drm: add DRM_DEBUG_CORE() and friends and use them
DRM_DEBUG() was intended to be used by the drm core code only, but we
weren't careful. Today, the driver usage of DRM_DEBUG() trumps drm core
usage about 10:1. It's easier to swith the core over to a new
DRM_DEBUG_CORE() macro than the drivers over to DRM_DEBUG_DRIVER().
Do the same for DRM_DEV_DEBUG() and the ratelimited ones as well.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/ati_pcigart.c | 4 +-
drivers/gpu/drm/drm_agpsupport.c | 6 +-
drivers/gpu/drm/drm_auth.c| 4 +-
drivers/gpu/drm/drm_bufs.c| 112 +++---
drivers/gpu/drm/drm_context.c | 14 ++---
drivers/gpu/drm/drm_dma.c | 10 ++--
drivers/gpu/drm/drm_dp_aux_dev.c | 6 +-
drivers/gpu/drm/drm_drv.c | 10 ++--
drivers/gpu/drm/drm_edid.c| 48
drivers/gpu/drm/drm_fb_helper.c | 16 +++---
drivers/gpu/drm/drm_file.c| 20 +++
drivers/gpu/drm/drm_framebuffer.c | 2 +-
drivers/gpu/drm/drm_hashtab.c | 4 +-
drivers/gpu/drm/drm_ioc32.c | 12 ++--
drivers/gpu/drm/drm_ioctl.c | 16 +++---
drivers/gpu/drm/drm_irq.c | 4 +-
drivers/gpu/drm/drm_lease.c | 2 +-
drivers/gpu/drm/drm_lock.c| 20 +++
drivers/gpu/drm/drm_mode_object.c | 4 +-
drivers/gpu/drm/drm_pci.c | 10 ++--
drivers/gpu/drm/drm_plane.c | 10 ++--
drivers/gpu/drm/drm_scatter.c | 10 ++--
drivers/gpu/drm/drm_sysfs.c | 8 +--
drivers/gpu/drm/drm_vblank.c | 62 ++---
drivers/gpu/drm/drm_vm.c | 32 +--
include/drm/drm_print.h | 32 ++-
26 files changed, 242 insertions(+), 236 deletions(-)
diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
index 2362f07fe1fc..80af5b62154b 100644
--- a/drivers/gpu/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c
@@ -112,7 +112,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct
drm_ati_pcigart_info *ga
}
if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
- DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");
+ DRM_DEBUG_CORE("PCI: no table in VRAM: using normal RAM\n");
if (pci_set_dma_mask(dev->pdev, gart_info->table_mask)) {
DRM_ERROR("fail to set dma mask to 0x%Lx\n",
@@ -133,7 +133,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct
drm_ati_pcigart_info *ga
} else {
address = gart_info->addr;
bus_address = gart_info->bus_addr;
- DRM_DEBUG("PCI: Gart Table: VRAM %08LX mapped at %08lX\n",
+ DRM_DEBUG_CORE("PCI: Gart Table: VRAM %08LX mapped at %08lX\n",
(unsigned long long)bus_address,
(unsigned long)address);
}
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index 737f02885c28..ab567d4e4e81 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -323,8 +323,8 @@ int drm_agp_bind(struct drm_device *dev, struct
drm_agp_binding *request)
if (retcode)
return retcode;
entry->bound = dev->agp->base + (page << PAGE_SHIFT);
- DRM_DEBUG("base = 0x%lx entry->bound = 0x%lx\n",
- dev->agp->base, entry->bound);
+ DRM_DEBUG_CORE("base = 0x%lx entry->bound = 0x%lx\n",
+ dev->agp->base, entry->bound);
return 0;
}
EXPORT_SYMBOL(drm_agp_bind);
@@ -476,7 +476,7 @@ drm_agp_bind_pages(struct drm_device *dev,
struct agp_memory *mem;
int ret, i;
- DRM_DEBUG("\n");
+ DRM_DEBUG_CORE("\n");
mem = agp_allocate_memory(dev->agp->bridge, num_pages,
type);
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index 1669c42c40ed..ef46299784d8 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -70,7 +70,7 @@ int drm_getmagic(struct drm_device *dev, void *data, struct
drm_file *file_priv)
auth->magic = file_priv->magic;
mutex_unlock(>master_mutex);
- DRM_DEBUG("%u\n", auth->magic);
+ DRM_DEBUG_CORE("%u\n", auth->magic);
return ret < 0 ? ret : 0;
}
@@ -81,7 +81,7 @@ int drm_authmagic(struct drm_device *dev, void *data,
struct drm_auth *auth = data;
struct drm_file *file;
- DRM_DEBUG("%u\n", auth->magic);
+ DRM_DEBUG_CORE("%u\n", auth->magic);
mutex_lock(>master_mutex);
file = idr_find(_priv->master->magic_map, auth->magic);
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index d7d10cabb9bb..f7d5af8604c2 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -159,8 +159,8 @@ static int drm_addmap_core(struct drm_device *dev,
resource_size_t offset,
kfree(map);
return -EINVAL;
}
- DRM_DEBUG("offset = 0x%08llx, size
Re: [Intel-gfx] [PATCH 6/6] drm/i915: drop all drmP.h includes
On Thu, Dec 27, 2018 at 02:56:41PM +0200, Jani Nikula wrote: > Needs just a few additional includes here and there. > > Cc: Sam Ravnborg > Cc: Daniel Vetter > Cc: Laurent Pinchart > Signed-off-by: Jani Nikula lgtm, but didn't try to second-guess gcc :-) Acked-by: Daniel Vetter I guess next up would be to split up i915_drv.h and intel_drv.h and see how much our driver is a spaghetti mess where everything needs everything else :-) Cheers, Daniel > --- > drivers/gpu/drm/i915/dvo.h | 1 - > drivers/gpu/drm/i915/i915_drv.c| 1 - > drivers/gpu/drm/i915/i915_drv.h| 2 +- > drivers/gpu/drm/i915/i915_gem.c| 1 - > drivers/gpu/drm/i915/i915_gem_context.c| 1 - > drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 - > drivers/gpu/drm/i915/i915_gem_evict.c | 1 - > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 - > drivers/gpu/drm/i915/i915_gem_fence_reg.c | 1 - > drivers/gpu/drm/i915/i915_gem_gtt.c| 1 - > drivers/gpu/drm/i915/i915_gem_internal.c | 1 - > drivers/gpu/drm/i915/i915_gem_object.h | 3 ++- > drivers/gpu/drm/i915/i915_gem_shrinker.c | 1 - > drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - > drivers/gpu/drm/i915/i915_gem_tiling.c | 1 - > drivers/gpu/drm/i915/i915_gem_userptr.c| 1 - > drivers/gpu/drm/i915/i915_ioc32.c | 1 - > drivers/gpu/drm/i915/i915_irq.c| 1 - > drivers/gpu/drm/i915/i915_suspend.c| 1 - > drivers/gpu/drm/i915/i915_trace.h | 1 - > drivers/gpu/drm/i915/intel_acpi.c | 1 - > drivers/gpu/drm/i915/intel_atomic.c| 1 - > drivers/gpu/drm/i915/intel_atomic_plane.c | 1 - > drivers/gpu/drm/i915/intel_audio.c | 1 - > drivers/gpu/drm/i915/intel_bios.c | 1 - > drivers/gpu/drm/i915/intel_connector.c | 1 - > drivers/gpu/drm/i915/intel_crt.c | 1 - > drivers/gpu/drm/i915/intel_display.c | 1 - > drivers/gpu/drm/i915/intel_dp.c| 1 - > drivers/gpu/drm/i915/intel_dp_mst.c| 1 - > drivers/gpu/drm/i915/intel_dsi.h | 1 - > drivers/gpu/drm/i915/intel_dsi_vbt.c | 1 - > drivers/gpu/drm/i915/intel_dvo.c | 1 - > drivers/gpu/drm/i915/intel_fbdev.c | 1 - > drivers/gpu/drm/i915/intel_frontbuffer.c | 1 - > drivers/gpu/drm/i915/intel_hdcp.c | 1 - > drivers/gpu/drm/i915/intel_hdmi.c | 1 - > drivers/gpu/drm/i915/intel_hotplug.c | 1 - > drivers/gpu/drm/i915/intel_i2c.c | 1 - > drivers/gpu/drm/i915/intel_lrc.c | 1 - > drivers/gpu/drm/i915/intel_lvds.c | 1 - > drivers/gpu/drm/i915/intel_mocs.h | 1 - > drivers/gpu/drm/i915/intel_opregion.c | 1 - > drivers/gpu/drm/i915/intel_overlay.c | 1 - > drivers/gpu/drm/i915/intel_psr.c | 1 - > drivers/gpu/drm/i915/intel_ringbuffer.c| 1 - > drivers/gpu/drm/i915/intel_sdvo.c | 1 - > drivers/gpu/drm/i915/intel_sprite.c| 1 - > drivers/gpu/drm/i915/intel_tv.c| 1 - > drivers/gpu/drm/i915/intel_vdsc.c | 1 - > drivers/gpu/drm/i915/vlv_dsi.c | 1 - > 51 files changed, 3 insertions(+), 51 deletions(-) > > diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h > index 5e6a3013da49..16e0345b711f 100644 > --- a/drivers/gpu/drm/i915/dvo.h > +++ b/drivers/gpu/drm/i915/dvo.h > @@ -24,7 +24,6 @@ > #define _INTEL_DVO_H > > #include > -#include > #include > #include "intel_drv.h" > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index caa055ac9472..88b72a8e350f 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -41,7 +41,6 @@ > #include > #include > > -#include > #include > #include > #include > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index d44255a8655e..c314eb4cda07 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -46,7 +46,6 @@ > #include > #include > > -#include > #include > #include /* for struct drm_dma_handle */ > #include > @@ -54,6 +53,7 @@ > #include > #include > #include > +#include > > #include "i915_fixed.h" > #include "i915_params.h" > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index d92147ab4489..da59b4211150 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -25,7 +25,6 @@ > * > */ > > -#include > #include > #include > #include "i915_drv.h" > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c > b/drivers/gpu/drm/i915/i915_gem_context.c > index 5905b6d8f291..5933adbe3d99 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -86,7 +86,6 @@ > */ > > #include > -#include > #include > #include "i915_drv.h" > #include "i915_trace.h" > diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c >
Re: [Intel-gfx] [PATCH 1/6] drm: include drm_device.h from drm_legacy.h
On Thu, Dec 27, 2018 at 05:04:20PM +0100, Daniel Vetter wrote: > On Thu, Dec 27, 2018 at 02:56:36PM +0200, Jani Nikula wrote: > > Make it easier to drop drmP.h includes. > > > > Cc: Sam Ravnborg > > Cc: Daniel Vetter > > Cc: Laurent Pinchart > > Signed-off-by: Jani Nikula > > --- > > include/drm/drm_legacy.h | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h > > index 8fad66f88e4f..743d7e70c896 100644 > > --- a/include/drm/drm_legacy.h > > +++ b/include/drm/drm_legacy.h > > @@ -2,6 +2,7 @@ > > #define __DRM_DRM_LEGACY_H__ > > > > #include > > +#include > > From a quick look, shouldn't a > > struct drm_device; > > forward decl be enough? You might need a pile more forward decl, but > that's all drm_device.h seems to pull in that drm_legacy.h needs. Reviewed-by: Daniel Vetter with the forward decl (assuming it all works out). -Daniel > -Daniel > > > > /* > > * Legacy driver interfaces for the Direct Rendering Manager > > -- > > 2.11.0 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 5/6] drm: include drm_file.h from drm_syncobj.h
On Thu, Dec 27, 2018 at 02:56:40PM +0200, Jani Nikula wrote: > Make it easier to drop drmP.h includes. Switch from "" to <> includes > while at it. > > Cc: Sam Ravnborg > Cc: Daniel Vetter > Cc: Laurent Pinchart > Signed-off-by: Jani Nikula > --- > include/drm/drm_syncobj.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h > index 7c6ed845c70d..93884da3f9fe 100644 > --- a/include/drm/drm_syncobj.h > +++ b/include/drm/drm_syncobj.h > @@ -26,7 +26,9 @@ > #ifndef __DRM_SYNCOBJ_H__ > #define __DRM_SYNCOBJ_H__ > > -#include "linux/dma-fence.h" > +#include > + > +#include I think you need only a struct drm_file; pre-decl instead of the full include. With that: Reviewed-by: Daniel Vetter > > /** > * struct drm_syncobj - sync object. > -- > 2.11.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 4/6] drm: include types.h from drm_hdcp.h
On Thu, Dec 27, 2018 at 02:56:39PM +0200, Jani Nikula wrote: > Make it easier to drop drmP.h includes. > > Cc: Sam Ravnborg > Cc: Daniel Vetter > Cc: Laurent Pinchart > Signed-off-by: Jani Nikula Reviewed-by: Daniel Vetter > --- > include/drm/drm_hdcp.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h > index a6de09c5e47f..d6dfef8cff6a 100644 > --- a/include/drm/drm_hdcp.h > +++ b/include/drm/drm_hdcp.h > @@ -9,6 +9,8 @@ > #ifndef _DRM_HDCP_H_INCLUDED_ > #define _DRM_HDCP_H_INCLUDED_ > > +#include > + > /* Period of hdcp checks (to ensure we're still authenticated) */ > #define DRM_HDCP_CHECK_PERIOD_MS (128 * 16) > > -- > 2.11.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 3/6] drm: include idr.h from drm_file.h
On Thu, Dec 27, 2018 at 02:56:38PM +0200, Jani Nikula wrote: > Make it easier to drop drmP.h includes. > > Cc: Sam Ravnborg > Cc: Daniel Vetter > Cc: Laurent Pinchart > Signed-off-by: Jani Nikula > --- > include/drm/drm_file.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h > index 84ac79219e4c..6710b612e2f6 100644 > --- a/include/drm/drm_file.h > +++ b/include/drm/drm_file.h > @@ -32,6 +32,7 @@ > > #include > #include > +#include Yup, we embed the struct idr. Reviewed-by: Daniel Vetter > > #include > > -- > 2.11.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 2/6] drm: include kernel.h and agp_backend.h from intel-gtt.h
On Thu, Dec 27, 2018 at 02:56:37PM +0200, Jani Nikula wrote: > Make it easier to drop drmP.h includes. > > Cc: Sam Ravnborg > Cc: Daniel Vetter > Cc: Laurent Pinchart > Signed-off-by: Jani Nikula Makes sense. Reviewed-by: Daniel Vetter > --- > include/drm/intel-gtt.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h > index 2324c84a25c0..71d81923e6b0 100644 > --- a/include/drm/intel-gtt.h > +++ b/include/drm/intel-gtt.h > @@ -4,6 +4,9 @@ > #ifndef _DRM_INTEL_GTT_H > #define _DRM_INTEL_GTT_H > > +#include > +#include > + > void intel_gtt_get(u64 *gtt_total, > phys_addr_t *mappable_base, > resource_size_t *mappable_end); > -- > 2.11.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 1/6] drm: include drm_device.h from drm_legacy.h
On Thu, Dec 27, 2018 at 02:56:36PM +0200, Jani Nikula wrote: > Make it easier to drop drmP.h includes. > > Cc: Sam Ravnborg > Cc: Daniel Vetter > Cc: Laurent Pinchart > Signed-off-by: Jani Nikula > --- > include/drm/drm_legacy.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h > index 8fad66f88e4f..743d7e70c896 100644 > --- a/include/drm/drm_legacy.h > +++ b/include/drm/drm_legacy.h > @@ -2,6 +2,7 @@ > #define __DRM_DRM_LEGACY_H__ > > #include > +#include From a quick look, shouldn't a struct drm_device; forward decl be enough? You might need a pile more forward decl, but that's all drm_device.h seems to pull in that drm_legacy.h needs. -Daniel > > /* > * Legacy driver interfaces for the Direct Rendering Manager > -- > 2.11.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 0/6] drm/i915: drmP.h include removal w/ drm prep work
On Thu, Dec 27, 2018 at 02:56:35PM +0200, Jani Nikula wrote: > First make some drm headers self-contained, removing the implicit > dependency on a previous drmP.h include. Then remove all drmP.h includes > from drm/i915. > > Inspired by Sam's series [1]. Theres a one line trivial conflict between > that one and this series in drm_file.h (patch 3), but I'm keeping this > series self-contained. Should be easy enough to resolve. > > I'm fine with merging the first 5 through either drm-misc or drm-intel, > but I'd rather merge the last one through drm-intel. Usually I'd say stuff it into drm-misc and then backmerge for the last patch, but -rc1 is still a few weeks away I think, so not great. Probably best if you stuff this into a topic branch in drm-intel, and then send out pull requests to both drm-misc-next and dinq. -Daniel > > BR, > Jani. > > Cc: Sam Ravnborg > Cc: Daniel Vetter > Cc: Laurent Pinchart > > > Jani Nikula (6): > drm: include drm_device.h from drm_legacy.h > drm: include kernel.h and agp_backend.h from intel-gtt.h > drm: include idr.h from drm_file.h > drm: include types.h from drm_hdcp.h > drm: include drm_file.h from drm_syncobj.h > drm/i915: drop all drmP.h includes > > drivers/gpu/drm/i915/dvo.h | 1 - > drivers/gpu/drm/i915/i915_drv.c| 1 - > drivers/gpu/drm/i915/i915_drv.h| 2 +- > drivers/gpu/drm/i915/i915_gem.c| 1 - > drivers/gpu/drm/i915/i915_gem_context.c| 1 - > drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 - > drivers/gpu/drm/i915/i915_gem_evict.c | 1 - > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 - > drivers/gpu/drm/i915/i915_gem_fence_reg.c | 1 - > drivers/gpu/drm/i915/i915_gem_gtt.c| 1 - > drivers/gpu/drm/i915/i915_gem_internal.c | 1 - > drivers/gpu/drm/i915/i915_gem_object.h | 3 ++- > drivers/gpu/drm/i915/i915_gem_shrinker.c | 1 - > drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - > drivers/gpu/drm/i915/i915_gem_tiling.c | 1 - > drivers/gpu/drm/i915/i915_gem_userptr.c| 1 - > drivers/gpu/drm/i915/i915_ioc32.c | 1 - > drivers/gpu/drm/i915/i915_irq.c| 1 - > drivers/gpu/drm/i915/i915_suspend.c| 1 - > drivers/gpu/drm/i915/i915_trace.h | 1 - > drivers/gpu/drm/i915/intel_acpi.c | 1 - > drivers/gpu/drm/i915/intel_atomic.c| 1 - > drivers/gpu/drm/i915/intel_atomic_plane.c | 1 - > drivers/gpu/drm/i915/intel_audio.c | 1 - > drivers/gpu/drm/i915/intel_bios.c | 1 - > drivers/gpu/drm/i915/intel_connector.c | 1 - > drivers/gpu/drm/i915/intel_crt.c | 1 - > drivers/gpu/drm/i915/intel_display.c | 1 - > drivers/gpu/drm/i915/intel_dp.c| 1 - > drivers/gpu/drm/i915/intel_dp_mst.c| 1 - > drivers/gpu/drm/i915/intel_dsi.h | 1 - > drivers/gpu/drm/i915/intel_dsi_vbt.c | 1 - > drivers/gpu/drm/i915/intel_dvo.c | 1 - > drivers/gpu/drm/i915/intel_fbdev.c | 1 - > drivers/gpu/drm/i915/intel_frontbuffer.c | 1 - > drivers/gpu/drm/i915/intel_hdcp.c | 1 - > drivers/gpu/drm/i915/intel_hdmi.c | 1 - > drivers/gpu/drm/i915/intel_hotplug.c | 1 - > drivers/gpu/drm/i915/intel_i2c.c | 1 - > drivers/gpu/drm/i915/intel_lrc.c | 1 - > drivers/gpu/drm/i915/intel_lvds.c | 1 - > drivers/gpu/drm/i915/intel_mocs.h | 1 - > drivers/gpu/drm/i915/intel_opregion.c | 1 - > drivers/gpu/drm/i915/intel_overlay.c | 1 - > drivers/gpu/drm/i915/intel_psr.c | 1 - > drivers/gpu/drm/i915/intel_ringbuffer.c| 1 - > drivers/gpu/drm/i915/intel_sdvo.c | 1 - > drivers/gpu/drm/i915/intel_sprite.c| 1 - > drivers/gpu/drm/i915/intel_tv.c| 1 - > drivers/gpu/drm/i915/intel_vdsc.c | 1 - > drivers/gpu/drm/i915/vlv_dsi.c | 1 - > include/drm/drm_file.h | 1 + > include/drm/drm_hdcp.h | 2 ++ > include/drm/drm_legacy.h | 1 + > include/drm/drm_syncobj.h | 4 +++- > include/drm/intel-gtt.h| 3 +++ > 56 files changed, 13 insertions(+), 52 deletions(-) > > -- > 2.11.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] Forced push done to drm-intel-next-queued
Hi,
On 27-12-18 15:42, Jani Nikula wrote:
On Tue, 25 Dec 2018, Hans de Goede wrote:
Hi,
As mentioned in the "I messed up drm-intel-next-queued!" mail-thread
I made a big mistake yesterday:
"Ugh, I just messed up drm-intel-next-queued big time.
I somehow rebased my work on top of drm-tip (I believe I did the rebase
in the wrong dir) and then after running a bunch of tests I
did a "dim push-branch drm-intel-next-queued" which pushed the
patches I intended to push rebased on top of drm-tip
pushing drm-tip to dinq :(
I'm so sorry about this.
I just checked my reflog and the last commit before me messing
up is commit d4de753526f4d99f541f1b6ed1d963005c09700c
("drm/i915: Unwind failure on pinning the gen7 ppgtt")"
To fix this I've just done a forced push resetting
drm-intel-next-queued to the mentioned d4de753526f4 commit.
I first checked no-one pushed anything on top of my mess,
but if you pushed anything to drm-intel-next-queued in the
last 24 hours, please double-check it is there.
Once more my apologies for this.
It happens, don't worry about it. Thanks for being open about it instead
of trying to brush it under the rug.
Thanks.
Did you pass -f to dim? I suspect drm-tip wouldn't pass the push checks
in dim without it. Perhaps we'll need to add more.
No I did not pass -f, I did wonder myself how the push managed to
proceed after my screw-up. Looking at how dim builds drm-tip, it seems
it starts with dinq and then merges in other branches, so a push
from a drm-tip based branch to dinq is a fast-forward (I think),
so dinq is special in this case.
Anyway, checking against what I had on Friday, I think it all checks
out. It's of course possible something was pushed on top, but I doubt
it.
Great, thank you for double checking.
Regards,
Hans
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: modparam rework prep work
== Series Details ==
Series: drm/i915: modparam rework prep work
URL : https://patchwork.freedesktop.org/series/54499/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5343 -> Patchwork_11156
Summary
---
**FAILURE**
Serious unknown changes coming with Patchwork_11156 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_11156, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL:
https://patchwork.freedesktop.org/api/1.0/series/54499/revisions/1/mbox/
Possible new issues
---
Here are the unknown changes that may have been introduced in Patchwork_11156:
### IGT changes ###
Possible regressions
* igt@i915_selftest@live_contexts:
- fi-bsw-kefka: NOTRUN -> DMESG-FAIL
Known issues
Here are the changes found in Patchwork_11156 that come from known issues:
### IGT changes ###
Issues hit
* igt@i915_module_load@reload:
- fi-blb-e6850: NOTRUN -> INCOMPLETE [fdo#107718]
* {igt@runner@aborted}:
- fi-icl-y: NOTRUN -> FAIL [fdo#108915]
Possible fixes
* igt@gem_ctx_create@basic-files:
- fi-bsw-kefka: INCOMPLETE [fdo#105876] / [fdo#108714] -> PASS
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@i915_selftest@live_contexts:
- fi-byt-j1900: DMESG-WARN -> PASS
Warnings
* igt@i915_selftest@live_contexts:
- fi-icl-u2: INCOMPLETE [fdo#108315] -> DMESG-FAIL [fdo#108569]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#105876]: https://bugs.freedesktop.org/show_bug.cgi?id=105876
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108315]: https://bugs.freedesktop.org/show_bug.cgi?id=108315
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108714]: https://bugs.freedesktop.org/show_bug.cgi?id=108714
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
Participating hosts (46 -> 42)
--
Additional (2): fi-icl-y fi-pnv-d510
Missing(6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks
fi-bsw-cyan fi-ctg-p8600
Build changes
-
* Linux: CI_DRM_5343 -> Patchwork_11156
CI_DRM_5343: e7a162c10f4ab5e4338927ec5bc5be726ecf3e8b @
git://anongit.freedesktop.org/gfx-ci/linux
IGT_4754: a176905d46d072300ba57f29ac2b98a0228e0e2d @
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11156: cef50b3570963ec3321c7bda92dfd80d159a0c02 @
git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
cef50b357096 drm/i915/params: document I915_PARAMS_FOR_EACH()
f21e97b58b40 drm/i915: move load failure injection to selftests
e41b8248dea6 drm/i915/params: set i915.enable_hangcheck permissions to 0600
1116230810cd drm/i915/uc: add dev_priv parameter to intel_uc_is_using_*
functions
446aa1f787ee drm/i915: add a helper to free the members of i915_params
ef92c4788911 drm/i915: add a helper to make a copy of i915_params
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11156/
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v5 2/2] drm/i915: Attach colorspace property and enable modeset
>-Original Message-
>From: dri-devel [mailto:dri-devel-boun...@lists.freedesktop.org] On Behalf Of
>Sharma, Shashank
>Sent: Thursday, December 20, 2018 11:02 PM
>To: Shankar, Uma ; intel-gfx@lists.freedesktop.org;
>dri-de...@lists.freedesktop.org
>Cc: hansv...@cisco.com; Syrjala, Ville ; Lankhorst,
>Maarten ; jo...@kwiboo.se
>Subject: Re: [v5 2/2] drm/i915: Attach colorspace property and enable modeset
>
>Regards
>
>Shashank
>
>
>On 12/11/2018 11:44 PM, Uma Shankar wrote:
>> This patch attaches the colorspace connector property to the hdmi
>> connector. Based on colorspace change, modeset will be triggered to
>> switch to new colorspace.
>>
>> Based on colorspace property value create an infoframe with
>> appropriate colorspace. This can be used to send an infoframe packet
>> with proper colorspace value set which will help to enable wider color
>> gamut like BT2020 on sink.
>>
>> This patch attaches and enables HDMI colorspace, DP will be taken care
>> separately.
>>
>> v2: Merged the changes of creating infoframe as well to this patch as
>> per Maarten's suggestion.
>>
>> v3: Addressed review comments from Shashank. Separated HDMI and DP
>> colorspaces as suggested by Ville and Maarten.
>>
>> v4: Addressed Chris and Ville's review comments, and created a common
>> colorspace property for DP and HDMI, filtered the list based on the
>> colorspaces supported by the respective protocol standard. Handle the
>> default case properly.
>>
>> v5: Added Platform specific colorspace enums and called the property
>> creation helper using the same.
>>
>> Signed-off-by: Uma Shankar
>> ---
>> drivers/gpu/drm/i915/intel_atomic.c| 1 +
>> drivers/gpu/drm/i915/intel_connector.c | 63
>++
>> drivers/gpu/drm/i915/intel_drv.h | 1 +
>> drivers/gpu/drm/i915/intel_hdmi.c | 18 ++
>> 4 files changed, 83 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_atomic.c
>> b/drivers/gpu/drm/i915/intel_atomic.c
>> index a5a2c8f..35ef70a 100644
>> --- a/drivers/gpu/drm/i915/intel_atomic.c
>> +++ b/drivers/gpu/drm/i915/intel_atomic.c
>> @@ -125,6 +125,7 @@ int intel_digital_connector_atomic_check(struct
>drm_connector *conn,
>> */
>> if (new_conn_state->force_audio != old_conn_state->force_audio ||
>> new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb
>> ||
>> +new_state->colorspace != old_state->colorspace ||
>> new_conn_state->base.picture_aspect_ratio != old_conn_state-
>>base.picture_aspect_ratio ||
>> new_conn_state->base.content_type != old_conn_state-
>>base.content_type ||
>> new_conn_state->base.scaling_mode !=
>> old_conn_state->base.scaling_mode)
>> diff --git a/drivers/gpu/drm/i915/intel_connector.c
>> b/drivers/gpu/drm/i915/intel_connector.c
>> index 18e370f..59fa420 100644
>> --- a/drivers/gpu/drm/i915/intel_connector.c
>> +++ b/drivers/gpu/drm/i915/intel_connector.c
>> @@ -31,6 +31,48 @@
>> #include "intel_drv.h"
>> #include "i915_drv.h"
>>
>> +static const struct drm_prop_enum_list gen10_hdmi_colorspace[] = {
>> +/* For Default case, driver will set the colorspace */
>> +{ COLORIMETRY_DEFAULT, "Default" },
>> +/* Standard Definition Colorimetry based on CEA 861 */
>> +{ COLORIMETRY_ITU_601, "ITU_601" },
>> +{ COLORIMETRY_ITU_709, "ITU_709" },
>> +/* Standard Definition Colorimetry based on IEC 61966-2-4 */
>> +{ COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
>> +/* High Definition Colorimetry based on IEC 61966-2-4 */
>> +{ COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
>> +/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
>> +{ COLORIMETRY_S_YCC_601, "S_YCC_601" },
>> +/* Colorimetry based on IEC 61966-2-5 [33] */
>> +{ COLORIMETRY_OPYCC_601, "opYCC_601" },
>> +/* Colorimetry based on IEC 61966-2-5 */
>> +{ COLORIMETRY_OPRGB, "opRGB" },
>> +/* Colorimetry based on ITU-R BT.2020 */
>> +{ COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
>> +/* Colorimetry based on ITU-R BT.2020 */
>> +{ COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
>> +/* Colorimetry based on ITU-R BT.2020 */
>> +{ COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
>> +
>> +static const struct drm_prop_enum_list legacy_hdmi_colorspace[] = {
>> +/* For Default case, driver will set the colorspace */
>> +{ COLORIMETRY_DEFAULT, "Default" },
>> +/* Standard Definition Colorimetry based on CEA 861 */
>> +{ COLORIMETRY_ITU_601, "ITU_601" },
>> +{ COLORIMETRY_ITU_709, "ITU_709" },
>> +/* Standard Definition Colorimetry based on IEC 61966-2-4 */
>> +{ COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
>> +/* High Definition Colorimetry based on IEC 61966-2-4 */
>> +{ COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
>> +/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
>> +{ COLORIMETRY_S_YCC_601, "S_YCC_601" },
>> +/* Colorimetry based on IEC 61966-2-5 [33] */
>> +{ COLORIMETRY_OPYCC_601, "opYCC_601" },
>> +/* Colorimetry
[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: drmP.h include removal w/ drm prep work
== Series Details ==
Series: drm/i915: drmP.h include removal w/ drm prep work
URL : https://patchwork.freedesktop.org/series/54494/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5343 -> Patchwork_11155
Summary
---
**SUCCESS**
No regressions found.
External URL:
https://patchwork.freedesktop.org/api/1.0/series/54494/revisions/1/mbox/
Known issues
Here are the changes found in Patchwork_11155 that come from known issues:
### IGT changes ###
Issues hit
* igt@i915_selftest@live_execlists:
- fi-apl-guc: PASS -> DMESG-WARN [fdo#108622]
* {igt@runner@aborted}:
- fi-apl-guc: NOTRUN -> FAIL [fdo#108622]
Possible fixes
* igt@gem_ctx_create@basic-files:
- fi-bsw-kefka: INCOMPLETE [fdo#105876] / [fdo#108714] -> PASS
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@i915_selftest@live_contexts:
- fi-byt-j1900: DMESG-WARN -> PASS
Warnings
* igt@i915_selftest@live_contexts:
- fi-icl-u2: INCOMPLETE [fdo#108315] -> DMESG-FAIL [fdo#108569]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#105876]: https://bugs.freedesktop.org/show_bug.cgi?id=105876
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108315]: https://bugs.freedesktop.org/show_bug.cgi?id=108315
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#108714]: https://bugs.freedesktop.org/show_bug.cgi?id=108714
Participating hosts (46 -> 40)
--
Missing(6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks
fi-bsw-cyan fi-ctg-p8600
Build changes
-
* Linux: CI_DRM_5343 -> Patchwork_11155
CI_DRM_5343: e7a162c10f4ab5e4338927ec5bc5be726ecf3e8b @
git://anongit.freedesktop.org/gfx-ci/linux
IGT_4754: a176905d46d072300ba57f29ac2b98a0228e0e2d @
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11155: 27ac63848159e6d74686affd71e1eeeffd474ecc @
git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
27ac63848159 drm/i915: drop all drmP.h includes
5764965d26be drm: include drm_file.h from drm_syncobj.h
e6f5b22bc931 drm: include types.h from drm_hdcp.h
46ef7759ef27 drm: include idr.h from drm_file.h
fb086404d498 drm: include kernel.h and agp_backend.h from intel-gtt.h
11d8bcdc5ec9 drm: include drm_device.h from drm_legacy.h
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11155/
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: modparam rework prep work
== Series Details == Series: drm/i915: modparam rework prep work URL : https://patchwork.freedesktop.org/series/54499/ State : warning == Summary == $ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: add a helper to make a copy of i915_params Okay! Commit: drm/i915: add a helper to free the members of i915_params Okay! Commit: drm/i915/uc: add dev_priv parameter to intel_uc_is_using_* functions Okay! Commit: drm/i915/params: set i915.enable_hangcheck permissions to 0600 Okay! Commit: drm/i915: move load failure injection to selftests -drivers/gpu/drm/i915/selftests/../i915_drv.h:3550:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3535:16: warning: expression using sizeof(void) Commit: drm/i915/params: document I915_PARAMS_FOR_EACH() Okay! ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: modparam rework prep work
== Series Details == Series: drm/i915: modparam rework prep work URL : https://patchwork.freedesktop.org/series/54499/ State : warning == Summary == $ dim checkpatch origin/drm-tip ef92c4788911 drm/i915: add a helper to make a copy of i915_params -:53: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'x' may be better as '(x)' to avoid precedence issues #53: FILE: drivers/gpu/drm/i915/i915_params.c:216: +#define DUP(T, x, ...) dup_param(#T, >x); -:53: WARNING:TRAILING_SEMICOLON: macros should not use a trailing semicolon #53: FILE: drivers/gpu/drm/i915/i915_params.c:216: +#define DUP(T, x, ...) dup_param(#T, >x); total: 0 errors, 1 warnings, 1 checks, 43 lines checked 446aa1f787ee drm/i915: add a helper to free the members of i915_params -:54: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'x' may be better as '(x)' to avoid precedence issues #54: FILE: drivers/gpu/drm/i915/i915_params.c:232: +#define FREE(T, x, ...) free_param(#T, >x); -:54: WARNING:TRAILING_SEMICOLON: macros should not use a trailing semicolon #54: FILE: drivers/gpu/drm/i915/i915_params.c:232: +#define FREE(T, x, ...) free_param(#T, >x); total: 0 errors, 1 warnings, 1 checks, 44 lines checked 1116230810cd drm/i915/uc: add dev_priv parameter to intel_uc_is_using_* functions e41b8248dea6 drm/i915/params: set i915.enable_hangcheck permissions to 0600 -:26: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #26: FILE: drivers/gpu/drm/i915/i915_params.c:81: +i915_param_named_unsafe(enable_hangcheck, bool, 0600, "Periodically check GPU activity for detecting hangs. " total: 0 errors, 0 warnings, 1 checks, 8 lines checked f21e97b58b40 drm/i915: move load failure injection to selftests cef50b357096 drm/i915/params: document I915_PARAMS_FOR_EACH() ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] Forced push done to drm-intel-next-queued
On Tue, 25 Dec 2018, Hans de Goede wrote:
> Hi,
>
> As mentioned in the "I messed up drm-intel-next-queued!" mail-thread
> I made a big mistake yesterday:
>
> "Ugh, I just messed up drm-intel-next-queued big time.
>
> I somehow rebased my work on top of drm-tip (I believe I did the rebase
> in the wrong dir) and then after running a bunch of tests I
> did a "dim push-branch drm-intel-next-queued" which pushed the
> patches I intended to push rebased on top of drm-tip
> pushing drm-tip to dinq :(
>
> I'm so sorry about this.
>
> I just checked my reflog and the last commit before me messing
> up is commit d4de753526f4d99f541f1b6ed1d963005c09700c
> ("drm/i915: Unwind failure on pinning the gen7 ppgtt")"
>
> To fix this I've just done a forced push resetting
> drm-intel-next-queued to the mentioned d4de753526f4 commit.
>
> I first checked no-one pushed anything on top of my mess,
> but if you pushed anything to drm-intel-next-queued in the
> last 24 hours, please double-check it is there.
>
> Once more my apologies for this.
It happens, don't worry about it. Thanks for being open about it instead
of trying to brush it under the rug.
Did you pass -f to dim? I suspect drm-tip wouldn't pass the push checks
in dim without it. Perhaps we'll need to add more.
Anyway, checking against what I had on Friday, I think it all checks
out. It's of course possible something was pushed on top, but I doubt
it. Due to the timing, it was pretty quiet. So not much maintainer
support for you, but also not much harm done either.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 0/6] drm/i915: modparam rework prep work
The first six prep patches of the module params to device params series [1]. These should be fairly non-controversial and pass CI. BR, Jani. [1] https://patchwork.freedesktop.org/series/54414/ Jani Nikula (6): drm/i915: add a helper to make a copy of i915_params drm/i915: add a helper to free the members of i915_params drm/i915/uc: add dev_priv parameter to intel_uc_is_using_* functions drm/i915/params: set i915.enable_hangcheck permissions to 0600 drm/i915: move load failure injection to selftests drm/i915/params: document I915_PARAMS_FOR_EACH() drivers/gpu/drm/i915/i915_drv.c| 25 - drivers/gpu/drm/i915/i915_drv.h| 21 +++ drivers/gpu/drm/i915/i915_gpu_error.c | 20 ++ drivers/gpu/drm/i915/i915_params.c | 37 +- drivers/gpu/drm/i915/i915_params.h | 12 - drivers/gpu/drm/i915/i915_selftest.h | 10 +++ drivers/gpu/drm/i915/intel_uc.c| 12 - drivers/gpu/drm/i915/intel_uc.h| 6 ++--- drivers/gpu/drm/i915/intel_wopcm.c | 2 +- drivers/gpu/drm/i915/selftests/i915_selftest.c | 26 ++ 10 files changed, 93 insertions(+), 78 deletions(-) -- 2.11.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 5/6] drm/i915: move load failure injection to selftests
Seems like selftests is a better home for everything related to load
failure injection, including the module parameter.
The failure injection code gets moved from under DRM_I915_DEBUG to
DRM_I915_SELFTEST config option. This should be of no consequence, as
the former selects the latter.
With the parameter no longer part of i915_params, its value will not be
recorded in error capture or debugfs param dump. Note that the value
would have been zeroed anyway if a selftest had been hit, so there
should not be meaningful information loss here, especially with all the
logging around failure injection.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/i915_drv.c| 25 -
drivers/gpu/drm/i915/i915_drv.h| 15 ---
drivers/gpu/drm/i915/i915_params.c | 5 -
drivers/gpu/drm/i915/i915_params.h | 1 -
drivers/gpu/drm/i915/i915_selftest.h | 10 ++
drivers/gpu/drm/i915/selftests/i915_selftest.c | 26 ++
6 files changed, 36 insertions(+), 46 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index caa055ac9472..559a1b11f3e4 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -57,31 +57,6 @@
static struct drm_driver driver;
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
-static unsigned int i915_load_fail_count;
-
-bool __i915_inject_load_failure(const char *func, int line)
-{
- if (i915_load_fail_count >= i915_modparams.inject_load_failure)
- return false;
-
- if (++i915_load_fail_count == i915_modparams.inject_load_failure) {
- DRM_INFO("Injecting failure at checkpoint %u [%s:%d]\n",
-i915_modparams.inject_load_failure, func, line);
- i915_modparams.inject_load_failure = 0;
- return true;
- }
-
- return false;
-}
-
-bool i915_error_injected(void)
-{
- return i915_load_fail_count && !i915_modparams.inject_load_failure;
-}
-
-#endif
-
#define FDO_BUG_URL "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI;
#define FDO_BUG_MSG "Please file a bug at " FDO_BUG_URL " against DRM/Intel " \
"providing the dmesg log by booting with drm.debug=0xf"
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c60cf17e50a0..1f29f3933625 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -111,21 +111,6 @@
#define I915_STATE_WARN_ON(x) \
I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
-
-bool __i915_inject_load_failure(const char *func, int line);
-#define i915_inject_load_failure() \
- __i915_inject_load_failure(__func__, __LINE__)
-
-bool i915_error_injected(void);
-
-#else
-
-#define i915_inject_load_failure() false
-#define i915_error_injected() false
-
-#endif
-
#define i915_load_error(i915, fmt, ...)
\
__i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
fmt, ##__VA_ARGS__)
diff --git a/drivers/gpu/drm/i915/i915_params.c
b/drivers/gpu/drm/i915/i915_params.c
index 9f0539bdaa39..2853b54570eb 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -159,11 +159,6 @@ i915_param_named_unsafe(dmc_firmware_path, charp, 0400,
i915_param_named_unsafe(enable_dp_mst, bool, 0600,
"Enable multi-stream transport (MST) for new DisplayPort sinks.
(default: true)");
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
-i915_param_named_unsafe(inject_load_failure, uint, 0400,
- "Force an error after a number of failure check points (0:disabled
(default), N:force failure at the Nth failure check point)");
-#endif
-
i915_param_named(enable_dpcd_backlight, bool, 0600,
"Enable support for DPCD backlight control (default:false)");
diff --git a/drivers/gpu/drm/i915/i915_params.h
b/drivers/gpu/drm/i915/i915_params.h
index 93f665eced16..85a9007c0ed6 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -53,7 +53,6 @@ struct drm_printer;
param(int, mmio_debug, 0) \
param(int, edp_vswing, 0) \
param(int, reset, 2) \
- param(unsigned int, inject_load_failure, 0) \
/* leave bools at the end to not create holes */ \
param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \
param(bool, enable_hangcheck, true) \
diff --git a/drivers/gpu/drm/i915/i915_selftest.h
b/drivers/gpu/drm/i915/i915_selftest.h
index a73472dd12fd..1266cef8bf17 100644
--- a/drivers/gpu/drm/i915/i915_selftest.h
+++ b/drivers/gpu/drm/i915/i915_selftest.h
@@ -33,6 +33,7 @@ struct i915_selftest {
unsigned int random_seed;
int mock;
int live;
+ unsigned int inject_load_failure;
};
#if
[Intel-gfx] [PATCH 3/6] drm/i915/uc: add dev_priv parameter to intel_uc_is_using_* functions
Reveals the build fail fixed in the last hunk. Also prep work.
v2: name it i915 instead of dev_priv (Michal)
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/i915_drv.h| 6 +++---
drivers/gpu/drm/i915/intel_uc.c| 12 ++--
drivers/gpu/drm/i915/intel_uc.h| 6 +++---
drivers/gpu/drm/i915/intel_wopcm.c | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d44255a8655e..c60cf17e50a0 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2490,9 +2490,9 @@ intel_info(const struct drm_i915_private *dev_priv)
#define HAS_HUC_UCODE(dev_priv)(HAS_GUC(dev_priv))
/* Having a GuC is not the same as using a GuC */
-#define USES_GUC(dev_priv) intel_uc_is_using_guc()
-#define USES_GUC_SUBMISSION(dev_priv) intel_uc_is_using_guc_submission()
-#define USES_HUC(dev_priv) intel_uc_is_using_huc()
+#define USES_GUC(dev_priv) intel_uc_is_using_guc(dev_priv)
+#define USES_GUC_SUBMISSION(dev_priv)
intel_uc_is_using_guc_submission(dev_priv)
+#define USES_HUC(dev_priv) intel_uc_is_using_huc(dev_priv)
#define HAS_POOLED_EU(dev_priv)((dev_priv)->info.has_pooled_eu)
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 447b1de77cc7..731b82afe636 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -71,7 +71,7 @@ static int __get_default_guc_log_level(struct
drm_i915_private *i915)
{
int guc_log_level;
- if (!HAS_GUC(i915) || !intel_uc_is_using_guc())
+ if (!HAS_GUC(i915) || !intel_uc_is_using_guc(i915))
guc_log_level = GUC_LOG_LEVEL_DISABLED;
else if (IS_ENABLED(CONFIG_DRM_I915_DEBUG) ||
IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
@@ -112,11 +112,11 @@ static void sanitize_options_early(struct
drm_i915_private *i915)
DRM_DEBUG_DRIVER("enable_guc=%d (submission:%s huc:%s)\n",
i915_modparams.enable_guc,
-yesno(intel_uc_is_using_guc_submission()),
-yesno(intel_uc_is_using_huc()));
+yesno(intel_uc_is_using_guc_submission(i915)),
+yesno(intel_uc_is_using_huc(i915)));
/* Verify GuC firmware availability */
- if (intel_uc_is_using_guc() && !intel_uc_fw_is_selected(guc_fw)) {
+ if (intel_uc_is_using_guc(i915) && !intel_uc_fw_is_selected(guc_fw)) {
DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
"enable_guc", i915_modparams.enable_guc,
!HAS_GUC(i915) ? "no GuC hardware" :
@@ -124,7 +124,7 @@ static void sanitize_options_early(struct drm_i915_private
*i915)
}
/* Verify HuC firmware availability */
- if (intel_uc_is_using_huc() && !intel_uc_fw_is_selected(huc_fw)) {
+ if (intel_uc_is_using_huc(i915) && !intel_uc_fw_is_selected(huc_fw)) {
DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
"enable_guc", i915_modparams.enable_guc,
!HAS_HUC(i915) ? "no HuC hardware" :
@@ -136,7 +136,7 @@ static void sanitize_options_early(struct drm_i915_private
*i915)
i915_modparams.guc_log_level =
__get_default_guc_log_level(i915);
- if (i915_modparams.guc_log_level > 0 && !intel_uc_is_using_guc()) {
+ if (i915_modparams.guc_log_level > 0 && !intel_uc_is_using_guc(i915)) {
DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
"guc_log_level", i915_modparams.guc_log_level,
!HAS_GUC(i915) ? "no GuC hardware" :
diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h
index 25d73ada74ae..870faf9011b9 100644
--- a/drivers/gpu/drm/i915/intel_uc.h
+++ b/drivers/gpu/drm/i915/intel_uc.h
@@ -41,19 +41,19 @@ void intel_uc_fini(struct drm_i915_private *dev_priv);
int intel_uc_suspend(struct drm_i915_private *dev_priv);
int intel_uc_resume(struct drm_i915_private *dev_priv);
-static inline bool intel_uc_is_using_guc(void)
+static inline bool intel_uc_is_using_guc(struct drm_i915_private *i915)
{
GEM_BUG_ON(i915_modparams.enable_guc < 0);
return i915_modparams.enable_guc > 0;
}
-static inline bool intel_uc_is_using_guc_submission(void)
+static inline bool intel_uc_is_using_guc_submission(struct drm_i915_private
*i915)
{
GEM_BUG_ON(i915_modparams.enable_guc < 0);
return i915_modparams.enable_guc & ENABLE_GUC_SUBMISSION;
}
-static inline bool intel_uc_is_using_huc(void)
+static inline bool intel_uc_is_using_huc(struct drm_i915_private *i915)
{
GEM_BUG_ON(i915_modparams.enable_guc < 0);
return i915_modparams.enable_guc & ENABLE_GUC_LOAD_HUC;
diff --git a/drivers/gpu/drm/i915/intel_wopcm.c
[Intel-gfx] [PATCH 4/6] drm/i915/params: set i915.enable_hangcheck permissions to 0600
i915.enable_hangcheck has been an outlier since its introduction in
commit 3e0dc6b01f53 ("drm/i915: hangcheck disable parameter") with 0644
permissions, while all the rest are either 0400 or 0600. Follow suit
with 0600.
IGT never reads the value, so there should be no impact.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/i915_params.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_params.c
b/drivers/gpu/drm/i915/i915_params.c
index 81c73bfc7991..9f0539bdaa39 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -77,7 +77,7 @@ i915_param_named(error_capture, bool, 0600,
"triaging and debugging hangs.");
#endif
-i915_param_named_unsafe(enable_hangcheck, bool, 0644,
+i915_param_named_unsafe(enable_hangcheck, bool, 0600,
"Periodically check GPU activity for detecting hangs. "
"WARNING: Disabling this can cause system wide hangs. "
"(default: true)");
--
2.11.0
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 6/6] drm/i915/params: document I915_PARAMS_FOR_EACH()
Macros with this much magic in them deserve some explanatory text.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/i915_params.h | 9 +
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_params.h
b/drivers/gpu/drm/i915/i915_params.h
index 85a9007c0ed6..98eba6728095 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -33,6 +33,15 @@ struct drm_printer;
#define ENABLE_GUC_SUBMISSION BIT(0)
#define ENABLE_GUC_LOAD_HUCBIT(1)
+/*
+ * Invoke param, a function-like macro, for each i915 param, with arguments:
+ *
+ * param(type, name, value)
+ *
+ * type: parameter type, one of {bool, int, unsigned int, char *}
+ * name: name of the parameter
+ * value: initial/default value of the parameter
+ */
#define I915_PARAMS_FOR_EACH(param) \
param(char *, vbt_firmware, NULL) \
param(int, modeset, -1) \
--
2.11.0
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 2/6] drm/i915: add a helper to free the members of i915_params
Abstract the one user in anticipation of more. Set the dangling pointers
to NULL while at it.
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/i915_gpu_error.c | 9 +
drivers/gpu/drm/i915/i915_params.c| 16
drivers/gpu/drm/i915/i915_params.h| 1 +
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c
b/drivers/gpu/drm/i915/i915_gpu_error.c
index 8c04479c1586..2bd7991ec9af 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -963,17 +963,10 @@ static void i915_error_object_free(struct
drm_i915_error_object *obj)
kfree(obj);
}
-static __always_inline void free_param(const char *type, void *x)
-{
- if (!__builtin_strcmp(type, "char *"))
- kfree(*(void **)x);
-}
static void cleanup_params(struct i915_gpu_state *error)
{
-#define FREE(T, x, ...) free_param(#T, >params.x);
- I915_PARAMS_FOR_EACH(FREE);
-#undef FREE
+ i915_params_free(>params);
}
static void cleanup_uc_state(struct i915_gpu_state *error)
diff --git a/drivers/gpu/drm/i915/i915_params.c
b/drivers/gpu/drm/i915/i915_params.c
index ae3ece4ec7ab..81c73bfc7991 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -217,3 +217,19 @@ void i915_params_copy(struct i915_params *dest, const
struct i915_params *src)
I915_PARAMS_FOR_EACH(DUP);
#undef DUP
}
+
+static __always_inline void free_param(const char *type, void *x)
+{
+ if (!__builtin_strcmp(type, "char *")) {
+ kfree(*(void **)x);
+ *(void **)x = NULL;
+ }
+}
+
+/* free the allocated members, *not* the passed in params itself */
+void i915_params_free(struct i915_params *params)
+{
+#define FREE(T, x, ...) free_param(#T, >x);
+ I915_PARAMS_FOR_EACH(FREE);
+#undef FREE
+}
diff --git a/drivers/gpu/drm/i915/i915_params.h
b/drivers/gpu/drm/i915/i915_params.h
index fd1cf9415e60..93f665eced16 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -79,6 +79,7 @@ extern struct i915_params i915_modparams __read_mostly;
void i915_params_dump(const struct i915_params *params, struct drm_printer *p);
void i915_params_copy(struct i915_params *dest, const struct i915_params *src);
+void i915_params_free(struct i915_params *params);
#endif
--
2.11.0
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 1/6] drm/i915: add a helper to make a copy of i915_params
Abstract the one user in anticipation of more.
Reviewed-by: Chris Wilson
Signed-off-by: Jani Nikula
---
drivers/gpu/drm/i915/i915_gpu_error.c | 11 +--
drivers/gpu/drm/i915/i915_params.c| 14 ++
drivers/gpu/drm/i915/i915_params.h| 1 +
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c
b/drivers/gpu/drm/i915/i915_gpu_error.c
index 63df41d93379..8c04479c1586 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1834,18 +1834,9 @@ static void capture_gen_state(struct i915_gpu_state
*error)
error->driver_caps = i915->caps;
}
-static __always_inline void dup_param(const char *type, void *x)
-{
- if (!__builtin_strcmp(type, "char *"))
- *(void **)x = kstrdup(*(void **)x, GFP_ATOMIC);
-}
-
static void capture_params(struct i915_gpu_state *error)
{
- error->params = i915_modparams;
-#define DUP(T, x, ...) dup_param(#T, >params.x);
- I915_PARAMS_FOR_EACH(DUP);
-#undef DUP
+ i915_params_copy(>params, _modparams);
}
static unsigned long capture_find_epoch(const struct i915_gpu_state *error)
diff --git a/drivers/gpu/drm/i915/i915_params.c
b/drivers/gpu/drm/i915/i915_params.c
index 2e0356561839..ae3ece4ec7ab 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -203,3 +203,17 @@ void i915_params_dump(const struct i915_params *params,
struct drm_printer *p)
I915_PARAMS_FOR_EACH(PRINT);
#undef PRINT
}
+
+static __always_inline void dup_param(const char *type, void *x)
+{
+ if (!__builtin_strcmp(type, "char *"))
+ *(void **)x = kstrdup(*(void **)x, GFP_ATOMIC);
+}
+
+void i915_params_copy(struct i915_params *dest, const struct i915_params *src)
+{
+ *dest = *src;
+#define DUP(T, x, ...) dup_param(#T, >x);
+ I915_PARAMS_FOR_EACH(DUP);
+#undef DUP
+}
diff --git a/drivers/gpu/drm/i915/i915_params.h
b/drivers/gpu/drm/i915/i915_params.h
index 7e56c516c815..fd1cf9415e60 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -78,6 +78,7 @@ struct i915_params {
extern struct i915_params i915_modparams __read_mostly;
void i915_params_dump(const struct i915_params *params, struct drm_printer *p);
+void i915_params_copy(struct i915_params *dest, const struct i915_params *src);
#endif
--
2.11.0
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 2/6] drm: include kernel.h and agp_backend.h from intel-gtt.h
Make it easier to drop drmP.h includes. Cc: Sam Ravnborg Cc: Daniel Vetter Cc: Laurent Pinchart Signed-off-by: Jani Nikula --- include/drm/intel-gtt.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 2324c84a25c0..71d81923e6b0 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h @@ -4,6 +4,9 @@ #ifndef _DRM_INTEL_GTT_H #define_DRM_INTEL_GTT_H +#include +#include + void intel_gtt_get(u64 *gtt_total, phys_addr_t *mappable_base, resource_size_t *mappable_end); -- 2.11.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v4 2/4] drm/i915/icl: Add icl pipe degamma and gamma support
>-Original Message-
>From: Ville Syrjälä [mailto:ville.syrj...@linux.intel.com]
>Sent: Friday, December 21, 2018 11:09 PM
>To: Shankar, Uma
>Cc: intel-gfx@lists.freedesktop.org; Syrjala, Ville ;
>Lankhorst, Maarten
>Subject: Re: [Intel-gfx] [v4 2/4] drm/i915/icl: Add icl pipe degamma and gamma
>support
>
>On Fri, Dec 21, 2018 at 01:29:39AM +0530, Uma Shankar wrote:
>> Add support for icl pipe degamma and gamma.
>>
>> v2: Removed a POSTING_READ and corrected the Bit Definition as per
>> Maarten's comments.
>>
>> v3: Addressed Matt's review comments. Removed rmw patterns as
>> suggested by Matt.
>>
>> v4: Fixed Matt's review comments.
>>
>> Signed-off-by: Uma Shankar
>> ---
>> drivers/gpu/drm/i915/i915_reg.h| 3 ++
>> drivers/gpu/drm/i915/intel_color.c | 67
>> ++
>> 2 files changed, 70 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h
>> b/drivers/gpu/drm/i915/i915_reg.h index 02af9b5..1852c33 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -7092,6 +7092,9 @@ enum {
>> #define GAMMA_MODE_MODE_12BIT (2 << 0)
>> #define GAMMA_MODE_MODE_SPLIT (3 << 0)
>>
>> +#define PRE_CSC_GAMMA_ENABLE(1 << 31)
>> +#define POST_CSC_GAMMA_ENABLE (1 << 30)
>> +
>> /* DMC/CSR */
>> #define CSR_PROGRAM(i) _MMIO(0x8 + (i) * 4)
>> #define CSR_SSP_BASE_ADDR_GEN9 0x2FC0
>> diff --git a/drivers/gpu/drm/i915/intel_color.c
>> b/drivers/gpu/drm/i915/intel_color.c
>> index f32e4a7..e72d8d6 100644
>> --- a/drivers/gpu/drm/i915/intel_color.c
>> +++ b/drivers/gpu/drm/i915/intel_color.c
>> @@ -534,6 +534,71 @@ static void glk_load_luts(struct intel_crtc_state
>*crtc_state)
>> POSTING_READ(GAMMA_MODE(pipe));
>> }
>>
>> +static void icl_load_degamma_lut(struct intel_crtc_state *crtc_state)
>> +{
>> +struct drm_device *dev = crtc_state->base.crtc->dev;
>> +struct drm_i915_private *dev_priv = to_i915(dev);
>> +enum pipe pipe = to_intel_crtc(crtc_state->base.crtc)->pipe;
>> +const uint32_t lut_size = INTEL_INFO(dev_priv)-
>>color.degamma_lut_size;
>> +uint32_t i;
>> +
>> +/*
>> + * When setting the auto-increment bit, the hardware seems to
>> + * ignore the index bits, so we need to reset it to index 0
>> + * separately.
>> + */
>> +I915_WRITE(PRE_CSC_GAMC_INDEX(pipe), 0);
>> +I915_WRITE(PRE_CSC_GAMC_INDEX(pipe),
>PRE_CSC_GAMC_AUTO_INCREMENT);
>> +
>> +if (crtc_state->base.degamma_lut) {
>> +struct drm_color_lut *lut = crtc_state->base.degamma_lut-
>>data;
>> +
>> +for (i = 0; i < lut_size; i++) {
>> +/*
>> + * First 33 entries represent range from 0 to 1.0
>> + * 34th and 35th entry will represent extended range
>> + * inputs 3.0 and 7.0 respectively, currently clamped
>> + * at 1.0. Since the precision is 16bit, the user value
>> + * can be directly filled to register.
>> + * ToDo: Extend to max 7.0.
>> + */
>> +I915_WRITE(PRE_CSC_GAMC_DATA(pipe), lut[i].red);
>
>red? I would have gone for green.
Sure, will change it.
>> +}
>> +} else {
>> +/* load a linear table. */
>> +for (i = 0; i < lut_size; i++) {
>> +uint32_t v = (i * (1 << 16)) / (lut_size - 1);
>> +
>> +I915_WRITE(PRE_CSC_GAMC_DATA(pipe), v);
>> +}
>> +}
>> +
>> +/* Clamp values > 1.0. */
>> +while (i++ < 35)
>> +I915_WRITE(PRE_CSC_GAMC_DATA(pipe), (1 << 16));
>
>This is the glk+ degamma lut is it not? Why is this code pretending to be icl+
>only?
>
>IMO step 1 should be to just reuse the current glk code for icl.
>Which I think boils down to just setting the correct bit(s) in GAMMA_MODE.
>After
>that we can think of extending it to support user provided degamma.
>
>There is a bit of a problem with that on glk/cnl though since we don't have the
>output csc. Hence when the pipe csc is used we need to either reject gamma
>(which doesn't sound very prone to work with legacy userspace) or we program
>the degamma LUT with the data meant for the gamma LUT which has its own
>problems.
I feel there are lot of differences with GLK and Gen11+, hence keeping them
separate
looks better. Multi-segmented gamma is another addition along with output csc
on GEN11.
For GLK, if we have done linear blending we may not need de-gamma and use CSC
for any
range correction etc and then apply gamma to make it non-linear as per the
desired colorspace.
In case of non-linear input to pipe (this will mostly happen if we have single
non-linear
frame directly flipped to plane), degamma will be required to make it linear in
order to really do
accurate CSC operations. As of now, degamma for GLK is just a pass through
limiting this usecase.
AFAIK, the biggest
Re: [Intel-gfx] [v4 3/4] drm/i915/icl: Enable ICL Pipe CSC block
>-Original Message-
>From: Ville Syrjälä [mailto:ville.syrj...@linux.intel.com]
>Sent: Friday, December 21, 2018 11:02 PM
>To: Shankar, Uma
>Cc: intel-gfx@lists.freedesktop.org; Syrjala, Ville ;
>Lankhorst, Maarten
>Subject: Re: [Intel-gfx] [v4 3/4] drm/i915/icl: Enable ICL Pipe CSC block
>
>On Fri, Dec 21, 2018 at 01:29:40AM +0530, Uma Shankar wrote:
>> Enable ICL pipe csc hardware. CSC block is enabled in CSC_MODE
>> register instead of PLANE_COLOR_CTL.
>>
>> ToDO: Extend the ABI to accept 32 bit coefficient values instead of
>> 16bit for future platforms.
>>
>> v2: Addressed Maarten's review comments.
>>
>> v3: Addressed Matt's review comments. Removed rmw patterns as
>> suggested by Matt.
>>
>> v4: Addressed Matt's review comments.
>>
>> Signed-off-by: Uma Shankar
>> ---
>> drivers/gpu/drm/i915/i915_reg.h| 4 +++-
>> drivers/gpu/drm/i915/intel_color.c | 12 ++--
>> 2 files changed, 13 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h
>> b/drivers/gpu/drm/i915/i915_reg.h index 1852c33..565ef6a 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -9861,7 +9861,9 @@ enum skl_power_gate {
>> #define _PIPE_A_CSC_COEFF_RV_GV 0x49020
>> #define _PIPE_A_CSC_COEFF_BV0x49024
>> #define _PIPE_A_CSC_MODE0x49028
>> -#define CSC_BLACK_SCREEN_OFFSET (1 << 2)
>> +#define CSC_ENABLE(1 << 31)
>> +#define OUTPUT_CSC_ENABLE (1 << 30)
>> +#define CSC_BLACK_SCREEN_OFFSET (1 << 2)
>
>Bogus space->tab change.
>
>We should probably document which bit is for which platforms.
Will rectify this. Also prefix ICL for CSC and Output CSC fields since they
got introduced from Gen11 onwards.
>
>> #define CSC_POSITION_BEFORE_GAMMA (1 << 1)
>> #define CSC_MODE_YUV_TO_RGB (1 << 0)
>> #define _PIPE_A_CSC_PREOFF_HI 0x49030
>> diff --git a/drivers/gpu/drm/i915/intel_color.c
>> b/drivers/gpu/drm/i915/intel_color.c
>> index e72d8d6..d5b240c 100644
>> --- a/drivers/gpu/drm/i915/intel_color.c
>> +++ b/drivers/gpu/drm/i915/intel_color.c
>> @@ -134,7 +134,11 @@ static void ilk_load_ycbcr_conversion_matrix(struct
>intel_crtc *crtc)
>> I915_WRITE(PIPE_CSC_POSTOFF_HI(pipe), POSTOFF_RGB_TO_YUV_HI);
>> I915_WRITE(PIPE_CSC_POSTOFF_ME(pipe),
>POSTOFF_RGB_TO_YUV_ME);
>> I915_WRITE(PIPE_CSC_POSTOFF_LO(pipe), POSTOFF_RGB_TO_YUV_LO);
>> -I915_WRITE(PIPE_CSC_MODE(pipe), 0);
>> +
>> +if (INTEL_GEN(dev_priv) >= 10)
>
>11
Yeah, will correct this.
>> +I915_WRITE(PIPE_CSC_MODE(pipe), OUTPUT_CSC_ENABLE);
>> +else
>> +I915_WRITE(PIPE_CSC_MODE(pipe), 0);
>> }
>>
>> static void ilk_load_csc_matrix(struct intel_crtc_state *crtc_state)
>> @@ -242,7 +246,10 @@ static void ilk_load_csc_matrix(struct intel_crtc_state
>*crtc_state)
>> I915_WRITE(PIPE_CSC_POSTOFF_ME(pipe), postoff);
>> I915_WRITE(PIPE_CSC_POSTOFF_LO(pipe), postoff);
>>
>> -I915_WRITE(PIPE_CSC_MODE(pipe), 0);
>> +if (INTEL_GEN(dev_priv) >= 10)
>
>11
Will update. Thanks Ville for your comments.
Regards,
Uma Shankar
>
>> +I915_WRITE(PIPE_CSC_MODE(pipe), CSC_ENABLE);
>> +else
>> +I915_WRITE(PIPE_CSC_MODE(pipe), 0);
>> } else {
>> uint32_t mode = CSC_MODE_YUV_TO_RGB;
>>
>> @@ -715,6 +722,7 @@ void intel_color_init(struct intel_crtc *crtc)
>> dev_priv->display.load_csc_matrix = ilk_load_csc_matrix;
>> dev_priv->display.load_luts = glk_load_luts;
>> } else if (IS_ICELAKE(dev_priv)) {
>> +dev_priv->display.load_csc_matrix = ilk_load_csc_matrix;
>> dev_priv->display.load_luts = icl_load_luts;
>> } else {
>> dev_priv->display.load_luts = i9xx_load_luts;
>> --
>> 1.9.1
>>
>> ___
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>--
>Ville Syrjälä
>Intel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Remove debugfs/i915_ppgtt_info
== Series Details ==
Series: drm/i915: Remove debugfs/i915_ppgtt_info
URL : https://patchwork.freedesktop.org/series/54493/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5342_full -> Patchwork_11154_full
Summary
---
**SUCCESS**
No regressions found.
Known issues
Here are the changes found in Patchwork_11154_full that come from known
issues:
### IGT changes ###
Issues hit
* igt@gem_cpu_reloc@full:
- shard-skl: NOTRUN -> TIMEOUT [fdo#108248]
* igt@gem_workarounds@suspend-resume-fd:
- shard-skl: PASS -> INCOMPLETE [fdo#104108] / [fdo#107773]
* igt@i915_selftest@live_workarounds:
- shard-iclb: PASS -> DMESG-FAIL [fdo#108954]
* igt@kms_busy@extended-modeset-hang-newfb-render-a:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#107956] +3
* igt@kms_busy@extended-pageflip-hang-newfb-render-c:
- shard-glk: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_color@pipe-a-ctm-max:
- shard-apl: PASS -> FAIL [fdo#108147]
* igt@kms_color@pipe-a-ctm-negative:
- shard-skl: PASS -> FAIL [fdo#107361]
* igt@kms_cursor_crc@cursor-128x128-offscreen:
- shard-skl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-128x42-random:
- shard-iclb: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-256x256-dpms:
- shard-glk: PASS -> FAIL [fdo#103232] +2
* igt@kms_cursor_crc@cursor-256x256-sliding:
- shard-skl: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-64x64-random:
- shard-apl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-skl: PASS -> INCOMPLETE [fdo#104108]
- shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232]
* igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy:
- shard-glk: PASS -> FAIL [fdo#104873]
* igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size:
- shard-iclb: PASS -> FAIL [fdo#103355]
* igt@kms_fbcon_fbt@psr:
- shard-skl: NOTRUN -> FAIL [fdo#107882]
* igt@kms_flip@flip-vs-modeset-vs-hang:
- shard-apl: PASS -> INCOMPLETE [fdo#103927]
* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: PASS -> FAIL [fdo#100368]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
- shard-apl: PASS -> FAIL [fdo#103167] +4
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-mmap-cpu:
- shard-glk: PASS -> FAIL [fdo#103167] +4
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render:
- shard-iclb: PASS -> FAIL [fdo#103167]
* igt@kms_panel_fitting@legacy:
- shard-skl: NOTRUN -> FAIL [fdo#105456]
* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- shard-skl: NOTRUN -> FAIL [fdo#107362]
* igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#106885]
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: PASS -> FAIL [fdo#103166]
* igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
- shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: PASS -> FAIL [fdo#107815]
* igt@kms_plane_multiple@atomic-pipe-b-tiling-x:
- shard-skl: NOTRUN -> FAIL [fdo#103166] / [fdo#107815]
* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-iclb: PASS -> FAIL [fdo#103166]
* igt@kms_plane_multiple@atomic-pipe-b-tiling-yf:
- shard-glk: PASS -> FAIL [fdo#103166]
* igt@kms_psr@no_drrs:
- shard-iclb: PASS -> FAIL [fdo#108341]
* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-kbl: PASS -> DMESG-FAIL [fdo#108950]
* igt@pm_rpm@basic-rte:
- shard-iclb: PASS -> DMESG-WARN [fdo#108654]
* igt@pm_rpm@gem-execbuf-stress-pc8:
- shard-iclb: SKIP -> INCOMPLETE [fdo#107713] / [fdo#108840]
* {igt@runner@aborted}:
- shard-iclb: NOTRUN -> FAIL [fdo#108866]
Possible fixes
* igt@gem_exec_blt@cold-max:
- shard-glk: DMESG-WARN [fdo#105763] / [fdo#106538] -> PASS
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-apl: DMESG-WARN [fdo#107956] -> PASS
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
- shard-glk: FAIL [fdo#108145] -> PASS
* igt@kms_color@pipe-a-degamma:
- shard-apl: FAIL [fdo#104782] / [fdo#108145] -> PASS
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-skl: INCOMPLETE [fdo#104108] -> PASS
* igt@kms_cursor_crc@cursor-128x42-onscreen:
- shard-apl: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-256x85-sliding:
- shard-glk: FAIL [fdo#103232]
[Intel-gfx] [PATCH 0/6] drm/i915: drmP.h include removal w/ drm prep work
First make some drm headers self-contained, removing the implicit dependency on a previous drmP.h include. Then remove all drmP.h includes from drm/i915. Inspired by Sam's series [1]. Theres a one line trivial conflict between that one and this series in drm_file.h (patch 3), but I'm keeping this series self-contained. Should be easy enough to resolve. I'm fine with merging the first 5 through either drm-misc or drm-intel, but I'd rather merge the last one through drm-intel. BR, Jani. Cc: Sam Ravnborg Cc: Daniel Vetter Cc: Laurent Pinchart Jani Nikula (6): drm: include drm_device.h from drm_legacy.h drm: include kernel.h and agp_backend.h from intel-gtt.h drm: include idr.h from drm_file.h drm: include types.h from drm_hdcp.h drm: include drm_file.h from drm_syncobj.h drm/i915: drop all drmP.h includes drivers/gpu/drm/i915/dvo.h | 1 - drivers/gpu/drm/i915/i915_drv.c| 1 - drivers/gpu/drm/i915/i915_drv.h| 2 +- drivers/gpu/drm/i915/i915_gem.c| 1 - drivers/gpu/drm/i915/i915_gem_context.c| 1 - drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 - drivers/gpu/drm/i915/i915_gem_evict.c | 1 - drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 - drivers/gpu/drm/i915/i915_gem_fence_reg.c | 1 - drivers/gpu/drm/i915/i915_gem_gtt.c| 1 - drivers/gpu/drm/i915/i915_gem_internal.c | 1 - drivers/gpu/drm/i915/i915_gem_object.h | 3 ++- drivers/gpu/drm/i915/i915_gem_shrinker.c | 1 - drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - drivers/gpu/drm/i915/i915_gem_tiling.c | 1 - drivers/gpu/drm/i915/i915_gem_userptr.c| 1 - drivers/gpu/drm/i915/i915_ioc32.c | 1 - drivers/gpu/drm/i915/i915_irq.c| 1 - drivers/gpu/drm/i915/i915_suspend.c| 1 - drivers/gpu/drm/i915/i915_trace.h | 1 - drivers/gpu/drm/i915/intel_acpi.c | 1 - drivers/gpu/drm/i915/intel_atomic.c| 1 - drivers/gpu/drm/i915/intel_atomic_plane.c | 1 - drivers/gpu/drm/i915/intel_audio.c | 1 - drivers/gpu/drm/i915/intel_bios.c | 1 - drivers/gpu/drm/i915/intel_connector.c | 1 - drivers/gpu/drm/i915/intel_crt.c | 1 - drivers/gpu/drm/i915/intel_display.c | 1 - drivers/gpu/drm/i915/intel_dp.c| 1 - drivers/gpu/drm/i915/intel_dp_mst.c| 1 - drivers/gpu/drm/i915/intel_dsi.h | 1 - drivers/gpu/drm/i915/intel_dsi_vbt.c | 1 - drivers/gpu/drm/i915/intel_dvo.c | 1 - drivers/gpu/drm/i915/intel_fbdev.c | 1 - drivers/gpu/drm/i915/intel_frontbuffer.c | 1 - drivers/gpu/drm/i915/intel_hdcp.c | 1 - drivers/gpu/drm/i915/intel_hdmi.c | 1 - drivers/gpu/drm/i915/intel_hotplug.c | 1 - drivers/gpu/drm/i915/intel_i2c.c | 1 - drivers/gpu/drm/i915/intel_lrc.c | 1 - drivers/gpu/drm/i915/intel_lvds.c | 1 - drivers/gpu/drm/i915/intel_mocs.h | 1 - drivers/gpu/drm/i915/intel_opregion.c | 1 - drivers/gpu/drm/i915/intel_overlay.c | 1 - drivers/gpu/drm/i915/intel_psr.c | 1 - drivers/gpu/drm/i915/intel_ringbuffer.c| 1 - drivers/gpu/drm/i915/intel_sdvo.c | 1 - drivers/gpu/drm/i915/intel_sprite.c| 1 - drivers/gpu/drm/i915/intel_tv.c| 1 - drivers/gpu/drm/i915/intel_vdsc.c | 1 - drivers/gpu/drm/i915/vlv_dsi.c | 1 - include/drm/drm_file.h | 1 + include/drm/drm_hdcp.h | 2 ++ include/drm/drm_legacy.h | 1 + include/drm/drm_syncobj.h | 4 +++- include/drm/intel-gtt.h| 3 +++ 56 files changed, 13 insertions(+), 52 deletions(-) -- 2.11.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 3/6] drm: include idr.h from drm_file.h
Make it easier to drop drmP.h includes. Cc: Sam Ravnborg Cc: Daniel Vetter Cc: Laurent Pinchart Signed-off-by: Jani Nikula --- include/drm/drm_file.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index 84ac79219e4c..6710b612e2f6 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -32,6 +32,7 @@ #include #include +#include #include -- 2.11.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 5/6] drm: include drm_file.h from drm_syncobj.h
Make it easier to drop drmP.h includes. Switch from "" to <> includes while at it. Cc: Sam Ravnborg Cc: Daniel Vetter Cc: Laurent Pinchart Signed-off-by: Jani Nikula --- include/drm/drm_syncobj.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 7c6ed845c70d..93884da3f9fe 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -26,7 +26,9 @@ #ifndef __DRM_SYNCOBJ_H__ #define __DRM_SYNCOBJ_H__ -#include "linux/dma-fence.h" +#include + +#include /** * struct drm_syncobj - sync object. -- 2.11.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 6/6] drm/i915: drop all drmP.h includes
Needs just a few additional includes here and there. Cc: Sam Ravnborg Cc: Daniel Vetter Cc: Laurent Pinchart Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/dvo.h | 1 - drivers/gpu/drm/i915/i915_drv.c| 1 - drivers/gpu/drm/i915/i915_drv.h| 2 +- drivers/gpu/drm/i915/i915_gem.c| 1 - drivers/gpu/drm/i915/i915_gem_context.c| 1 - drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 - drivers/gpu/drm/i915/i915_gem_evict.c | 1 - drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 - drivers/gpu/drm/i915/i915_gem_fence_reg.c | 1 - drivers/gpu/drm/i915/i915_gem_gtt.c| 1 - drivers/gpu/drm/i915/i915_gem_internal.c | 1 - drivers/gpu/drm/i915/i915_gem_object.h | 3 ++- drivers/gpu/drm/i915/i915_gem_shrinker.c | 1 - drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - drivers/gpu/drm/i915/i915_gem_tiling.c | 1 - drivers/gpu/drm/i915/i915_gem_userptr.c| 1 - drivers/gpu/drm/i915/i915_ioc32.c | 1 - drivers/gpu/drm/i915/i915_irq.c| 1 - drivers/gpu/drm/i915/i915_suspend.c| 1 - drivers/gpu/drm/i915/i915_trace.h | 1 - drivers/gpu/drm/i915/intel_acpi.c | 1 - drivers/gpu/drm/i915/intel_atomic.c| 1 - drivers/gpu/drm/i915/intel_atomic_plane.c | 1 - drivers/gpu/drm/i915/intel_audio.c | 1 - drivers/gpu/drm/i915/intel_bios.c | 1 - drivers/gpu/drm/i915/intel_connector.c | 1 - drivers/gpu/drm/i915/intel_crt.c | 1 - drivers/gpu/drm/i915/intel_display.c | 1 - drivers/gpu/drm/i915/intel_dp.c| 1 - drivers/gpu/drm/i915/intel_dp_mst.c| 1 - drivers/gpu/drm/i915/intel_dsi.h | 1 - drivers/gpu/drm/i915/intel_dsi_vbt.c | 1 - drivers/gpu/drm/i915/intel_dvo.c | 1 - drivers/gpu/drm/i915/intel_fbdev.c | 1 - drivers/gpu/drm/i915/intel_frontbuffer.c | 1 - drivers/gpu/drm/i915/intel_hdcp.c | 1 - drivers/gpu/drm/i915/intel_hdmi.c | 1 - drivers/gpu/drm/i915/intel_hotplug.c | 1 - drivers/gpu/drm/i915/intel_i2c.c | 1 - drivers/gpu/drm/i915/intel_lrc.c | 1 - drivers/gpu/drm/i915/intel_lvds.c | 1 - drivers/gpu/drm/i915/intel_mocs.h | 1 - drivers/gpu/drm/i915/intel_opregion.c | 1 - drivers/gpu/drm/i915/intel_overlay.c | 1 - drivers/gpu/drm/i915/intel_psr.c | 1 - drivers/gpu/drm/i915/intel_ringbuffer.c| 1 - drivers/gpu/drm/i915/intel_sdvo.c | 1 - drivers/gpu/drm/i915/intel_sprite.c| 1 - drivers/gpu/drm/i915/intel_tv.c| 1 - drivers/gpu/drm/i915/intel_vdsc.c | 1 - drivers/gpu/drm/i915/vlv_dsi.c | 1 - 51 files changed, 3 insertions(+), 51 deletions(-) diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h index 5e6a3013da49..16e0345b711f 100644 --- a/drivers/gpu/drm/i915/dvo.h +++ b/drivers/gpu/drm/i915/dvo.h @@ -24,7 +24,6 @@ #define _INTEL_DVO_H #include -#include #include #include "intel_drv.h" diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index caa055ac9472..88b72a8e350f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -41,7 +41,6 @@ #include #include -#include #include #include #include diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d44255a8655e..c314eb4cda07 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -46,7 +46,6 @@ #include #include -#include #include #include /* for struct drm_dma_handle */ #include @@ -54,6 +53,7 @@ #include #include #include +#include #include "i915_fixed.h" #include "i915_params.h" diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d92147ab4489..da59b4211150 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -25,7 +25,6 @@ * */ -#include #include #include #include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 5905b6d8f291..5933adbe3d99 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -86,7 +86,6 @@ */ #include -#include #include #include "i915_drv.h" #include "i915_trace.h" diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index 82e2ca17a441..02f7298bfe57 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -27,7 +27,6 @@ #include #include -#include #include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 02b83a5ed96c..f6855401f247 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c @@ -26,7 +26,6 @@ * */ -#include #include #include "i915_drv.h" diff --git
[Intel-gfx] [PATCH 4/6] drm: include types.h from drm_hdcp.h
Make it easier to drop drmP.h includes. Cc: Sam Ravnborg Cc: Daniel Vetter Cc: Laurent Pinchart Signed-off-by: Jani Nikula --- include/drm/drm_hdcp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h index a6de09c5e47f..d6dfef8cff6a 100644 --- a/include/drm/drm_hdcp.h +++ b/include/drm/drm_hdcp.h @@ -9,6 +9,8 @@ #ifndef _DRM_HDCP_H_INCLUDED_ #define _DRM_HDCP_H_INCLUDED_ +#include + /* Period of hdcp checks (to ensure we're still authenticated) */ #define DRM_HDCP_CHECK_PERIOD_MS (128 * 16) -- 2.11.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH 1/6] drm: include drm_device.h from drm_legacy.h
Make it easier to drop drmP.h includes. Cc: Sam Ravnborg Cc: Daniel Vetter Cc: Laurent Pinchart Signed-off-by: Jani Nikula --- include/drm/drm_legacy.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 8fad66f88e4f..743d7e70c896 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -2,6 +2,7 @@ #define __DRM_DRM_LEGACY_H__ #include +#include /* * Legacy driver interfaces for the Direct Rendering Manager -- 2.11.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v4 2/4] drm/i915/icl: Add icl pipe degamma and gamma support
>-Original Message-
>From: Roper, Matthew D
>Sent: Friday, December 21, 2018 6:54 AM
>To: Shankar, Uma
>Cc: intel-gfx@lists.freedesktop.org; Lankhorst, Maarten
>; Syrjala, Ville ;
>Sharma,
>Shashank
>Subject: Re: [v4 2/4] drm/i915/icl: Add icl pipe degamma and gamma support
>
>On Fri, Dec 21, 2018 at 01:29:39AM +0530, Uma Shankar wrote:
>> Add support for icl pipe degamma and gamma.
>>
>> v2: Removed a POSTING_READ and corrected the Bit Definition as per
>> Maarten's comments.
>>
>> v3: Addressed Matt's review comments. Removed rmw patterns as
>> suggested by Matt.
>>
>> v4: Fixed Matt's review comments.
>>
>> Signed-off-by: Uma Shankar
>> ---
>> drivers/gpu/drm/i915/i915_reg.h| 3 ++
>> drivers/gpu/drm/i915/intel_color.c | 67
>> ++
>> 2 files changed, 70 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h
>> b/drivers/gpu/drm/i915/i915_reg.h index 02af9b5..1852c33 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -7092,6 +7092,9 @@ enum {
>> #define GAMMA_MODE_MODE_12BIT (2 << 0)
>> #define GAMMA_MODE_MODE_SPLIT (3 << 0)
>>
>> +#define PRE_CSC_GAMMA_ENABLE(1 << 31)
>> +#define POST_CSC_GAMMA_ENABLE (1 << 30)
>> +
>> /* DMC/CSR */
>> #define CSR_PROGRAM(i) _MMIO(0x8 + (i) * 4)
>> #define CSR_SSP_BASE_ADDR_GEN9 0x2FC0
>> diff --git a/drivers/gpu/drm/i915/intel_color.c
>> b/drivers/gpu/drm/i915/intel_color.c
>> index f32e4a7..e72d8d6 100644
>> --- a/drivers/gpu/drm/i915/intel_color.c
>> +++ b/drivers/gpu/drm/i915/intel_color.c
>> @@ -534,6 +534,71 @@ static void glk_load_luts(struct intel_crtc_state
>*crtc_state)
>> POSTING_READ(GAMMA_MODE(pipe));
>> }
>>
>> +static void icl_load_degamma_lut(struct intel_crtc_state *crtc_state)
>> +{
>> +struct drm_device *dev = crtc_state->base.crtc->dev;
>> +struct drm_i915_private *dev_priv = to_i915(dev);
>> +enum pipe pipe = to_intel_crtc(crtc_state->base.crtc)->pipe;
>> +const uint32_t lut_size = INTEL_INFO(dev_priv)-
>>color.degamma_lut_size;
>> +uint32_t i;
>> +
>> +/*
>> + * When setting the auto-increment bit, the hardware seems to
>> + * ignore the index bits, so we need to reset it to index 0
>> + * separately.
>> + */
>> +I915_WRITE(PRE_CSC_GAMC_INDEX(pipe), 0);
>> +I915_WRITE(PRE_CSC_GAMC_INDEX(pipe),
>PRE_CSC_GAMC_AUTO_INCREMENT);
>> +
>> +if (crtc_state->base.degamma_lut) {
>> +struct drm_color_lut *lut = crtc_state->base.degamma_lut-
>>data;
>> +
>> +for (i = 0; i < lut_size; i++) {
>> +/*
>> + * First 33 entries represent range from 0 to 1.0
>> + * 34th and 35th entry will represent extended range
>> + * inputs 3.0 and 7.0 respectively, currently clamped
>> + * at 1.0. Since the precision is 16bit, the user value
>> + * can be directly filled to register.
>> + * ToDo: Extend to max 7.0.
>> + */
>> +I915_WRITE(PRE_CSC_GAMC_DATA(pipe), lut[i].red);
>
>Since 1.0 = 0x100, should we scale this by (0x100 / 0xFF) until we have the
>newer
>segmented gamma ABI you're working on?
One clarification here, 1.0 is actually 0x1 (since its 3.16
representation), so we should scale it
up by 0x1/0x isn't it ? Not sure if I am missing something.
Also is scaling really a good idea. For values less than 1.0 16bit user input
will be accurate and we can
program exactly what user wants to hardware. Problem is only for value of 1.0,
making every other value
different may not be a good idea. What do you recommend ?
>> +}
>> +} else {
>> +/* load a linear table. */
>> +for (i = 0; i < lut_size; i++) {
>> +uint32_t v = (i * (1 << 16)) / (lut_size - 1);
>> +
>> +I915_WRITE(PRE_CSC_GAMC_DATA(pipe), v);
>> +}
>> +}
>> +
>> +/* Clamp values > 1.0. */
>> +while (i++ < 35)
>> +I915_WRITE(PRE_CSC_GAMC_DATA(pipe), (1 << 16)); }
>> +
>> +static void icl_load_luts(struct intel_crtc_state *crtc_state) {
>> +struct drm_crtc *crtc = crtc_state->base.crtc;
>> +struct drm_device *dev = crtc_state->base.crtc->dev;
>> +struct drm_i915_private *dev_priv = to_i915(dev);
>> +enum pipe pipe = to_intel_crtc(crtc)->pipe;
>> +u32 gamma_mode = 0;
>> +
>> +if (crtc_state_is_legacy_gamma(crtc_state)) {
>> +haswell_load_luts(crtc_state);
>> +return;
>> +}
>> +
>> +icl_load_degamma_lut(crtc_state);
>> +bdw_load_gamma_lut(crtc_state, 0);
>> +
>> +gamma_mode = GAMMA_MODE_MODE_10BIT |
>PRE_CSC_GAMMA_ENABLE
>> +| POST_CSC_GAMMA_ENABLE;
>> +I915_WRITE(GAMMA_MODE(pipe), gamma_mode);
>
>We might as well just stick these constants right in the I915_WRITE call; no
>need
>to
Re: [Intel-gfx] [PATCH 0/6] drm/i915: drmP.h include removal w/ drm prep work
On Thu, 27 Dec 2018, Jani Nikula wrote: > First make some drm headers self-contained, removing the implicit > dependency on a previous drmP.h include. Then remove all drmP.h includes > from drm/i915. > > Inspired by Sam's series [1]. Theres a one line trivial conflict between > that one and this series in drm_file.h (patch 3), but I'm keeping this > series self-contained. Should be easy enough to resolve. [1] https://patchwork.freedesktop.org/series/54464/ > > I'm fine with merging the first 5 through either drm-misc or drm-intel, > but I'd rather merge the last one through drm-intel. > > BR, > Jani. > > Cc: Sam Ravnborg > Cc: Daniel Vetter > Cc: Laurent Pinchart > > > Jani Nikula (6): > drm: include drm_device.h from drm_legacy.h > drm: include kernel.h and agp_backend.h from intel-gtt.h > drm: include idr.h from drm_file.h > drm: include types.h from drm_hdcp.h > drm: include drm_file.h from drm_syncobj.h > drm/i915: drop all drmP.h includes > > drivers/gpu/drm/i915/dvo.h | 1 - > drivers/gpu/drm/i915/i915_drv.c| 1 - > drivers/gpu/drm/i915/i915_drv.h| 2 +- > drivers/gpu/drm/i915/i915_gem.c| 1 - > drivers/gpu/drm/i915/i915_gem_context.c| 1 - > drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 - > drivers/gpu/drm/i915/i915_gem_evict.c | 1 - > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 - > drivers/gpu/drm/i915/i915_gem_fence_reg.c | 1 - > drivers/gpu/drm/i915/i915_gem_gtt.c| 1 - > drivers/gpu/drm/i915/i915_gem_internal.c | 1 - > drivers/gpu/drm/i915/i915_gem_object.h | 3 ++- > drivers/gpu/drm/i915/i915_gem_shrinker.c | 1 - > drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - > drivers/gpu/drm/i915/i915_gem_tiling.c | 1 - > drivers/gpu/drm/i915/i915_gem_userptr.c| 1 - > drivers/gpu/drm/i915/i915_ioc32.c | 1 - > drivers/gpu/drm/i915/i915_irq.c| 1 - > drivers/gpu/drm/i915/i915_suspend.c| 1 - > drivers/gpu/drm/i915/i915_trace.h | 1 - > drivers/gpu/drm/i915/intel_acpi.c | 1 - > drivers/gpu/drm/i915/intel_atomic.c| 1 - > drivers/gpu/drm/i915/intel_atomic_plane.c | 1 - > drivers/gpu/drm/i915/intel_audio.c | 1 - > drivers/gpu/drm/i915/intel_bios.c | 1 - > drivers/gpu/drm/i915/intel_connector.c | 1 - > drivers/gpu/drm/i915/intel_crt.c | 1 - > drivers/gpu/drm/i915/intel_display.c | 1 - > drivers/gpu/drm/i915/intel_dp.c| 1 - > drivers/gpu/drm/i915/intel_dp_mst.c| 1 - > drivers/gpu/drm/i915/intel_dsi.h | 1 - > drivers/gpu/drm/i915/intel_dsi_vbt.c | 1 - > drivers/gpu/drm/i915/intel_dvo.c | 1 - > drivers/gpu/drm/i915/intel_fbdev.c | 1 - > drivers/gpu/drm/i915/intel_frontbuffer.c | 1 - > drivers/gpu/drm/i915/intel_hdcp.c | 1 - > drivers/gpu/drm/i915/intel_hdmi.c | 1 - > drivers/gpu/drm/i915/intel_hotplug.c | 1 - > drivers/gpu/drm/i915/intel_i2c.c | 1 - > drivers/gpu/drm/i915/intel_lrc.c | 1 - > drivers/gpu/drm/i915/intel_lvds.c | 1 - > drivers/gpu/drm/i915/intel_mocs.h | 1 - > drivers/gpu/drm/i915/intel_opregion.c | 1 - > drivers/gpu/drm/i915/intel_overlay.c | 1 - > drivers/gpu/drm/i915/intel_psr.c | 1 - > drivers/gpu/drm/i915/intel_ringbuffer.c| 1 - > drivers/gpu/drm/i915/intel_sdvo.c | 1 - > drivers/gpu/drm/i915/intel_sprite.c| 1 - > drivers/gpu/drm/i915/intel_tv.c| 1 - > drivers/gpu/drm/i915/intel_vdsc.c | 1 - > drivers/gpu/drm/i915/vlv_dsi.c | 1 - > include/drm/drm_file.h | 1 + > include/drm/drm_hdcp.h | 2 ++ > include/drm/drm_legacy.h | 1 + > include/drm/drm_syncobj.h | 4 +++- > include/drm/intel-gtt.h| 3 +++ > 56 files changed, 13 insertions(+), 52 deletions(-) -- Jani Nikula, Intel Open Source Graphics Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Remove debugfs/i915_ppgtt_info
== Series Details ==
Series: drm/i915: Remove debugfs/i915_ppgtt_info
URL : https://patchwork.freedesktop.org/series/54493/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5342 -> Patchwork_11154
Summary
---
**SUCCESS**
No regressions found.
External URL:
https://patchwork.freedesktop.org/api/1.0/series/54493/revisions/1/mbox/
Known issues
Here are the changes found in Patchwork_11154 that come from known issues:
### IGT changes ###
Issues hit
* igt@gem_close_race@basic-threads:
- fi-bsw-kefka: PASS -> FAIL [fdo#108656]
* igt@gem_exec_suspend@basic-s3:
- fi-skl-6700hq: PASS -> FAIL [fdo#103375]
* igt@i915_selftest@live_hangcheck:
- fi-bwr-2160:PASS -> DMESG-FAIL [fdo#108735]
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: PASS -> DMESG-WARN [fdo#102614]
* {igt@runner@aborted}:
- fi-icl-y: NOTRUN -> FAIL [fdo#108915]
Possible fixes
* igt@i915_selftest@live_contexts:
- fi-bsw-kefka: DMESG-FAIL [fdo#108626] / [fdo#108656] -> PASS
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#108622] -> PASS
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: FAIL [fdo#108767] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-cfl-8109u: INCOMPLETE [fdo#106070] / [fdo#108126] -> PASS
Warnings
* igt@i915_selftest@live_contexts:
- fi-icl-u3: INCOMPLETE [fdo#108315] -> DMESG-FAIL [fdo#108569]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#106070]: https://bugs.freedesktop.org/show_bug.cgi?id=106070
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#108126]: https://bugs.freedesktop.org/show_bug.cgi?id=108126
[fdo#108315]: https://bugs.freedesktop.org/show_bug.cgi?id=108315
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#108626]: https://bugs.freedesktop.org/show_bug.cgi?id=108626
[fdo#108656]: https://bugs.freedesktop.org/show_bug.cgi?id=108656
[fdo#108735]: https://bugs.freedesktop.org/show_bug.cgi?id=108735
[fdo#108767]: https://bugs.freedesktop.org/show_bug.cgi?id=108767
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
Participating hosts (47 -> 43)
--
Additional (1): fi-icl-y
Missing(5): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
fi-ctg-p8600
Build changes
-
* Linux: CI_DRM_5342 -> Patchwork_11154
CI_DRM_5342: 28bb1fc015cedadf3b099b8bd0bb27609849f362 @
git://anongit.freedesktop.org/gfx-ci/linux
IGT_4753: 0bc683ea2dcf270b5287ffb4a6510fdff44e9390 @
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11154: 0823ed232f44f4613554708d9787e1e76f5f4793 @
git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0823ed232f44 drm/i915: Remove debugfs/i915_ppgtt_info
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11154/
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✓ Fi.CI.IGT: success for drm/intel_dsi_vbt: Remove duplicate header
== Series Details == Series: drm/intel_dsi_vbt: Remove duplicate header URL : https://patchwork.freedesktop.org/series/54472/ State : success == Summary == CI Bug Log - changes from CI_DRM_5342_full -> Patchwork_11153_full Summary --- **SUCCESS** No regressions found. Known issues Here are the changes found in Patchwork_11153_full that come from known issues: ### IGT changes ### Issues hit * igt@gem_cpu_reloc@full: - shard-skl: NOTRUN -> TIMEOUT [fdo#108248] * igt@gem_eio@in-flight-suspend: - shard-skl: PASS -> INCOMPLETE [fdo#104108] / [fdo#107773] * igt@gem_pwrite_pread@snooped-pwrite-blt-cpu_mmap-performance: - shard-snb: PASS -> INCOMPLETE [fdo#105411] * igt@gem_softpin@noreloc-s3: - shard-kbl: PASS -> DMESG-WARN [fdo#103313] * igt@i915_suspend@sysfs-reader: - shard-skl: NOTRUN -> INCOMPLETE [fdo#104108] * igt@kms_busy@extended-modeset-hang-newfb-render-b: - shard-skl: NOTRUN -> DMESG-WARN [fdo#107956] +1 * igt@kms_busy@extended-pageflip-hang-newfb-render-c: - shard-glk: PASS -> DMESG-WARN [fdo#107956] * igt@kms_color@pipe-a-ctm-0-25: - shard-kbl: PASS -> DMESG-WARN [fdo#103558] / [fdo#105602] +28 - shard-skl: PASS -> FAIL [fdo#108682] * igt@kms_color@pipe-a-ctm-negative: - shard-skl: PASS -> FAIL [fdo#107361] * igt@kms_cursor_crc@cursor-128x128-offscreen: - shard-skl: PASS -> FAIL [fdo#103232] * igt@kms_cursor_crc@cursor-128x42-random: - shard-iclb: NOTRUN -> FAIL [fdo#103232] * igt@kms_cursor_crc@cursor-256x256-sliding: - shard-skl: NOTRUN -> FAIL [fdo#103232] * igt@kms_cursor_crc@cursor-64x21-sliding: - shard-apl: PASS -> FAIL [fdo#103232] +2 * igt@kms_cursor_crc@cursor-64x64-suspend: - shard-glk: PASS -> FAIL [fdo#103232] +1 - shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-wc: - shard-skl: PASS -> FAIL [fdo#105682] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt: - shard-apl: PASS -> FAIL [fdo#103167] +5 * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-onoff: - shard-glk: PASS -> FAIL [fdo#103167] * igt@kms_frontbuffer_tracking@fbc-stridechange: - shard-skl: NOTRUN -> FAIL [fdo#105683] * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-pwrite: - shard-iclb: PASS -> FAIL [fdo#103167] * igt@kms_panel_fitting@legacy: - shard-skl: NOTRUN -> FAIL [fdo#105456] * igt@kms_pipe_crc_basic@read-crc-pipe-c: - shard-skl: NOTRUN -> FAIL [fdo#107362] * igt@kms_plane@pixel-format-pipe-a-planes-source-clamping: - shard-skl: NOTRUN -> DMESG-WARN [fdo#106885] * igt@kms_plane@pixel-format-pipe-c-planes-source-clamping: - shard-kbl: PASS -> DMESG-WARN [fdo#103313] / [fdo#105345] * igt@kms_plane@plane-panning-bottom-right-pipe-a-planes: - shard-skl: PASS -> FAIL [fdo#103166] * igt@kms_plane_alpha_blend@pipe-c-alpha-7efc: - shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145] * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: PASS -> FAIL [fdo#107815] * igt@kms_plane_multiple@atomic-pipe-b-tiling-x: - shard-skl: NOTRUN -> FAIL [fdo#103166] / [fdo#107815] * igt@kms_plane_multiple@atomic-pipe-b-tiling-y: - shard-iclb: PASS -> FAIL [fdo#103166] +1 * igt@kms_plane_multiple@atomic-pipe-c-tiling-yf: - shard-apl: PASS -> FAIL [fdo#103166] +2 * igt@kms_plane_scaling@pipe-a-scaler-with-rotation: - shard-iclb: PASS -> DMESG-WARN [fdo#107724] * igt@kms_rotation_crc@multiplane-rotation-cropping-top: - shard-glk: PASS -> DMESG-FAIL [fdo#105763] / [fdo#106538] * igt@pm_rpm@cursor: - shard-iclb: PASS -> INCOMPLETE [fdo#108840] * igt@pm_rpm@modeset-non-lpsp-stress-no-wait: - shard-iclb: SKIP -> INCOMPLETE [fdo#108840] Possible fixes * igt@gem_exec_blt@cold-max: - shard-glk: DMESG-WARN [fdo#105763] / [fdo#106538] -> PASS * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a: - shard-hsw: DMESG-WARN [fdo#107956] -> PASS * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a: - shard-kbl: DMESG-WARN [fdo#107956] -> PASS * igt@kms_color@pipe-a-degamma: - shard-apl: FAIL [fdo#104782] / [fdo#108145] -> PASS * igt@kms_cursor_crc@cursor-128x128-suspend: - shard-skl: INCOMPLETE [fdo#104108] -> PASS * igt@kms_cursor_crc@cursor-128x42-onscreen: - shard-apl: FAIL [fdo#103232] -> PASS +1 * igt@kms_cursor_crc@cursor-256x85-sliding: - shard-glk:
[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Remove debugfs/i915_ppgtt_info
== Series Details == Series: drm/i915: Remove debugfs/i915_ppgtt_info URL : https://patchwork.freedesktop.org/series/54493/ State : warning == Summary == $ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: Remove debugfs/i915_ppgtt_info -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1501:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1501:9: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1511:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1511:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1557:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/i915_gem_gtt.c:1557:17: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_gem_gtt.c:348:14: warning: expression using sizeof(void) -drivers/gpu/drm/i915/i915_gem_gtt.c:348:14: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:348:14: warning: expression using sizeof(void) +drivers/gpu/drm/i915/i915_gem_gtt.c:348:14: warning: expression using sizeof(void) ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [CI] drm/i915: Remove debugfs/i915_ppgtt_info
The information presented here is not relevant to current development.
We can either use the context information, but more often we want to
inspect the active gpu state.
The ulterior motive is to eradicate dev->filelist.
Signed-off-by: Chris Wilson
Reviewed-by: Tvrtko Ursulin
---
drivers/gpu/drm/i915/i915_debugfs.c | 119
drivers/gpu/drm/i915/i915_gem_gtt.c | 134
drivers/gpu/drm/i915/i915_gem_gtt.h | 2 -
3 files changed, 255 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
b/drivers/gpu/drm/i915/i915_debugfs.c
index aca26a25ed50..2d29ce630c0e 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2076,124 +2076,6 @@ static int i915_swizzle_info(struct seq_file *m, void
*data)
return 0;
}
-static int per_file_ctx(int id, void *ptr, void *data)
-{
- struct i915_gem_context *ctx = ptr;
- struct seq_file *m = data;
- struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
-
- if (!ppgtt) {
- seq_printf(m, " no ppgtt for context %d\n",
- ctx->user_handle);
- return 0;
- }
-
- if (i915_gem_context_is_default(ctx))
- seq_puts(m, " default context:\n");
- else
- seq_printf(m, " context %d:\n", ctx->user_handle);
- ppgtt->debug_dump(ppgtt, m);
-
- return 0;
-}
-
-static void gen8_ppgtt_info(struct seq_file *m,
- struct drm_i915_private *dev_priv)
-{
- struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
- struct intel_engine_cs *engine;
- enum intel_engine_id id;
- int i;
-
- if (!ppgtt)
- return;
-
- for_each_engine(engine, dev_priv, id) {
- seq_printf(m, "%s\n", engine->name);
- for (i = 0; i < 4; i++) {
- u64 pdp = I915_READ(GEN8_RING_PDP_UDW(engine, i));
- pdp <<= 32;
- pdp |= I915_READ(GEN8_RING_PDP_LDW(engine, i));
- seq_printf(m, "\tPDP%d 0x%016llx\n", i, pdp);
- }
- }
-}
-
-static void gen6_ppgtt_info(struct seq_file *m,
- struct drm_i915_private *dev_priv)
-{
- struct intel_engine_cs *engine;
- enum intel_engine_id id;
-
- if (IS_GEN(dev_priv, 6))
- seq_printf(m, "GFX_MODE: 0x%08x\n", I915_READ(GFX_MODE));
-
- for_each_engine(engine, dev_priv, id) {
- seq_printf(m, "%s\n", engine->name);
- if (IS_GEN(dev_priv, 7))
- seq_printf(m, "GFX_MODE: 0x%08x\n",
- I915_READ(RING_MODE_GEN7(engine)));
- seq_printf(m, "PP_DIR_BASE: 0x%08x\n",
- I915_READ(RING_PP_DIR_BASE(engine)));
- seq_printf(m, "PP_DIR_BASE_READ: 0x%08x\n",
- I915_READ(RING_PP_DIR_BASE_READ(engine)));
- seq_printf(m, "PP_DIR_DCLV: 0x%08x\n",
- I915_READ(RING_PP_DIR_DCLV(engine)));
- }
- if (dev_priv->mm.aliasing_ppgtt) {
- struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
-
- seq_puts(m, "aliasing PPGTT:\n");
- seq_printf(m, "pd gtt offset: 0x%08x\n",
ppgtt->pd.base.ggtt_offset);
-
- ppgtt->debug_dump(ppgtt, m);
- }
-
- seq_printf(m, "ECOCHK: 0x%08x\n", I915_READ(GAM_ECOCHK));
-}
-
-static int i915_ppgtt_info(struct seq_file *m, void *data)
-{
- struct drm_i915_private *dev_priv = node_to_i915(m->private);
- struct drm_device *dev = _priv->drm;
- struct drm_file *file;
- int ret;
-
- mutex_lock(>filelist_mutex);
- ret = mutex_lock_interruptible(>struct_mutex);
- if (ret)
- goto out_unlock;
-
- intel_runtime_pm_get(dev_priv);
-
- if (INTEL_GEN(dev_priv) >= 8)
- gen8_ppgtt_info(m, dev_priv);
- else if (INTEL_GEN(dev_priv) >= 6)
- gen6_ppgtt_info(m, dev_priv);
-
- list_for_each_entry_reverse(file, >filelist, lhead) {
- struct drm_i915_file_private *file_priv = file->driver_priv;
- struct task_struct *task;
-
- task = get_pid_task(file->pid, PIDTYPE_PID);
- if (!task) {
- ret = -ESRCH;
- goto out_rpm;
- }
- seq_printf(m, "\nproc: %s\n", task->comm);
- put_task_struct(task);
- idr_for_each(_priv->context_idr, per_file_ctx,
-(void *)(unsigned long)m);
- }
-
-out_rpm:
- intel_runtime_pm_put(dev_priv);
- mutex_unlock(>struct_mutex);
-out_unlock:
- mutex_unlock(>filelist_mutex);
- return ret;
-}
-
static int count_irq_waiters(struct drm_i915_private *i915)
{
struct intel_engine_cs *engine;
@@ -4912,7 +4794,6 @@ static
[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915_request.h: Remove duplicate header
== Series Details == Series: drm/i915_request.h: Remove duplicate header URL : https://patchwork.freedesktop.org/series/54471/ State : success == Summary == CI Bug Log - changes from CI_DRM_5342_full -> Patchwork_11152_full Summary --- **SUCCESS** No regressions found. Known issues Here are the changes found in Patchwork_11152_full that come from known issues: ### IGT changes ### Issues hit * igt@gem_cpu_reloc@full: - shard-skl: NOTRUN -> TIMEOUT [fdo#108248] * igt@i915_selftest@live_workarounds: - shard-iclb: PASS -> DMESG-FAIL [fdo#108954] * igt@kms_busy@extended-modeset-hang-newfb-render-a: - shard-skl: NOTRUN -> DMESG-WARN [fdo#107956] +2 * igt@kms_busy@extended-pageflip-hang-newfb-render-c: - shard-glk: PASS -> DMESG-WARN [fdo#107956] * igt@kms_color@pipe-a-ctm-negative: - shard-skl: PASS -> FAIL [fdo#107361] * igt@kms_cursor_crc@cursor-128x42-random: - shard-iclb: NOTRUN -> FAIL [fdo#103232] * igt@kms_cursor_crc@cursor-256x256-sliding: - shard-skl: NOTRUN -> FAIL [fdo#103232] * igt@kms_cursor_crc@cursor-64x21-sliding: - shard-apl: PASS -> FAIL [fdo#103232] +3 * igt@kms_cursor_crc@cursor-64x64-onscreen: - shard-apl: PASS -> DMESG-FAIL [fdo#103232] / [fdo#103558] / [fdo#105602] * igt@kms_cursor_crc@cursor-64x64-suspend: - shard-glk: PASS -> FAIL [fdo#103232] +1 - shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232] * igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions: - shard-apl: PASS -> DMESG-WARN [fdo#103558] / [fdo#105602] +22 * igt@kms_flip@2x-flip-vs-expired-vblank: - shard-glk: PASS -> FAIL [fdo#105363] * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt: - shard-apl: PASS -> FAIL [fdo#103167] +5 * igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-wc: - shard-glk: PASS -> FAIL [fdo#103167] * igt@kms_frontbuffer_tracking@fbc-stridechange: - shard-skl: NOTRUN -> FAIL [fdo#105683] * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen: - shard-iclb: PASS -> FAIL [fdo#103167] +7 * igt@kms_plane@pixel-format-pipe-a-planes-source-clamping: - shard-skl: NOTRUN -> DMESG-WARN [fdo#106885] * igt@kms_plane_alpha_blend@pipe-c-alpha-7efc: - shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145] * igt@kms_plane_multiple@atomic-pipe-a-tiling-x: - shard-apl: PASS -> FAIL [fdo#103166] +1 - shard-iclb: PASS -> FAIL [fdo#103166] * igt@kms_plane_scaling@pipe-a-scaler-with-rotation: - shard-iclb: PASS -> DMESG-WARN [fdo#107724] * igt@pm_rpm@dpms-mode-unset-non-lpsp: - shard-skl: SKIP -> INCOMPLETE [fdo#107807] * igt@pm_rpm@gem-mmap-gtt: - shard-iclb: PASS -> DMESG-WARN [fdo#108654] * igt@pm_rpm@legacy-planes: - shard-skl: NOTRUN -> INCOMPLETE [fdo#105959] / [fdo#107807] * igt@pm_rpm@modeset-pc8-residency-stress: - shard-iclb: SKIP -> INCOMPLETE [fdo#108840] Possible fixes * igt@gem_exec_blt@cold-max: - shard-glk: DMESG-WARN [fdo#105763] / [fdo#106538] -> PASS * igt@kms_busy@extended-pageflip-hang-newfb-render-c: - shard-apl: DMESG-WARN [fdo#107956] -> PASS * igt@kms_ccs@pipe-a-crc-sprite-planes-basic: - shard-glk: FAIL [fdo#108145] -> PASS * igt@kms_color@pipe-a-degamma: - shard-apl: FAIL [fdo#104782] / [fdo#108145] -> PASS * igt@kms_cursor_crc@cursor-128x128-suspend: - shard-skl: INCOMPLETE [fdo#104108] -> PASS * igt@kms_cursor_crc@cursor-128x42-onscreen: - shard-apl: FAIL [fdo#103232] -> PASS +1 * igt@kms_cursor_crc@cursor-256x85-sliding: - shard-glk: FAIL [fdo#103232] -> PASS +2 * igt@kms_draw_crc@draw-method-xrgb2101010-render-ytiled: - shard-iclb: WARN [fdo#108336] -> PASS +3 * igt@kms_flip@basic-flip-vs-wf_vblank: - shard-iclb: DMESG-WARN [fdo#107724] -> PASS +13 * igt@kms_flip@flip-vs-expired-vblank-interruptible: - shard-skl: FAIL [fdo#105363] -> PASS * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite: - shard-iclb: FAIL [fdo#103167] -> PASS +6 * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff: - shard-glk: FAIL [fdo#103167] -> PASS +4 * igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw: - shard-iclb: DMESG-FAIL [fdo#107724] -> PASS * igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-wc: - shard-iclb: DMESG-WARN [fdo#107724] / [fdo#108336] -> PASS +7 * igt@kms_plane@pixel-format-pipe-a-planes-source-clamping: - shard-glk: FAIL [fdo#108948] -> PASS *
Re: [Intel-gfx] [v4 1/4] drm/i915: Remove gamma_mode state variable
>-Original Message-
>From: Roper, Matthew D
>Sent: Friday, December 21, 2018 6:54 AM
>To: Shankar, Uma
>Cc: intel-gfx@lists.freedesktop.org; Lankhorst, Maarten
>; Syrjala, Ville ;
>Sharma,
>Shashank
>Subject: Re: [v4 1/4] drm/i915: Remove gamma_mode state variable
>
>On Fri, Dec 21, 2018 at 01:29:38AM +0530, Uma Shankar wrote:
>> Removed crtc state variable for gamma mode as it's redundant since
>> currently we have fixed modes on respective hardware platforms. This
>> was making this state variable irrelevant.
>>
>> Credits-to: Matt Roper
>>
>> Signed-off-by: Uma Shankar
>> ---
>> drivers/gpu/drm/i915/intel_color.c | 5 +
>> drivers/gpu/drm/i915/intel_display.c | 3 ---
>> drivers/gpu/drm/i915/intel_drv.h | 3 ---
>> 3 files changed, 1 insertion(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_color.c
>> b/drivers/gpu/drm/i915/intel_color.c
>> index 37fd9dd..f32e4a7 100644
>> --- a/drivers/gpu/drm/i915/intel_color.c
>> +++ b/drivers/gpu/drm/i915/intel_color.c
>> @@ -370,12 +370,11 @@ static void haswell_load_luts(struct intel_crtc_state
>*crtc_state)
>> * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS
>enabled.
>> */
>> if (IS_HASWELL(dev_priv) && crtc_state->ips_enabled &&
>> -(crtc_state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) {
>> +(I915_READ(GAMMA_MODE(crtc->pipe)) &
>GAMMA_MODE_MODE_SPLIT)) {
>
>We can probably avoid this read on each LUT load if we just handle it once
>during
>hardware readout/sanitization. Since our driver never actually sets MODE_SPLIT
>on this platform, we only have to worry about the BIOS leaving us in split
>gamma
>mode; that means we could do
>
>if (ips)
>disable ips
>
>intel_color_set_csc()
>intel_color_load_luts()
>
>if (ips)
>re-enable ips
>
>once during intel_sanitize_crtc(), to immediately program the hardware to a
>known-good state at startup (linear CTM and disabled LUT's). That would also
>be
>a little bit more consistent overall; since we don't actually readout the
>BIOS-set
>LUT's or CTM today, we wind up having them remain active for a while until they
>go away with the first fastset or modeset.
>
>Otherwise, this patch looks good, so
>
>Reviewed-by: Matt Roper
>
>and you can deal with sanitizing the color management stuff at bootup as a
>separate patch later.
Thanks Matt for these useful suggestions. Will update the patch accordingly.
Regards,
Uma Shankar
>
>Matt
>
>> hsw_disable_ips(crtc_state);
>> reenable_ips = true;
>> }
>>
>> -crtc_state->gamma_mode = GAMMA_MODE_MODE_8BIT;
>> I915_WRITE(GAMMA_MODE(crtc->pipe), GAMMA_MODE_MODE_8BIT);
>>
>> i9xx_load_luts(crtc_state);
>> @@ -476,7 +475,6 @@ static void broadwell_load_luts(struct intel_crtc_state
>*crtc_state)
>> bdw_load_gamma_lut(crtc_state,
>> INTEL_INFO(dev_priv)->color.degamma_lut_size);
>>
>> -crtc_state->gamma_mode = GAMMA_MODE_MODE_SPLIT;
>> I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_SPLIT);
>> POSTING_READ(GAMMA_MODE(pipe));
>>
>> @@ -532,7 +530,6 @@ static void glk_load_luts(struct intel_crtc_state
>> *crtc_state)
>>
>> bdw_load_gamma_lut(crtc_state, 0);
>>
>> -crtc_state->gamma_mode = GAMMA_MODE_MODE_10BIT;
>> I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_10BIT);
>> POSTING_READ(GAMMA_MODE(pipe));
>> }
>> diff --git a/drivers/gpu/drm/i915/intel_display.c
>> b/drivers/gpu/drm/i915/intel_display.c
>> index 3b70948..704d9d3 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -9679,9 +9679,6 @@ static bool haswell_get_pipe_config(struct intel_crtc
>*crtc,
>> intel_get_pipe_src_size(crtc, pipe_config);
>> intel_get_crtc_ycbcr_config(crtc, pipe_config);
>>
>> -pipe_config->gamma_mode =
>> -I915_READ(GAMMA_MODE(crtc->pipe)) &
>GAMMA_MODE_MODE_MASK;
>> -
>> power_domain = POWER_DOMAIN_PIPE_PANEL_FITTER(crtc->pipe);
>> if (intel_display_power_get_if_enabled(dev_priv, power_domain)) {
>> power_domain_mask |= BIT_ULL(power_domain); diff --git
>> a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>> index 1028af8..7427a36 100644
>> --- a/drivers/gpu/drm/i915/intel_drv.h
>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> @@ -921,9 +921,6 @@ struct intel_crtc_state {
>>
>> struct intel_crtc_wm_state wm;
>>
>> -/* Gamma mode programmed on the pipe */
>> -uint32_t gamma_mode;
>> -
>> /* bitmask of visible planes (enum plane_id) */
>> u8 active_planes;
>> u8 nv12_planes;
>> --
>> 1.9.1
>>
>
>--
>Matt Roper
>Graphics Software Engineer
>IoTG Platform Enabling & Development
>Intel Corporation
>(916) 356-2795
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✓ Fi.CI.BAT: success for drm/intel_dsi_vbt: Remove duplicate header
== Series Details ==
Series: drm/intel_dsi_vbt: Remove duplicate header
URL : https://patchwork.freedesktop.org/series/54472/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5342 -> Patchwork_11153
Summary
---
**SUCCESS**
No regressions found.
External URL:
https://patchwork.freedesktop.org/api/1.0/series/54472/revisions/1/mbox/
Known issues
Here are the changes found in Patchwork_11153 that come from known issues:
### IGT changes ###
Issues hit
* {igt@runner@aborted}:
- fi-icl-y: NOTRUN -> FAIL [fdo#108915]
Possible fixes
* igt@i915_selftest@live_contexts:
- fi-bsw-kefka: DMESG-FAIL [fdo#108626] / [fdo#108656] -> PASS
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#108622] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-cfl-8109u: INCOMPLETE [fdo#106070] / [fdo#108126] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#106070]: https://bugs.freedesktop.org/show_bug.cgi?id=106070
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#108126]: https://bugs.freedesktop.org/show_bug.cgi?id=108126
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#108626]: https://bugs.freedesktop.org/show_bug.cgi?id=108626
[fdo#108656]: https://bugs.freedesktop.org/show_bug.cgi?id=108656
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
Participating hosts (47 -> 43)
--
Additional (1): fi-icl-y
Missing(5): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
fi-ctg-p8600
Build changes
-
* Linux: CI_DRM_5342 -> Patchwork_11153
CI_DRM_5342: 28bb1fc015cedadf3b099b8bd0bb27609849f362 @
git://anongit.freedesktop.org/gfx-ci/linux
IGT_4753: 0bc683ea2dcf270b5287ffb4a6510fdff44e9390 @
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11153: 7fb71c2f486f3bce33d81800a83cadbf5c2b9545 @
git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7fb71c2f486f drm/intel_dsi_vbt: Remove duplicate header
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11153/
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v4 1/4] drm/i915: Remove gamma_mode state variable
>-Original Message-
>From: Ville Syrjälä [mailto:ville.syrj...@linux.intel.com]
>Sent: Friday, December 21, 2018 10:57 PM
>To: Shankar, Uma
>Cc: intel-gfx@lists.freedesktop.org; Syrjala, Ville ;
>Lankhorst, Maarten
>Subject: Re: [Intel-gfx] [v4 1/4] drm/i915: Remove gamma_mode state variable
>
>On Fri, Dec 21, 2018 at 01:29:38AM +0530, Uma Shankar wrote:
>> Removed crtc state variable for gamma mode as it's redundant since
>> currently we have fixed modes on respective hardware platforms. This
>> was making this state variable irrelevant.
>
>I'm going to add it back at some point.
Hi Ville,
I believe we can drop it currently and add later as needed and handle the state
more
efficiently as to how was it done currently. I hope that is ok.
Regards,
Uma Shankar
>>
>> Credits-to: Matt Roper
>>
>> Signed-off-by: Uma Shankar
>> ---
>> drivers/gpu/drm/i915/intel_color.c | 5 +
>> drivers/gpu/drm/i915/intel_display.c | 3 ---
>> drivers/gpu/drm/i915/intel_drv.h | 3 ---
>> 3 files changed, 1 insertion(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_color.c
>> b/drivers/gpu/drm/i915/intel_color.c
>> index 37fd9dd..f32e4a7 100644
>> --- a/drivers/gpu/drm/i915/intel_color.c
>> +++ b/drivers/gpu/drm/i915/intel_color.c
>> @@ -370,12 +370,11 @@ static void haswell_load_luts(struct intel_crtc_state
>*crtc_state)
>> * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS
>enabled.
>> */
>> if (IS_HASWELL(dev_priv) && crtc_state->ips_enabled &&
>> -(crtc_state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) {
>> +(I915_READ(GAMMA_MODE(crtc->pipe)) &
>GAMMA_MODE_MODE_SPLIT)) {
>> hsw_disable_ips(crtc_state);
>> reenable_ips = true;
>> }
>>
>> -crtc_state->gamma_mode = GAMMA_MODE_MODE_8BIT;
>> I915_WRITE(GAMMA_MODE(crtc->pipe), GAMMA_MODE_MODE_8BIT);
>>
>> i9xx_load_luts(crtc_state);
>> @@ -476,7 +475,6 @@ static void broadwell_load_luts(struct intel_crtc_state
>*crtc_state)
>> bdw_load_gamma_lut(crtc_state,
>> INTEL_INFO(dev_priv)->color.degamma_lut_size);
>>
>> -crtc_state->gamma_mode = GAMMA_MODE_MODE_SPLIT;
>> I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_SPLIT);
>> POSTING_READ(GAMMA_MODE(pipe));
>>
>> @@ -532,7 +530,6 @@ static void glk_load_luts(struct intel_crtc_state
>> *crtc_state)
>>
>> bdw_load_gamma_lut(crtc_state, 0);
>>
>> -crtc_state->gamma_mode = GAMMA_MODE_MODE_10BIT;
>> I915_WRITE(GAMMA_MODE(pipe), GAMMA_MODE_MODE_10BIT);
>> POSTING_READ(GAMMA_MODE(pipe));
>> }
>> diff --git a/drivers/gpu/drm/i915/intel_display.c
>> b/drivers/gpu/drm/i915/intel_display.c
>> index 3b70948..704d9d3 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -9679,9 +9679,6 @@ static bool haswell_get_pipe_config(struct intel_crtc
>*crtc,
>> intel_get_pipe_src_size(crtc, pipe_config);
>> intel_get_crtc_ycbcr_config(crtc, pipe_config);
>>
>> -pipe_config->gamma_mode =
>> -I915_READ(GAMMA_MODE(crtc->pipe)) &
>GAMMA_MODE_MODE_MASK;
>> -
>> power_domain = POWER_DOMAIN_PIPE_PANEL_FITTER(crtc->pipe);
>> if (intel_display_power_get_if_enabled(dev_priv, power_domain)) {
>> power_domain_mask |= BIT_ULL(power_domain); diff --git
>> a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>> index 1028af8..7427a36 100644
>> --- a/drivers/gpu/drm/i915/intel_drv.h
>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> @@ -921,9 +921,6 @@ struct intel_crtc_state {
>>
>> struct intel_crtc_wm_state wm;
>>
>> -/* Gamma mode programmed on the pipe */
>> -uint32_t gamma_mode;
>> -
>> /* bitmask of visible planes (enum plane_id) */
>> u8 active_planes;
>> u8 nv12_planes;
>> --
>> 1.9.1
>>
>> ___
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>--
>Ville Syrjälä
>Intel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915_request.h: Remove duplicate header
== Series Details ==
Series: drm/i915_request.h: Remove duplicate header
URL : https://patchwork.freedesktop.org/series/54471/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5342 -> Patchwork_11152
Summary
---
**WARNING**
Minor unknown changes coming with Patchwork_11152 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_11152, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL:
https://patchwork.freedesktop.org/api/1.0/series/54471/revisions/1/mbox/
Possible new issues
---
Here are the unknown changes that may have been introduced in Patchwork_11152:
### IGT changes ###
Warnings
* igt@pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: PASS -> SKIP
Known issues
Here are the changes found in Patchwork_11152 that come from known issues:
### IGT changes ###
Issues hit
* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@pm_rpm@basic-rte:
- fi-bsw-kefka: PASS -> FAIL [fdo#108800]
* {igt@runner@aborted}:
- fi-icl-y: NOTRUN -> FAIL [fdo#108915]
Possible fixes
* igt@i915_selftest@live_contexts:
- fi-bsw-kefka: DMESG-FAIL [fdo#108626] / [fdo#108656] -> PASS
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#108622] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-cfl-8109u: INCOMPLETE [fdo#106070] / [fdo#108126] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#106070]: https://bugs.freedesktop.org/show_bug.cgi?id=106070
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108126]: https://bugs.freedesktop.org/show_bug.cgi?id=108126
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#108626]: https://bugs.freedesktop.org/show_bug.cgi?id=108626
[fdo#108656]: https://bugs.freedesktop.org/show_bug.cgi?id=108656
[fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
Participating hosts (47 -> 42)
--
Additional (1): fi-icl-y
Missing(6): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
fi-ctg-p8600 fi-pnv-d510
Build changes
-
* Linux: CI_DRM_5342 -> Patchwork_11152
CI_DRM_5342: 28bb1fc015cedadf3b099b8bd0bb27609849f362 @
git://anongit.freedesktop.org/gfx-ci/linux
IGT_4753: 0bc683ea2dcf270b5287ffb4a6510fdff44e9390 @
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11152: 4b2841ef3b0808790a4a7d0d8f0b99af0122ab2a @
git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
4b2841ef3b08 drm/i915_request.h: Remove duplicate header
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11152/
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [regression from v4.19] Re: 4.20.0-rc6-next-20181210, v4.20-rc1: list_del corruption on thinkpad x220, graphics related?
Hi! > > > > If you think it is useful, I can try to update my machine to > > > > linux-next. > > > > > > linux-next is closer to drm-tip, so it's better. Do you have some > > > specific reason for not wanting to run drm-tip (but linux-next is still > > > ok)? > > > > I already have build/update scripts for -next, and I trust -next not > > to store screenshots of my desktop in my master boot record :-). > > > > Anyway, it does happen with -next. This time, chromiums were running, > > and crash happened minute? after I exited flightgear. It can be seen > > in the logs. > > > > Oh and I might want to mention -- machine was rather deep in swap this > > time, as in "mouse jumping when starting fgfs" and "could feel the > > chromium being swapped back in". I might have had this situation > > before, and just powercycled the machine "because it is so deep in > > swap that it will not recover". > > > > top says: > > > > top - 19:18:24 up 2 days, 8:03, 2 users, load average: 3.02, 3.45, > > 3.21 > > Tasks: 141 total, 1 running, 86 sleeping, 0 stopped, 2 zombie > > %Cpu(s): 18.8 us, 7.6 sy, 3.0 ni, 68.4 id, 1.3 wa, 0.0 hi, 0.9 > > si, 0.0 st > > KiB Mem: 5967968 total, 663244 used, 5304724 free,48876 > > buffers > > KiB Swap: 1681428 total, 170904 used, 1510524 free. 446280 > > cached Mem > > > > but of course that memory is free once everything died. > > > > Any ideas? Should I go back to v4.19 to see if it happens there, too? > > linux-next includes very much the same code as drm-tip. There's nobody > magically reviewing the code more than it is reviewed for inclusion into > drm-tip, when it is fed into linux-next. So thinking linux-next would be > some way safer is an illusion. > > It sounds like having memory pressure expedites the corruption, which > should make it easier to reproduce and thus fix. > > So if you could please try drm-tip reproducing AND open a bug in Bugzilla. > If you are unwilling to do that, it is very difficult to help you > more. Website says I have to read and agree to two different pieces of legalesee, and I'd need to keep track of yet another password... so you can "communicate" with me. But you can already communicate with me, over email. I verified v4.19 is stable -- it worked ok for way more than two days it usually takes to crash. Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html signature.asc Description: Digital signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [v4 2/4] drm/i915/icl: Add icl pipe degamma and gamma support
On Fri, 21 Dec 2018, Uma Shankar wrote:
> Add support for icl pipe degamma and gamma.
>
> v2: Removed a POSTING_READ and corrected the Bit
> Definition as per Maarten's comments.
>
> v3: Addressed Matt's review comments. Removed rmw patterns
> as suggested by Matt.
>
> v4: Fixed Matt's review comments.
>
> Signed-off-by: Uma Shankar
> ---
> drivers/gpu/drm/i915/i915_reg.h| 3 ++
> drivers/gpu/drm/i915/intel_color.c | 67
> ++
> 2 files changed, 70 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 02af9b5..1852c33 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -7092,6 +7092,9 @@ enum {
> #define GAMMA_MODE_MODE_12BIT(2 << 0)
> #define GAMMA_MODE_MODE_SPLIT(3 << 0)
>
> +#define PRE_CSC_GAMMA_ENABLE(1 << 31)
> +#define POST_CSC_GAMMA_ENABLE (1 << 30)
Please read the big comment near the top of this file about where to
place register content macros, ordering, indentation, spacing, etc.
BR,
Jani.
> +
> /* DMC/CSR */
> #define CSR_PROGRAM(i) _MMIO(0x8 + (i) * 4)
> #define CSR_SSP_BASE_ADDR_GEN9 0x2FC0
> diff --git a/drivers/gpu/drm/i915/intel_color.c
> b/drivers/gpu/drm/i915/intel_color.c
> index f32e4a7..e72d8d6 100644
> --- a/drivers/gpu/drm/i915/intel_color.c
> +++ b/drivers/gpu/drm/i915/intel_color.c
> @@ -534,6 +534,71 @@ static void glk_load_luts(struct intel_crtc_state
> *crtc_state)
> POSTING_READ(GAMMA_MODE(pipe));
> }
>
> +static void icl_load_degamma_lut(struct intel_crtc_state *crtc_state)
> +{
> + struct drm_device *dev = crtc_state->base.crtc->dev;
> + struct drm_i915_private *dev_priv = to_i915(dev);
> + enum pipe pipe = to_intel_crtc(crtc_state->base.crtc)->pipe;
> + const uint32_t lut_size = INTEL_INFO(dev_priv)->color.degamma_lut_size;
> + uint32_t i;
> +
> + /*
> + * When setting the auto-increment bit, the hardware seems to
> + * ignore the index bits, so we need to reset it to index 0
> + * separately.
> + */
> + I915_WRITE(PRE_CSC_GAMC_INDEX(pipe), 0);
> + I915_WRITE(PRE_CSC_GAMC_INDEX(pipe), PRE_CSC_GAMC_AUTO_INCREMENT);
> +
> + if (crtc_state->base.degamma_lut) {
> + struct drm_color_lut *lut = crtc_state->base.degamma_lut->data;
> +
> + for (i = 0; i < lut_size; i++) {
> + /*
> + * First 33 entries represent range from 0 to 1.0
> + * 34th and 35th entry will represent extended range
> + * inputs 3.0 and 7.0 respectively, currently clamped
> + * at 1.0. Since the precision is 16bit, the user value
> + * can be directly filled to register.
> + * ToDo: Extend to max 7.0.
> + */
> + I915_WRITE(PRE_CSC_GAMC_DATA(pipe), lut[i].red);
> + }
> + } else {
> + /* load a linear table. */
> + for (i = 0; i < lut_size; i++) {
> + uint32_t v = (i * (1 << 16)) / (lut_size - 1);
> +
> + I915_WRITE(PRE_CSC_GAMC_DATA(pipe), v);
> + }
> + }
> +
> + /* Clamp values > 1.0. */
> + while (i++ < 35)
> + I915_WRITE(PRE_CSC_GAMC_DATA(pipe), (1 << 16));
> +}
> +
> +static void icl_load_luts(struct intel_crtc_state *crtc_state)
> +{
> + struct drm_crtc *crtc = crtc_state->base.crtc;
> + struct drm_device *dev = crtc_state->base.crtc->dev;
> + struct drm_i915_private *dev_priv = to_i915(dev);
> + enum pipe pipe = to_intel_crtc(crtc)->pipe;
> + u32 gamma_mode = 0;
> +
> + if (crtc_state_is_legacy_gamma(crtc_state)) {
> + haswell_load_luts(crtc_state);
> + return;
> + }
> +
> + icl_load_degamma_lut(crtc_state);
> + bdw_load_gamma_lut(crtc_state, 0);
> +
> + gamma_mode = GAMMA_MODE_MODE_10BIT | PRE_CSC_GAMMA_ENABLE
> + | POST_CSC_GAMMA_ENABLE;
> + I915_WRITE(GAMMA_MODE(pipe), gamma_mode);
> +}
> +
> /* Loads the palette/gamma unit for the CRTC on CherryView. */
> static void cherryview_load_luts(struct intel_crtc_state *crtc_state)
> {
> @@ -649,6 +714,8 @@ void intel_color_init(struct intel_crtc *crtc)
> } else if (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) {
> dev_priv->display.load_csc_matrix = ilk_load_csc_matrix;
> dev_priv->display.load_luts = glk_load_luts;
> + } else if (IS_ICELAKE(dev_priv)) {
> + dev_priv->display.load_luts = icl_load_luts;
> } else {
> dev_priv->display.load_luts = i9xx_load_luts;
> }
--
Jani Nikula, Intel Open Source Graphics Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/debugfs_crc: Degrade ERROR when overflowing to INFO
On Thu, 20 Dec 2018, Maarten Lankhorst
wrote:
Insert commit message explaining why here. ;)
BR,
Jani.
> Signed-off-by: Maarten Lankhorst
> ---
> drivers/gpu/drm/drm_debugfs_crc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_debugfs_crc.c
> b/drivers/gpu/drm/drm_debugfs_crc.c
> index 00e743153e94..80f473ce5c67 100644
> --- a/drivers/gpu/drm/drm_debugfs_crc.c
> +++ b/drivers/gpu/drm/drm_debugfs_crc.c
> @@ -408,7 +408,7 @@ int drm_crtc_add_crc_entry(struct drm_crtc *crtc, bool
> has_frame,
> spin_unlock(>lock);
>
> if (!was_overflow)
> - DRM_ERROR("Overflow of CRC buffer, userspace reads too
> slow.\n");
> + DRM_INFO("Overflow of CRC buffer, userspace reads too
> slow.\n");
>
> return -ENOBUFS;
> }
--
Jani Nikula, Intel Open Source Graphics Center
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
