CVS log for src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_sdvo.c

Up to [cvs.NetBSD.org] / src / sys / external / bsd / drm2 / dist / drm / i915

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Merge linux-drm-v5-6-rc3

Merge changes from current as of 20200406

Sync with head.

Reduce diffs by side-loading some header files like Linux.

From riastradh

Reduce some more cosmetic diffs.

Undo the `enum pipe' -> `enum i915_pipe' rename.

Sync with HEAD

revert the upsteam portion of previous; we don't want to patch upstream
fallthrough/breaks.

add failthrough and break as appropriate.

Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)

Pull up following revision(s) (requested by riastradh in ticket #1003):

	sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c: revision 1.8
	sys/external/bsd/drm2/dist/drm/ttm/ttm_tt.c: revision 1.10
	sys/external/bsd/drm2/drm/drm_scatter.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/i915/i915_reg.h: revision 1.2
	sys/external/bsd/drm2/linux/linux_ww_mutex.c: revision 1.3
	sys/external/bsd/drm2/linux/linux_ww_mutex.c: revision 1.4
	sys/external/bsd/drm2/linux/linux_idr.c: revision 1.6

Pull in upstream commit:
Author: Ville Syrj=E4l=E4 <ville.syrjala%linux.intel.com@localhost>
Date:   Mon Jun 9 16:20:46 2014 +0300
    drm/i915: Avoid div-by-zero when pixel_multiplier is zero
On certain platforms pixel_multiplier is read out in
.get_pipe_config(), but it also gets used to calculate the
pixel clock in intel_sdvo_get_config(). If the pipe is disabled
but some SDVO outputs are active, we may end up dividing by zero
in intel_sdvo_get_config().
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=3D76520
Tweak slightly sketchy logic in linux_idr.
1. idr_preload can fail if you don't set __GFP_WAIT.
2. If idr_preload fails, it is wrong for idr_alloc to assert.
3. There is no way for idr_alloc to know what flags idr_preload got.
Probably won't *fix* any bugs, but if there is a bug with a missing
__GFP_WAIT, then we will learn about a trifle sooner.
Fix error branch in ttm_dma_tt_init to avoid double-free.
Should fix symptom of PR kern/52438, but who knows what underlying
problem causes us to reach the error branch in the first place.
Fix lockdebug_locked annotations.
When thread A grants ownership to thread B waiting with a context,
thread B needs to assert lockdebug_locked; otherwise, when it
releases, lockdebug_unlocked thinks it's releasing an unlocked
ww_mutex.

Fixes LOCKDEBUG failure with radeon noticed by martin@.

more const

XXX: add a NULL init to avoid a GCC 6 maybe uninit warning.

Remove UB from definition of symbols in i915_reg.h
Kernel Undefined Behavior Sanitizer enforces more warnings in build time.
This makes the build fatal in the drm/i915 code in:
 - intel_ddi_put_crtc_pll(),
 - intel_ddi_clock_get(),
 - intel_ddi_pll_enable(),
 - intel_ddi_setup_hw_pll_state().
The error message in all the cases says:
  error: case label does not reduce to an integer constant
Set the type of the value left shifted to unsigned.
This change is required to build NetBSD/amd64 with KUBSan.

merge in old drm

better match linux del_timer_sync by returning something
(XXX return value?)


Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

merge linux-drm-v4-4-143

Import drm from Linux v4.4.143 (commit a8ea6276d00555387deaaa5eaeb380cd5c17bdc9).

   drivers/gpu/drm      -> sys/external/bsd/drm2/dist/drm
   include/drm          -> sys/external/bsd/drm2/dist/include/drm
   include/uapi/drm     -> sys/external/bsd/drm2/dist/uapi/drm

GPL sources excluded.

update from HEAD

Sync with HEAD

Pull in upstream commit:

Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Mon Jun 9 16:20:46 2014 +0300

    drm/i915: Avoid div-by-zero when pixel_multiplier is zero

On certain platforms pixel_multiplier is read out in
.get_pipe_config(), but it also gets used to calculate the
pixel clock in intel_sdvo_get_config(). If the pipe is disabled
but some SDVO outputs are active, we may end up dividing by zero
in intel_sdvo_get_config().

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=76520

Pull up following revision(s) (requested by riastradh in ticket #1080):
	sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c: revision 1.14
	sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: revision 1.8
	sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c: revision 1.7
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c: revision 1.7
	sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h: revision 1.5
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c: revision 1.3
	sys/external/bsd/drm2/include/linux/pci.h: revision 1.21
	sys/external/bsd/drm2/include/linux/platform_device.h: revision 1.7
	sys/external/bsd/drm2/nouveau/nouveau_pci.c: revision 1.5
Use nv_device_base(dev) like other callers, not dev->pdev->dev.
First step in fixing the struct device nonsense.  This won't actually
fix anything yet until we also fix nv_device_base.
--
dev->dev, not &dev->pdev->dev.
Latter is a charlatan, soon to meet judgment for its sins.
--
dev->dev, not &dev->pdev->dev.
Latter is a mistake that is all my fault.  Oops.
--
Eliminate Linux struct pci_dev::dev, struct platform_device::dev.

Sync with HEAD (as of 26th Dec)

dev->dev, not &dev->pdev->dev.

Latter is a charlatan, soon to meet judgment for its sins.

Pull up following revision(s) (requested by snj in ticket #191):
	sys/external/bsd/drm2/include/linux/io-mapping.h: revision 1.4
	sys/external/bsd/drm2/dist/uapi/drm/drm.h: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_panel.c: revision 1.5
	sys/external/bsd/drm2/dist/uapi/drm/drm.h: revision 1.6
	sys/external/bsd/drm2/dist/drm/i915/intel_drv.h: revision 1.7
	sys/external/bsd/drm2/include/linux/ww_mutex.h: revision 1.7
	sys/external/bsd/drm2/dist/drm/i915/intel_dp.c: revision 1.8
	sys/external/bsd/drm2/dist/drm/i915/i915_ums.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.9
	sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/i915/intel_display.c: revision 1.11
	sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_display.c: revision 1.12
	sys/external/bsd/drm2/include/asm/processor.h: revision 1.3
	sys/external/bsd/drm2/dist/drm/i915/intel_crt.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_tv.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/i915_dma.c: revision 1.11
	sys/external/bsd/drm2/dist/drm/i915/i915_irq.c: revision 1.10
	sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.16
	sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.17
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.6
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.7
	sys/external/bsd/drm2/drm/drm_module.c: revision 1.8
	sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/intel_dsi_cmd.c: revision 1.2
	sys/external/bsd/drm2/i915drm/intelfb.c: revision 1.10
	sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c: revision 1.6
	sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c: revision 1.6
Code cleanup and minor bugfixes for drm2.

Change enum pipe to enum i915_pipe
(enum pipe uses too global of a tag and conflicts with struct pipe).

Rebase to HEAD as of a few days ago.

Rebase.

file intel_sdvo.c was added on branch tls-maxphys on 2014-08-20 00:04:10 +0000

Make it build and boot on my test machines.

Screen blanks on boot on the Ivy Bridge system with

   DRM error in cpt_serr_int_handler: PCH transcoder A FIFO underrun

But after that everything is OK.  Appears to be an upstream problem.
To investigate...

I think there's a cache flushing issue somewhere -- there are little
display artefacts on my T60.

fix merge conflicts

Import drm from Linux 3.15 (commitid 1860e379875dfe7271c649058aeddffe5afd9d0d).

   drivers/gpu/drm      -> sys/external/bsd/drm2/dist/drm
   include/drm          -> sys/external/bsd/drm2/dist/include/drm
   include/uapi/drm     -> sys/external/bsd/drm2/dist/uapi/drm

GPL sources excluded.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

sync with head

file intel_sdvo.c was added on branch yamt-pagecache on 2014-05-22 11:40:53 +0000

Remove ifdef for const fix.

Merge riastradh-drm2 to HEAD.

sync with head

Use a static const, not `= {0}', to zero-initialize in intel_sdvo.c.

Fix const casts in intel_sdvo.c.

intel_sdvo.c needs <linux/bitops.h> and <linux/module.h>.

sync with HEAD and actually get the drm2 import

file intel_sdvo.c was added on branch rmind-smpnet on 2013-08-28 23:59:33 +0000

file intel_sdvo.c was added on branch riastradh-drm2 on 2013-07-23 21:28:22 +0000

Import drm sources from Linux v3.8-rc6.
(commit id 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7)

Linux                   NetBSD
drivers/gpu/drm         sys/external/bsd/drm2/dist/drm
include/drm             sys/external/bsd/drm2/dist/include/drm
include/uapi/drm        sys/external/bsd/drm2/dist/uapi/drm

Files/subtrees excluded because of licence issues, to be either
revisited later (particularly nouveau and radeon, which are mostly
permissively licensed but a number of whose files have no licence
statements), rewritten/ignored, or imported later as kernel modules
under external/gpl2 instead:

   include/drm/drm_fb_cma_helper.h
   include/drm/drm_gem_cma_helper.h
   include/drm/drm_os_linux.h
   include/drm/drm_pciids.h
   include/drm/drm_sysfs.h
   include/drm/drm_usb.h
   include/drm/exynos_drm.h
   include/drm/gma_drm.h
   include/drm/intel-gtt.h
   drm/cirrus
   drm/drm_edid_load.c
   drm/drm_fb_cma_helper.c
   drm/drm_gem_cma_helper.c
   drm/drm_sysfs.c
   drm/drm_trace.h
   drm/drm_trace_points.c
   drm/drm_usb.c
   drm/exynos
   drm/gma500
   drm/i915/i915_trace.h
   drm/i915/i915_trace_points.c
   drm/i915/intel_acpi.c
   drm/mgag200
   drm/nouveau
   drm/radeon
   drm/shmobile
   drm/tegra
   drm/udl
   uapi/exynos_drm.h

Initial revision