From: Mark Brown <broonie@kernel•org>
To: Simona Vetter <simona.vetter@ffwll•ch>,
Jani Nikula <jani.nikula@linux•intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux•intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel•com>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Tvrtko Ursulin" <tursulin@ursulin•net>,
"Ville Syrjälä" <ville.syrjala@linux•intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
Date: Tue, 3 Dec 2024 20:05:29 +0000 [thread overview]
Message-ID: <Z09kidsTlxhP51ff@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 3710 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dsb.c
between commit:
ebd1e5faa72af ("drm/i915/dsb: Don't use indexed register writes needlessly")
from the drm-intel-fixes tree and commit:
ecba559a88ab8 ("drm/i915/dsb: Don't use indexed register writes needlessly")
from the drm-intel tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc drivers/gpu/drm/i915/display/intel_dsb.c
index 4d3785f5cb525,e6f8fc743fb40..0000000000000
--- a/drivers/gpu/drm/i915/display/intel_dsb.c
+++ b/drivers/gpu/drm/i915/display/intel_dsb.c
@@@ -304,55 -295,34 +295,43 @@@ void intel_dsb_reg_write_indexed(struc
* we are writing odd no of dwords, Zeros will be added in the end for
* padding.
*/
- if (!intel_dsb_prev_ins_is_mmio_write(dsb, reg) &&
- !intel_dsb_prev_ins_is_indexed_write(dsb, reg)) {
- intel_dsb_emit(dsb, val,
- (DSB_OPCODE_MMIO_WRITE << DSB_OPCODE_SHIFT) |
- (DSB_BYTE_EN << DSB_BYTE_EN_SHIFT) |
+ if (!intel_dsb_prev_ins_is_indexed_write(dsb, reg))
+ intel_dsb_emit(dsb, 0, /* count */
+ (DSB_OPCODE_INDEXED_WRITE << DSB_OPCODE_SHIFT) |
i915_mmio_reg_offset(reg));
- } else {
- if (!assert_dsb_has_room(dsb))
- return;
- /* convert to indexed write? */
- if (intel_dsb_prev_ins_is_mmio_write(dsb, reg)) {
- u32 prev_val = dsb->ins[0];
+ if (!assert_dsb_has_room(dsb))
+ return;
- dsb->ins[0] = 1; /* count */
- dsb->ins[1] = (DSB_OPCODE_INDEXED_WRITE << DSB_OPCODE_SHIFT) |
- i915_mmio_reg_offset(reg);
+ /* Update the count */
+ dsb->ins[0]++;
+ intel_dsb_buffer_write(&dsb->dsb_buf, dsb->ins_start_offset + 0,
+ dsb->ins[0]);
- intel_dsb_buffer_write(&dsb->dsb_buf, dsb->ins_start_offset + 0,
- dsb->ins[0]);
- intel_dsb_buffer_write(&dsb->dsb_buf, dsb->ins_start_offset + 1,
- dsb->ins[1]);
- intel_dsb_buffer_write(&dsb->dsb_buf, dsb->ins_start_offset + 2,
- prev_val);
+ intel_dsb_buffer_write(&dsb->dsb_buf, dsb->free_pos++, val);
+ /* if number of data words is odd, then the last dword should be 0.*/
+ if (dsb->free_pos & 0x1)
+ intel_dsb_buffer_write(&dsb->dsb_buf, dsb->free_pos, 0);
+ }
- dsb->free_pos++;
- }
-
- intel_dsb_buffer_write(&dsb->dsb_buf, dsb->free_pos++, val);
- /* Update the count */
- dsb->ins[0]++;
- intel_dsb_buffer_write(&dsb->dsb_buf, dsb->ins_start_offset + 0,
- dsb->ins[0]);
-
- /* if number of data words is odd, then the last dword should be 0.*/
- if (dsb->free_pos & 0x1)
- intel_dsb_buffer_write(&dsb->dsb_buf, dsb->free_pos, 0);
- }
+ void intel_dsb_reg_write(struct intel_dsb *dsb,
+ i915_reg_t reg, u32 val)
+ {
+ intel_dsb_emit(dsb, val,
+ (DSB_OPCODE_MMIO_WRITE << DSB_OPCODE_SHIFT) |
+ (DSB_BYTE_EN << DSB_BYTE_EN_SHIFT) |
+ i915_mmio_reg_offset(reg));
}
+void intel_dsb_reg_write(struct intel_dsb *dsb,
+ i915_reg_t reg, u32 val)
+{
+ intel_dsb_emit(dsb, val,
+ (DSB_OPCODE_MMIO_WRITE << DSB_OPCODE_SHIFT) |
+ (DSB_BYTE_EN << DSB_BYTE_EN_SHIFT) |
+ i915_mmio_reg_offset(reg));
+}
+
static u32 intel_dsb_mask_to_byte_en(u32 mask)
{
return (!!(mask & 0xff000000) << 3 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-12-03 20:05 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-03 20:05 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-23 16:10 linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Mark Brown
2026-03-10 13:34 Mark Brown
2025-10-16 13:56 Mark Brown
2025-10-14 12:29 Mark Brown
2022-02-25 17:08 broonie
2022-02-23 14:46 broonie
2022-02-02 23:59 Stephen Rothwell
2021-08-02 15:18 Mark Brown
2020-06-30 1:52 Stephen Rothwell
2020-07-06 1:51 ` Stephen Rothwell
2020-03-11 2:36 Stephen Rothwell
2020-03-20 1:57 ` Stephen Rothwell
2019-03-21 23:57 Stephen Rothwell
2019-03-31 22:59 ` Stephen Rothwell
2017-10-18 9:27 Mark Brown
2017-10-16 11:35 Mark Brown
2017-10-17 8:11 ` Arnd Bergmann
2017-10-17 8:30 ` Mark Brown
2017-10-12 18:44 Mark Brown
2017-10-12 18:36 Mark Brown
2017-06-08 3:07 Stephen Rothwell
2017-06-08 3:04 Stephen Rothwell
2017-03-21 0:37 Stephen Rothwell
2016-08-24 1:42 Stephen Rothwell
2016-08-24 1:32 Stephen Rothwell
2016-06-22 1:40 Stephen Rothwell
2015-11-18 0:30 Stephen Rothwell
2015-09-30 1:32 Stephen Rothwell
2015-09-24 1:25 Stephen Rothwell
2015-09-24 8:57 ` Jani Nikula
2015-09-24 11:52 ` Stephen Rothwell
2015-07-15 0:15 Stephen Rothwell
2015-07-14 2:11 Stephen Rothwell
2015-07-14 7:34 ` Daniel Vetter
2015-07-10 2:15 Stephen Rothwell
2015-07-10 2:08 Stephen Rothwell
2015-02-27 0:36 Stephen Rothwell
2015-02-26 0:15 Stephen Rothwell
2015-02-25 1:05 Stephen Rothwell
2015-01-09 2:06 Stephen Rothwell
2014-05-22 5:58 Stephen Rothwell
2014-04-30 2:37 Stephen Rothwell
2013-12-16 1:45 Stephen Rothwell
2013-12-02 1:04 Stephen Rothwell
2013-12-02 1:13 ` Stephen Rothwell
2013-09-25 2:00 Stephen Rothwell
2013-09-20 1:40 Stephen Rothwell
2013-07-26 3:14 Stephen Rothwell
2013-07-26 3:10 Stephen Rothwell
2013-07-18 2:07 Stephen Rothwell
2013-07-18 1:44 Stephen Rothwell
2013-07-16 2:05 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z09kidsTlxhP51ff@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=simona.vetter@ffwll$(echo .)ch \
--cc=tursulin@ursulin$(echo .)net \
--cc=ville.syrjala@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox