mbox series

[v2,00/10] drm/xe & drm/i915: drvdata usage changes

Message ID cover.1723129920.git.jani.nikula@intel.com (mailing list archive)
Headers show
Series drm/xe & drm/i915: drvdata usage changes | expand

Message

Jani Nikula Aug. 8, 2024, 3:15 p.m. UTC 
v2 of https://patchwork.freedesktop.org/series/136621/

Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of
"drm/xe/tests: remove unused leftover xe_call_for_each_device()" here.

Due to the display dependency, I think it would be best to merge the
whole thing via drm-intel-next, and do the first drm-intel-next pull
request and backmerge from drm-next to drm-xe-next in fairly quick
succession.

BR,
Jani.


Jani Nikula (10):
  drm/xe/tests: remove unused leftover xe_call_for_each_device()
  drm/xe: use pdev_to_xe_device() instead of pci_get_drvdata() directly
  drm/xe: add kdev_to_xe_device() helper and use it
  drm/i915: use pdev_to_i915() instead of pci_get_drvdata() directly
  drm/i915 & drm/xe: save struct drm_device to drvdata
  drm/i915: support struct device and pci_dev in to_intel_display()
  drm/i915/audio: migrate away from kdev_to_i915()
  drm/i915/hdcp: migrate away from kdev_to_i915() in bind/unbind
  drm/i915/hdcp: migrate away from kdev_to_i915() in GSC messaging
  drm/xe/display: remove unused compat kdev_to_i915() and pdev_to_i915()

 drivers/gpu/drm/i915/display/intel_audio.c    | 34 ++++++----
 .../drm/i915/display/intel_display_types.h    |  8 ++-
 drivers/gpu/drm/i915/display/intel_hdcp.c     | 10 +--
 .../drm/i915/display/intel_hdcp_gsc_message.c | 67 +++++++++++++------
 drivers/gpu/drm/i915/i915_driver.c            |  2 +-
 drivers/gpu/drm/i915/i915_drv.h               |  8 ++-
 drivers/gpu/drm/i915/i915_pci.c               |  6 +-
 .../gpu/drm/i915/selftests/mock_gem_device.c  |  2 +-
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h |  6 --
 drivers/gpu/drm/xe/tests/xe_pci.c             | 52 --------------
 drivers/gpu/drm/xe/tests/xe_pci_test.h        |  1 -
 drivers/gpu/drm/xe/xe_device.h                | 11 ++-
 drivers/gpu/drm/xe/xe_gsc_proxy.c             |  9 +--
 drivers/gpu/drm/xe/xe_pci.c                   |  4 +-
 14 files changed, 104 insertions(+), 116 deletions(-)

Comments

Lucas De Marchi Aug. 8, 2024, 3:48 p.m. UTC | #1 
On Thu, Aug 08, 2024 at 06:15:45PM GMT, Jani Nikula wrote:
>v2 of https://patchwork.freedesktop.org/series/136621/
>
>Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of
>"drm/xe/tests: remove unused leftover xe_call_for_each_device()" here.
>
>Due to the display dependency, I think it would be best to merge the
>whole thing via drm-intel-next, and do the first drm-intel-next pull
>request and backmerge from drm-next to drm-xe-next in fairly quick
>succession.

I was waiting the drm-intel-next pull to do a backmerge as we started to
have some big divergences. I will try to review the missing patches to
expedite that. Are you planning a pull this week?

Lucas De Marchi
Jani Nikula Aug. 9, 2024, 9:06 a.m. UTC | #2 
On Thu, 08 Aug 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Thu, Aug 08, 2024 at 06:15:45PM GMT, Jani Nikula wrote:
>>v2 of https://patchwork.freedesktop.org/series/136621/
>>
>>Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of
>>"drm/xe/tests: remove unused leftover xe_call_for_each_device()" here.
>>
>>Due to the display dependency, I think it would be best to merge the
>>whole thing via drm-intel-next, and do the first drm-intel-next pull
>>request and backmerge from drm-next to drm-xe-next in fairly quick
>>succession.
>
> I was waiting the drm-intel-next pull to do a backmerge as we started to
> have some big divergences. I will try to review the missing patches to
> expedite that. Are you planning a pull this week?

Rodrigo? I think it's your shift.

BR,
Jani.
Jani Nikula Aug. 9, 2024, 1:23 p.m. UTC | #3 
On Fri, 09 Aug 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> On Thu, 08 Aug 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>> On Thu, Aug 08, 2024 at 06:15:45PM GMT, Jani Nikula wrote:
>>>v2 of https://patchwork.freedesktop.org/series/136621/
>>>
>>>Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of
>>>"drm/xe/tests: remove unused leftover xe_call_for_each_device()" here.
>>>
>>>Due to the display dependency, I think it would be best to merge the
>>>whole thing via drm-intel-next, and do the first drm-intel-next pull
>>>request and backmerge from drm-next to drm-xe-next in fairly quick
>>>succession.
>>
>> I was waiting the drm-intel-next pull to do a backmerge as we started to
>> have some big divergences. I will try to review the missing patches to
>> expedite that. Are you planning a pull this week?
>
> Rodrigo? I think it's your shift.

In the mean time, ack for merging this via drm-intel-next?

BR,
Jani.

>
> BR,
> Jani.
Lucas De Marchi Aug. 9, 2024, 3:58 p.m. UTC | #4 
On Fri, Aug 09, 2024 at 04:23:47PM GMT, Jani Nikula wrote:
>On Fri, 09 Aug 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>> On Thu, 08 Aug 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>> On Thu, Aug 08, 2024 at 06:15:45PM GMT, Jani Nikula wrote:
>>>>v2 of https://patchwork.freedesktop.org/series/136621/
>>>>
>>>>Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of
>>>>"drm/xe/tests: remove unused leftover xe_call_for_each_device()" here.
>>>>
>>>>Due to the display dependency, I think it would be best to merge the
>>>>whole thing via drm-intel-next, and do the first drm-intel-next pull
>>>>request and backmerge from drm-next to drm-xe-next in fairly quick
>>>>succession.
>>>
>>> I was waiting the drm-intel-next pull to do a backmerge as we started to
>>> have some big divergences. I will try to review the missing patches to
>>> expedite that. Are you planning a pull this week?
>>
>> Rodrigo? I think it's your shift.
>
>In the mean time, ack for merging this via drm-intel-next?


Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>

thanks
Lucas De Marchi

>
>BR,
>Jani.
>
>>
>> BR,
>> Jani.
>
>-- 
>Jani Nikula, Intel
Lucas De Marchi Aug. 9, 2024, 4:25 p.m. UTC | #5 
On Fri, Aug 09, 2024 at 10:58:24AM GMT, Lucas De Marchi wrote:
>On Fri, Aug 09, 2024 at 04:23:47PM GMT, Jani Nikula wrote:
>>On Fri, 09 Aug 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>>>On Thu, 08 Aug 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>>>On Thu, Aug 08, 2024 at 06:15:45PM GMT, Jani Nikula wrote:
>>>>>v2 of https://patchwork.freedesktop.org/series/136621/
>>>>>
>>>>>Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of
>>>>>"drm/xe/tests: remove unused leftover xe_call_for_each_device()" here.
>>>>>
>>>>>Due to the display dependency, I think it would be best to merge the
>>>>>whole thing via drm-intel-next, and do the first drm-intel-next pull
>>>>>request and backmerge from drm-next to drm-xe-next in fairly quick
>>>>>succession.
>>>>
>>>>I was waiting the drm-intel-next pull to do a backmerge as we started to
>>>>have some big divergences. I will try to review the missing patches to
>>>>expedite that. Are you planning a pull this week?
>>>
>>>Rodrigo? I think it's your shift.
>>
>>In the mean time, ack for merging this via drm-intel-next?
>
>
>Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>

oh. wait... but I don't think you will be able to merge the first patch
through drm-intel-next.

$ git branch --contains 57ecead343e7
+ drm-tip
+ drm-xe-next
* tip
+ topic/xe-for-CI

Sorry for not noticing that before. Alternatives:

1)
merge this patch via drm-xe-next, and possibly (if it unblocks more
patches on top), your 'drm/xe/tests: fix drvdata usage" from v1' via
drm-intel.

2) do not apply this and patch 10 until we are back in sync.

... something else?

I don't have a preference.

Lucas De Marchi

>
>thanks
>Lucas De Marchi
>
>>
>>BR,
>>Jani.
>>
>>>
>>>BR,
>>>Jani.
>>
>>-- 
>>Jani Nikula, Intel
Jani Nikula Aug. 12, 2024, 10:36 a.m. UTC | #6 
On Fri, 09 Aug 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Fri, Aug 09, 2024 at 10:58:24AM GMT, Lucas De Marchi wrote:
>>On Fri, Aug 09, 2024 at 04:23:47PM GMT, Jani Nikula wrote:
>>>On Fri, 09 Aug 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>>>>On Thu, 08 Aug 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>>>>On Thu, Aug 08, 2024 at 06:15:45PM GMT, Jani Nikula wrote:
>>>>>>v2 of https://patchwork.freedesktop.org/series/136621/
>>>>>>
>>>>>>Removed "drm/xe/tests: fix drvdata usage" from v1 in favour of
>>>>>>"drm/xe/tests: remove unused leftover xe_call_for_each_device()" here.
>>>>>>
>>>>>>Due to the display dependency, I think it would be best to merge the
>>>>>>whole thing via drm-intel-next, and do the first drm-intel-next pull
>>>>>>request and backmerge from drm-next to drm-xe-next in fairly quick
>>>>>>succession.
>>>>>
>>>>>I was waiting the drm-intel-next pull to do a backmerge as we started to
>>>>>have some big divergences. I will try to review the missing patches to
>>>>>expedite that. Are you planning a pull this week?
>>>>
>>>>Rodrigo? I think it's your shift.
>>>
>>>In the mean time, ack for merging this via drm-intel-next?
>>
>>
>>Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
> oh. wait... but I don't think you will be able to merge the first patch
> through drm-intel-next.
>
> $ git branch --contains 57ecead343e7
> + drm-tip
> + drm-xe-next
> * tip
> + topic/xe-for-CI
>
> Sorry for not noticing that before. Alternatives:
>
> 1)
> merge this patch via drm-xe-next, and possibly (if it unblocks more
> patches on top), your 'drm/xe/tests: fix drvdata usage" from v1' via
> drm-intel.
>
> 2) do not apply this and patch 10 until we are back in sync.
>
> ... something else?

Yeah, something else. I resent patches 1-3 separately to be merged via
drm-xe-next [1] and patch 4 to be merged via drm-intel-next [2]. Clean
and straightforward.

Let's do the rest once we're back in sync.

BR,
Jani.


[1] https://lore.kernel.org/r/cover.1723458544.git.jani.nikula@intel.com
[2] https://lore.kernel.org/r/20240812103415.1540096-1-jani.nikula@intel.com



>
> I don't have a preference.
>
> Lucas De Marchi
>
>>
>>thanks
>>Lucas De Marchi
>>
>>>
>>>BR,
>>>Jani.
>>>
>>>>
>>>>BR,
>>>>Jani.
>>>
>>>-- 
>>>Jani Nikula, Intel