commit_title
stringlengths 13
124
| commit_body
stringlengths 0
1.9k
| release_summary
stringclasses 52
values | changes_summary
stringlengths 1
758
| release_affected_domains
stringclasses 33
values | release_affected_drivers
stringclasses 51
values | domain_of_changes
stringlengths 2
571
| language_set
stringclasses 983
values | diffstat_files
int64 1
300
| diffstat_insertions
int64 0
309k
| diffstat_deletions
int64 0
168k
| commit_diff
stringlengths 92
23.4M
| category
stringclasses 108
values | commit_hash
stringlengths 34
40
| related_people
stringlengths 0
370
| domain
stringclasses 21
values | subdomain
stringclasses 241
values | leaf_module
stringlengths 0
912
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
revert "drm/amdgpu: disable gpu reset on vangogh for now"
|
this reverts commit 33cf440d594bfbf81fc20604957bc64f02d0b560. and it will enable mode-2 gpu reset for vangogh, it asks psp firmware version is 00.1a.00.0f or newer.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
re-enable gpu reset on
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 2
| 1
| 4
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c + case chip_vangogh: diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c - /* skip reset on vangogh for now */ - if (adev->asic_type == chip_vangogh) - return 0; -
|
Graphics
|
fe68ceef3412544aa8e2e2ff397f76edfedf6bd9
|
xiaojian du huang rui ray huang amd com
|
drivers
|
gpu
|
amd, amdgpu, drm
|
drm/amd/amdgpu implement tdr advanced mode
|
[why] previous tdr design treats the first job in job_timeout as the bad job. but sometimes a later bad compute job can block a good gfx job and cause an unexpected gfx job timeout because gfx and compute ring share internal gc hw mutually.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
implement tdr advanced mode
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['h', 'c']
| 4
| 156
| 33
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +void amdgpu_device_recheck_guilty_jobs(struct amdgpu_device *adev, + struct amdgpu_hive_info *hive, + struct list_head *device_list_handle, + bool *need_full_reset) +{ + int i, r = 0; + + for (i = 0; i < amdgpu_max_rings; ++i) { + struct amdgpu_ring *ring = adev->rings[i]; + int ret = 0; + struct drm_sched_job *s_job; + + if (!ring || !ring->sched.thread) + continue; + + s_job = list_first_entry_or_null(&ring->sched.pending_list, + struct drm_sched_job, list); + if (s_job == null) + continue; + + /* clear job's guilty and depend the folowing step to decide the real one */ + drm_sched_reset_karma(s_job); + drm_sched_resubmit_jobs_ext(&ring->sched, 1); + + ret = dma_fence_wait_timeout(s_job->s_fence->parent, false, ring->sched.timeout); + if (ret == 0) { /* timeout */ + drm_error("found the real bad job! ring:%s, job_id:%llx ", + ring->sched.name, s_job->id); + + /* set guilty */ + drm_sched_increase_karma(s_job); +retry: + /* do hw reset */ + if (amdgpu_sriov_vf(adev)) { + amdgpu_virt_fini_data_exchange(adev); + r = amdgpu_device_reset_sriov(adev, false); + if (r) + adev->asic_reset_res = r; + } else { + r = amdgpu_do_asic_reset(hive, device_list_handle, + need_full_reset, false); + if (r && r == -eagain) + goto retry; + } + + /* + * add reset counter so that the following + * resubmitted job could flush vmid + */ + atomic_inc(&adev->gpu_reset_counter); + continue; + } + + /* got the hw fence, signal finished fence */ + atomic_dec(ring->sched.score); + dma_fence_get(&s_job->s_fence->finished); + dma_fence_signal(&s_job->s_fence->finished); + dma_fence_put(&s_job->s_fence->finished); + + /* remove node from list and free the job */ + spin_lock(&ring->sched.job_list_lock); + list_del_init(&s_job->list); + spin_unlock(&ring->sched.job_list_lock); + ring->sched.ops->free_job(s_job); + } +} + + int tmp_vram_lost_counter; + tmp_vram_lost_counter = atomic_read(&((adev)->vram_lost_counter)); + /* + * sometimes a later bad compute job can block a good gfx job as gfx + * and compute ring share internal gc hw mutually. we add an additional + * guilty jobs recheck step to find the real guilty job, it synchronously + * submits and pends for the first job being signaled. if it gets timeout, + * we identify it as a real guilty job. + */ + if (amdgpu_gpu_recovery == 2 && + !(tmp_vram_lost_counter < atomic_read(&adev->vram_lost_counter))) + amdgpu_device_recheck_guilty_jobs(tmp_adev, hive, + device_list_handle, &need_full_reset); + diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -module_parm_desc(gpu_recovery, "enable gpu recovery mechanism, (1 = enable, 0 = disable, -1 = auto)"); +module_parm_desc(gpu_recovery, "enable gpu recovery mechanism, (2 = advanced tdr mode, 1 = enable, 0 = disable, -1 = auto)"); diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c - int i; - struct drm_sched_entity *tmp; - struct drm_sched_entity *entity; - struct drm_gpu_scheduler *sched = bad->sched; - - /* don't increase @bad's karma if it's from kernel rq, - * because sometimes gpu hang would cause kernel jobs (like vm updating jobs) - * corrupt but keep in mind that kernel jobs always considered good. - */ - if (bad->s_priority != drm_sched_priority_kernel) { - atomic_inc(&bad->karma); - for (i = drm_sched_priority_min; i < drm_sched_priority_kernel; - i++) { - struct drm_sched_rq *rq = &sched->sched_rq[i]; - - spin_lock(&rq->lock); - list_for_each_entry_safe(entity, tmp, &rq->entities, list) { - if (bad->s_fence->scheduled.context == - entity->fence_context) { - if (atomic_read(&bad->karma) > - bad->sched->hang_limit) - if (entity->guilty) - atomic_set(entity->guilty, 1); - break; - } - } - spin_unlock(&rq->lock); - if (&entity->list != &rq->entities) - break; - } - } + drm_sched_increase_karma_ext(bad, 1); +void drm_sched_reset_karma(struct drm_sched_job *bad) +{ + drm_sched_increase_karma_ext(bad, 0); +} +export_symbol(drm_sched_reset_karma); + +{ + drm_sched_resubmit_jobs_ext(sched, int_max); +} +export_symbol(drm_sched_resubmit_jobs); + +/** + * drm_sched_resubmit_jobs_ext - helper to relunch certain number of jobs from mirror ring list + * + * @sched: scheduler instance + * @max: job numbers to relaunch + * + */ +void drm_sched_resubmit_jobs_ext(struct drm_gpu_scheduler *sched, int max) + int i = 0; + if (i >= max) + break; + + i++; -export_symbol(drm_sched_resubmit_jobs); +export_symbol(drm_sched_resubmit_jobs_ext); + +/** + * drm_sched_increase_karma_ext - update sched_entity guilty flag + * + * @bad: the job guilty of time out + * @type: type for increase/reset karma + * + */ +void drm_sched_increase_karma_ext(struct drm_sched_job *bad, int type) +{ + int i; + struct drm_sched_entity *tmp; + struct drm_sched_entity *entity; + struct drm_gpu_scheduler *sched = bad->sched; + + /* don't change @bad's karma if it's from kernel rq, + * because sometimes gpu hang would cause kernel jobs (like vm updating jobs) + * corrupt but keep in mind that kernel jobs always considered good. + */ + if (bad->s_priority != drm_sched_priority_kernel) { + if (type == 0) + atomic_set(&bad->karma, 0); + else if (type == 1) + atomic_inc(&bad->karma); + + for (i = drm_sched_priority_min; i < drm_sched_priority_kernel; + i++) { + struct drm_sched_rq *rq = &sched->sched_rq[i]; + + spin_lock(&rq->lock); + list_for_each_entry_safe(entity, tmp, &rq->entities, list) { + if (bad->s_fence->scheduled.context == + entity->fence_context) { + if (entity->guilty) + atomic_set(entity->guilty, type); + break; + } + } + spin_unlock(&rq->lock); + if (&entity->list != &rq->entities) + break; + } + } +} +export_symbol(drm_sched_increase_karma_ext); diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h +void drm_sched_resubmit_jobs_ext(struct drm_gpu_scheduler *sched, int max); +void drm_sched_reset_karma(struct drm_sched_job *bad); +void drm_sched_increase_karma_ext(struct drm_sched_job *bad, int type);
|
Graphics
|
e6c6338f393b74ac0b303d567bb918b44ae7ad75
|
jack zhang
|
drivers
|
gpu
|
amd, amdgpu, drm, scheduler
|
drm/amd/amdgpu: add aspm support on polaris
|
add aspm support on polaris
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
aspm support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 1
| 191
| 2
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c +#define ixpcie_lc_l1_pm_substate 0x100100c6 +#define pcie_lc_l1_pm_substate__lc_l1_substates_override_en_mask 0x00000001l +#define pcie_lc_l1_pm_substate__lc_pci_pm_l1_2_override_mask 0x00000002l +#define pcie_lc_l1_pm_substate__lc_pci_pm_l1_1_override_mask 0x00000004l +#define pcie_lc_l1_pm_substate__lc_aspm_l1_2_override_mask 0x00000008l +#define pcie_lc_l1_pm_substate__lc_aspm_l1_1_override_mask 0x00000010l +#define ixpcie_l1_pm_sub_cntl 0x378 +#define pcie_l1_pm_sub_cntl__aspm_l1_2_en_mask 0x00000004l +#define pcie_l1_pm_sub_cntl__aspm_l1_1_en_mask 0x00000008l +#define pcie_l1_pm_sub_cntl__pci_pm_l1_2_en_mask 0x00000001l +#define pcie_l1_pm_sub_cntl__pci_pm_l1_1_en_mask 0x00000002l +#define pcie_lc_cntl6__lc_l1_powerdown_mask 0x00200000l +#define link_cap 0x64 +#define pcie_link_cap__clock_power_management_mask 0x00040000l +#define ixcpm_control 0x1400118 +#define ixpcie_lc_cntl7 0x100100bc +#define pcie_lc_cntl7__lc_l1_sideband_clkreq_pdwn_en_mask 0x00000400l +#define pcie_lc_cntl__lc_l0s_inactivity_default 0x00000007 +#define pcie_lc_cntl__lc_l1_inactivity_default 0x00000009 +#define cpm_control__clkreqb_ungate_txclk_enable_mask 0x01000000l +#define pcie_l1_pm_sub_cntl 0x378 +#define asic_is_p22(asic_type, rid) ((asic_type >= chip_polaris10) && \ + (asic_type <= chip_polaris12) && \ + (rid >= 0x6e)) +static void vi_enable_aspm(struct amdgpu_device *adev) +{ + u32 data, orig; + + orig = data = rreg32_pcie(ixpcie_lc_cntl); + data |= pcie_lc_cntl__lc_l0s_inactivity_default << + pcie_lc_cntl__lc_l0s_inactivity__shift; + data |= pcie_lc_cntl__lc_l1_inactivity_default << + pcie_lc_cntl__lc_l1_inactivity__shift; + data &= ~pcie_lc_cntl__lc_pmi_to_l1_dis_mask; + data |= pcie_lc_cntl__lc_delay_l1_exit_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_cntl, data); +} + + u32 data, data1, orig; + bool bl1ss = false; + bool bclkreqsupport = true; - if (amdgpu_aspm == 0) + if (amdgpu_aspm != 1) - /* todo */ + if (adev->flags & amd_is_apu || + adev->asic_type < chip_polaris10) + return; + + orig = data = rreg32_pcie(ixpcie_lc_cntl); + data &= ~pcie_lc_cntl__lc_l1_inactivity_mask; + data &= ~pcie_lc_cntl__lc_l0s_inactivity_mask; + data |= pcie_lc_cntl__lc_pmi_to_l1_dis_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_cntl, data); + + orig = data = rreg32_pcie(ixpcie_lc_n_fts_cntl); + data &= ~pcie_lc_n_fts_cntl__lc_xmit_n_fts_mask; + data |= 0x0024 << pcie_lc_n_fts_cntl__lc_xmit_n_fts__shift; + data |= pcie_lc_n_fts_cntl__lc_xmit_n_fts_override_en_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_n_fts_cntl, data); + + orig = data = rreg32_pcie(ixpcie_lc_cntl3); + data |= pcie_lc_cntl3__lc_go_to_recovery_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_cntl3, data); + + orig = data = rreg32_pcie(ixpcie_p_cntl); + data |= pcie_p_cntl__p_ignore_edb_err_mask; + if (orig != data) + wreg32_pcie(ixpcie_p_cntl, data); + + data = rreg32_pcie(ixpcie_lc_l1_pm_substate); + pci_read_config_dword(adev->pdev, pcie_l1_pm_sub_cntl, &data1); + if (data & pcie_lc_l1_pm_substate__lc_l1_substates_override_en_mask && + (data & (pcie_lc_l1_pm_substate__lc_pci_pm_l1_2_override_mask | + pcie_lc_l1_pm_substate__lc_pci_pm_l1_1_override_mask | + pcie_lc_l1_pm_substate__lc_aspm_l1_2_override_mask | + pcie_lc_l1_pm_substate__lc_aspm_l1_1_override_mask))) { + bl1ss = true; + } else if (data1 & (pcie_l1_pm_sub_cntl__aspm_l1_2_en_mask | + pcie_l1_pm_sub_cntl__aspm_l1_1_en_mask | + pcie_l1_pm_sub_cntl__pci_pm_l1_2_en_mask | + pcie_l1_pm_sub_cntl__pci_pm_l1_1_en_mask)) { + bl1ss = true; + } + + orig = data = rreg32_pcie(ixpcie_lc_cntl6); + data |= pcie_lc_cntl6__lc_l1_powerdown_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_cntl6, data); + + orig = data = rreg32_pcie(ixpcie_lc_link_width_cntl); + data |= pcie_lc_link_width_cntl__lc_dyn_lanes_pwr_state_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_link_width_cntl, data); + + pci_read_config_dword(adev->pdev, link_cap, &data); + if (!(data & pcie_link_cap__clock_power_management_mask)) + bclkreqsupport = false; + + if (bclkreqsupport) { + orig = data = rreg32_smc(ixthm_clk_cntl); + data &= ~(thm_clk_cntl__cmon_clk_sel_mask | thm_clk_cntl__tmon_clk_sel_mask); + data |= (1 << thm_clk_cntl__cmon_clk_sel__shift) | + (1 << thm_clk_cntl__tmon_clk_sel__shift); + if (orig != data) + wreg32_smc(ixthm_clk_cntl, data); + + orig = data = rreg32_smc(ixmisc_clk_ctrl); + data &= ~(misc_clk_ctrl__deep_sleep_clk_sel_mask | + misc_clk_ctrl__zclk_sel_mask | misc_clk_ctrl__dft_sms_pg_clk_sel_mask); + data |= (1 << misc_clk_ctrl__deep_sleep_clk_sel__shift) | + (1 << misc_clk_ctrl__zclk_sel__shift); + data |= (0x20 << misc_clk_ctrl__dft_sms_pg_clk_sel__shift); + if (orig != data) + wreg32_smc(ixmisc_clk_ctrl, data); + + orig = data = rreg32_smc(ixcg_clkpin_cntl); + data |= cg_clkpin_cntl__xtalin_divide_mask; + if (orig != data) + wreg32_smc(ixcg_clkpin_cntl, data); + + orig = data = rreg32_smc(ixcg_clkpin_cntl_2); + data |= cg_clkpin_cntl_2__enable_xclk_mask; + if (orig != data) + wreg32_smc(ixcg_clkpin_cntl, data); + + orig = data = rreg32_smc(ixmpll_bypassclk_sel); + data &= ~mpll_bypassclk_sel__mpll_clkout_sel_mask; + data |= (4 << mpll_bypassclk_sel__mpll_clkout_sel__shift); + if (orig != data) + wreg32_smc(ixmpll_bypassclk_sel, data); + + orig = data = rreg32_pcie(ixcpm_control); + data |= (cpm_control__refclk_xstclk_enable_mask | + cpm_control__clkreqb_ungate_txclk_enable_mask); + if (orig != data) + wreg32_pcie(ixcpm_control, data); + + orig = data = rreg32_pcie(ixpcie_config_cntl); + data &= ~pcie_config_cntl__dyn_clk_latency_mask; + data |= (0xe << pcie_config_cntl__dyn_clk_latency__shift); + if (orig != data) + wreg32_pcie(ixpcie_config_cntl, data); + + orig = data = rreg32(mmbif_clk_ctrl); + data |= bif_clk_ctrl__bif_xstclk_ready_mask; + if (orig != data) + wreg32(mmbif_clk_ctrl, data); + + orig = data = rreg32_pcie(ixpcie_lc_cntl7); + data |= pcie_lc_cntl7__lc_l1_sideband_clkreq_pdwn_en_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_cntl7, data); + + orig = data = rreg32_pcie(ixpcie_hw_debug); + data |= pcie_hw_debug__hw_01_debug_mask; + if (orig != data) + wreg32_pcie(ixpcie_hw_debug, data); + + orig = data = rreg32_pcie(ixpcie_lc_cntl2); + data |= pcie_lc_cntl2__lc_allow_pdwn_in_l23_mask; + data |= pcie_lc_cntl2__lc_allow_pdwn_in_l1_mask; + if (bl1ss) + data &= ~pcie_lc_cntl2__lc_allow_pdwn_in_l1_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_cntl2, data); + + } + + vi_enable_aspm(adev); + + data = rreg32_pcie(ixpcie_lc_n_fts_cntl); + data1 = rreg32_pcie(ixpcie_lc_status1); + if (((data & pcie_lc_n_fts_cntl__lc_n_fts_mask) == pcie_lc_n_fts_cntl__lc_n_fts_mask) && + data1 & pcie_lc_status1__lc_reverse_xmit_mask && + data1 & pcie_lc_status1__lc_reverse_rcvr_mask) { + orig = data = rreg32_pcie(ixpcie_lc_cntl); + data &= ~pcie_lc_cntl__lc_l0s_inactivity_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_cntl, data); + } + + if ((adev->asic_type == chip_polaris12 && + !(asicid_is_p23(adev->pdev->device, adev->pdev->revision))) || + asic_is_p22(adev->asic_type, adev->external_rev_id)) { + orig = data = rreg32_pcie(ixpcie_lc_training_cntl); + data &= ~pcie_lc_training_cntl__lc_disable_training_bit_arch_mask; + if (orig != data) + wreg32_pcie(ixpcie_lc_training_cntl, data); + }
|
Graphics
|
b960cb25b1e36a930a0d31097e932f313bdee9b0
|
kenneth feng alex deucher alexander deucher amd com
|
drivers
|
gpu
|
amd, amdgpu, drm
|
drm/amd/amdgpu: enable aspm on navi1x
|
enable aspm on navi1x for the benifit of system power consumption without performance hurt.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
aspm support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 1
| 2
| 8
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c - if ((adev->asic_type >= chip_sienna_cichlid) && - !(adev->flags & amd_is_apu) && + if (!(adev->flags & amd_is_apu) && - /* - * the aspm function is not fully enabled and verified on - * navi yet. temporarily skip this until aspm enabled. - */ - if ((adev->asic_type >= chip_sienna_cichlid) && - !(adev->flags & amd_is_apu) && + if (!(adev->flags & amd_is_apu) &&
|
Graphics
|
3273f8b9e652f2c363c262c0fc90764f159b4cc6
|
kenneth feng alex deucher alexander deucher amd com
|
drivers
|
gpu
|
amd, amdgpu, drm
|
drm/amd/amdgpu: enable aspm on vega
|
enable aspm on vega to save the power without the performance hurt.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
aspm support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 3
| 257
| 3
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c --- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +#define smnpcie_lc_cntl 0x11140280 +#define smnpcie_lc_cntl3 0x111402d4 +#define smnpcie_lc_cntl6 0x111402ec +#define smnpcie_lc_cntl7 0x111402f0 +#define smnnbif_mgcg_ctrl_lclk 0x1013a05c +#define nbif_mgcg_ctrl_lclk__nbif_mgcg_reg_dis_lclk_mask 0x00001000l +#define rcc_bif_strap3__strap_vlink_aspm_idle_timer_mask 0x0000ffffl +#define rcc_bif_strap3__strap_vlink_pm_l1_entry_timer_mask 0xffff0000l +#define smnrcc_ep_dev0_0_ep_pcie_tx_ltr_cntl 0x10123530 +#define smnbif_cfg_dev0_epf0_device_cntl2 0x1014008c +#define smnbif_cfg_dev0_epf0_pcie_ltr_cap 0x10140324 +#define smnpswusp0_pcie_lc_cntl2 0x111402c4 +#define smnrcc_bif_strap2 0x10123488 +#define smnrcc_bif_strap3 0x1012348c +#define smnrcc_bif_strap5 0x10123494 +#define bif_cfg_dev0_epf0_device_cntl2__ltr_en_mask 0x0400l +#define rcc_bif_strap5__strap_vlink_ldn_entry_timer_mask 0x0000ffffl +#define rcc_bif_strap2__strap_ltr_in_aspml1_dis_mask 0x00004000l +#define rcc_bif_strap3__strap_vlink_aspm_idle_timer__shift 0x0 +#define rcc_bif_strap3__strap_vlink_pm_l1_entry_timer__shift 0x10 +#define rcc_bif_strap5__strap_vlink_ldn_entry_timer__shift 0x0 + +static void nbio_v6_1_program_ltr(struct amdgpu_device *adev) +{ + uint32_t def, data; + + wreg32_pcie(smnrcc_ep_dev0_0_ep_pcie_tx_ltr_cntl, 0x75eb); + + def = data = rreg32_pcie(smnrcc_bif_strap2); + data &= ~rcc_bif_strap2__strap_ltr_in_aspml1_dis_mask; + if (def != data) + wreg32_pcie(smnrcc_bif_strap2, data); + + def = data = rreg32_pcie(smnrcc_ep_dev0_0_ep_pcie_tx_ltr_cntl); + data &= ~ep_pcie_tx_ltr_cntl__ltr_priv_msg_dis_in_pm_non_d0_mask; + if (def != data) + wreg32_pcie(smnrcc_ep_dev0_0_ep_pcie_tx_ltr_cntl, data); + + def = data = rreg32_pcie(smnbif_cfg_dev0_epf0_device_cntl2); + data |= bif_cfg_dev0_epf0_device_cntl2__ltr_en_mask; + if (def != data) + wreg32_pcie(smnbif_cfg_dev0_epf0_device_cntl2, data); +} + +static void nbio_v6_1_program_aspm(struct amdgpu_device *adev) +{ + uint32_t def, data; + + def = data = rreg32_pcie(smnpcie_lc_cntl); + data &= ~pcie_lc_cntl__lc_l1_inactivity_mask; + data &= ~pcie_lc_cntl__lc_l0s_inactivity_mask; + data |= pcie_lc_cntl__lc_pmi_to_l1_dis_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl7); + data |= pcie_lc_cntl7__lc_nbif_aspm_input_en_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl7, data); + + def = data = rreg32_pcie(smnnbif_mgcg_ctrl_lclk); + data |= nbif_mgcg_ctrl_lclk__nbif_mgcg_reg_dis_lclk_mask; + if (def != data) + wreg32_pcie(smnnbif_mgcg_ctrl_lclk, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl3); + data |= pcie_lc_cntl3__lc_dsc_dont_enter_l23_after_pme_ack_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl3, data); + + def = data = rreg32_pcie(smnrcc_bif_strap3); + data &= ~rcc_bif_strap3__strap_vlink_aspm_idle_timer_mask; + data &= ~rcc_bif_strap3__strap_vlink_pm_l1_entry_timer_mask; + if (def != data) + wreg32_pcie(smnrcc_bif_strap3, data); + + def = data = rreg32_pcie(smnrcc_bif_strap5); + data &= ~rcc_bif_strap5__strap_vlink_ldn_entry_timer_mask; + if (def != data) + wreg32_pcie(smnrcc_bif_strap5, data); + + def = data = rreg32_pcie(smnbif_cfg_dev0_epf0_device_cntl2); + data &= ~bif_cfg_dev0_epf0_device_cntl2__ltr_en_mask; + if (def != data) + wreg32_pcie(smnbif_cfg_dev0_epf0_device_cntl2, data); + + wreg32_pcie(smnbif_cfg_dev0_epf0_pcie_ltr_cap, 0x10011001); + + def = data = rreg32_pcie(smnpswusp0_pcie_lc_cntl2); + data |= pswusp0_pcie_lc_cntl2__lc_allow_pdwn_in_l1_mask | + pswusp0_pcie_lc_cntl2__lc_allow_pdwn_in_l23_mask; + data &= ~pswusp0_pcie_lc_cntl2__lc_rcv_l0_to_rcv_l0s_dis_mask; + if (def != data) + wreg32_pcie(smnpswusp0_pcie_lc_cntl2, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl6); + data |= pcie_lc_cntl6__lc_l1_powerdown_mask | + pcie_lc_cntl6__lc_rx_l0s_standby_en_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl6, data); + + nbio_v6_1_program_ltr(adev); + + def = data = rreg32_pcie(smnrcc_bif_strap3); + data |= 0x5de0 << rcc_bif_strap3__strap_vlink_aspm_idle_timer__shift; + data |= 0x0010 << rcc_bif_strap3__strap_vlink_pm_l1_entry_timer__shift; + if (def != data) + wreg32_pcie(smnrcc_bif_strap3, data); + + def = data = rreg32_pcie(smnrcc_bif_strap5); + data |= 0x0010 << rcc_bif_strap5__strap_vlink_ldn_entry_timer__shift; + if (def != data) + wreg32_pcie(smnrcc_bif_strap5, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl); + data &= ~pcie_lc_cntl__lc_l0s_inactivity_mask; + data |= 0x9 << pcie_lc_cntl__lc_l1_inactivity__shift; + data |= 0x1 << pcie_lc_cntl__lc_pmi_to_l1_dis__shift; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl3); + data &= ~pcie_lc_cntl3__lc_dsc_dont_enter_l23_after_pme_ack_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl3, data); +} + + .program_aspm = nbio_v6_1_program_aspm, diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +#define smnpcie_lc_cntl 0x11140280 +#define smnpcie_lc_cntl3 0x111402d4 +#define smnpcie_lc_cntl6 0x111402ec +#define smnpcie_lc_cntl7 0x111402f0 +#define smnrcc_bif_strap3 0x1012348c +#define rcc_bif_strap3__strap_vlink_aspm_idle_timer_mask 0x0000ffffl +#define rcc_bif_strap3__strap_vlink_pm_l1_entry_timer_mask 0xffff0000l +#define smnrcc_bif_strap5 0x10123494 +#define rcc_bif_strap5__strap_vlink_ldn_entry_timer_mask 0x0000ffffl +#define smnbif_cfg_dev0_epf0_device_cntl2 0x1014008c +#define bif_cfg_dev0_epf0_device_cntl2__ltr_en_mask 0x0400l +#define smnbif_cfg_dev0_epf0_pcie_ltr_cap 0x10140324 +#define smnpswusp0_pcie_lc_cntl2 0x111402c4 +#define smnrcc_ep_dev0_0_ep_pcie_tx_ltr_cntl 0x10123538 +#define smnrcc_bif_strap2 0x10123488 +#define rcc_bif_strap2__strap_ltr_in_aspml1_dis_mask 0x00004000l +#define rcc_bif_strap3__strap_vlink_aspm_idle_timer__shift 0x0 +#define rcc_bif_strap3__strap_vlink_pm_l1_entry_timer__shift 0x10 +#define rcc_bif_strap5__strap_vlink_ldn_entry_timer__shift 0x0 +static void nbio_v7_4_program_ltr(struct amdgpu_device *adev) +{ + uint32_t def, data; + + wreg32_pcie(smnrcc_ep_dev0_0_ep_pcie_tx_ltr_cntl, 0x75eb); + + def = data = rreg32_pcie(smnrcc_bif_strap2); + data &= ~rcc_bif_strap2__strap_ltr_in_aspml1_dis_mask; + if (def != data) + wreg32_pcie(smnrcc_bif_strap2, data); + + def = data = rreg32_pcie(smnrcc_ep_dev0_0_ep_pcie_tx_ltr_cntl); + data &= ~ep_pcie_tx_ltr_cntl__ltr_priv_msg_dis_in_pm_non_d0_mask; + if (def != data) + wreg32_pcie(smnrcc_ep_dev0_0_ep_pcie_tx_ltr_cntl, data); + + def = data = rreg32_pcie(smnbif_cfg_dev0_epf0_device_cntl2); + data |= bif_cfg_dev0_epf0_device_cntl2__ltr_en_mask; + if (def != data) + wreg32_pcie(smnbif_cfg_dev0_epf0_device_cntl2, data); +} + +static void nbio_v7_4_program_aspm(struct amdgpu_device *adev) +{ + uint32_t def, data; + + def = data = rreg32_pcie(smnpcie_lc_cntl); + data &= ~pcie_lc_cntl__lc_l1_inactivity_mask; + data &= ~pcie_lc_cntl__lc_l0s_inactivity_mask; + data |= pcie_lc_cntl__lc_pmi_to_l1_dis_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl7); + data |= pcie_lc_cntl7__lc_nbif_aspm_input_en_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl7, data); + + def = data = rreg32_pcie(smnnbif_mgcg_ctrl_lclk); + data |= nbif_mgcg_ctrl_lclk__nbif_mgcg_reg_dis_lclk_mask; + if (def != data) + wreg32_pcie(smnnbif_mgcg_ctrl_lclk, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl3); + data |= pcie_lc_cntl3__lc_dsc_dont_enter_l23_after_pme_ack_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl3, data); + + def = data = rreg32_pcie(smnrcc_bif_strap3); + data &= ~rcc_bif_strap3__strap_vlink_aspm_idle_timer_mask; + data &= ~rcc_bif_strap3__strap_vlink_pm_l1_entry_timer_mask; + if (def != data) + wreg32_pcie(smnrcc_bif_strap3, data); + + def = data = rreg32_pcie(smnrcc_bif_strap5); + data &= ~rcc_bif_strap5__strap_vlink_ldn_entry_timer_mask; + if (def != data) + wreg32_pcie(smnrcc_bif_strap5, data); + + def = data = rreg32_pcie(smnbif_cfg_dev0_epf0_device_cntl2); + data &= ~bif_cfg_dev0_epf0_device_cntl2__ltr_en_mask; + if (def != data) + wreg32_pcie(smnbif_cfg_dev0_epf0_device_cntl2, data); + + wreg32_pcie(smnbif_cfg_dev0_epf0_pcie_ltr_cap, 0x10011001); + + def = data = rreg32_pcie(smnpswusp0_pcie_lc_cntl2); + data |= pswusp0_pcie_lc_cntl2__lc_allow_pdwn_in_l1_mask | + pswusp0_pcie_lc_cntl2__lc_allow_pdwn_in_l23_mask; + data &= ~pswusp0_pcie_lc_cntl2__lc_rcv_l0_to_rcv_l0s_dis_mask; + if (def != data) + wreg32_pcie(smnpswusp0_pcie_lc_cntl2, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl6); + data |= pcie_lc_cntl6__lc_l1_powerdown_mask | + pcie_lc_cntl6__lc_rx_l0s_standby_en_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl6, data); + + nbio_v7_4_program_ltr(adev); + + def = data = rreg32_pcie(smnrcc_bif_strap3); + data |= 0x5de0 << rcc_bif_strap3__strap_vlink_aspm_idle_timer__shift; + data |= 0x0010 << rcc_bif_strap3__strap_vlink_pm_l1_entry_timer__shift; + if (def != data) + wreg32_pcie(smnrcc_bif_strap3, data); + + def = data = rreg32_pcie(smnrcc_bif_strap5); + data |= 0x0010 << rcc_bif_strap5__strap_vlink_ldn_entry_timer__shift; + if (def != data) + wreg32_pcie(smnrcc_bif_strap5, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl); + data &= ~pcie_lc_cntl__lc_l0s_inactivity_mask; + data |= 0x9 << pcie_lc_cntl__lc_l1_inactivity__shift; + data |= 0x1 << pcie_lc_cntl__lc_pmi_to_l1_dis__shift; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl, data); + + def = data = rreg32_pcie(smnpcie_lc_cntl3); + data &= ~pcie_lc_cntl3__lc_dsc_dont_enter_l23_after_pme_ack_mask; + if (def != data) + wreg32_pcie(smnpcie_lc_cntl3, data); +} + + .program_aspm = nbio_v7_4_program_aspm, diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c - - if (amdgpu_aspm == 0) + if (amdgpu_aspm != 1) - /* todo */ + if (!(adev->flags & amd_is_apu) && + (adev->nbio.funcs->program_aspm)) + adev->nbio.funcs->program_aspm(adev);
|
Graphics
|
9d015c0dae05e7650000f2d51f3c80c6c77fdde5
|
kenneth feng alex deucher alexander deucher amd com
|
drivers
|
gpu
|
amd, amdgpu, drm
|
drm/amd/pm: add lightsbr smu msg support
|
this new msg provide the interface for driver to enable/disable the light secondary bus reset support from smu. when enabled, smu will only do minimum nbio response to the sbr request and leave the real hw reset to be handled by driver later. when disabled (default state),smu will pass the request to psp for a hw reset
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add lightsbr smu msg support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['h', 'c']
| 7
| 42
| 0
|
--- diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h + + /** + * @set_light_sbr: set light sbr mode for the smu. + */ + int (*set_light_sbr)(struct smu_context *smu, bool enable); +int smu_set_light_sbr(struct smu_context *smu, bool enable); + diff --git a/drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h b/drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h --- a/drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +++ b/drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +/* paramater for msg_lightsbr + * 1 -- enable light secondary bus reset, only do nbio respond without further handling, + * leave driver to handle the real reset + * 0 -- disable lightsbr, default behavior, smu will pass the reset to psp + */ +#define ppsmc_msg_lightsbr 0x42 + diff --git a/drivers/gpu/drm/amd/pm/inc/smu_types.h b/drivers/gpu/drm/amd/pm/inc/smu_types.h --- a/drivers/gpu/drm/amd/pm/inc/smu_types.h +++ b/drivers/gpu/drm/amd/pm/inc/smu_types.h + __smu_dummy_map(lightsbr), \ diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h --- a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +++ b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +int smu_v11_0_set_light_sbr(struct smu_context *smu, bool enable); + diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +int smu_set_light_sbr(struct smu_context *smu, bool enable) +{ + int ret = 0; + + mutex_lock(&smu->mutex); + if (smu->ppt_funcs->set_light_sbr) + ret = smu->ppt_funcs->set_light_sbr(smu, enable); + mutex_unlock(&smu->mutex); + + return ret; +} + + diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c + msg_map(lightsbr, ppsmc_msg_lightsbr, 0), + .set_light_sbr = smu_v11_0_set_light_sbr, diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +int smu_v11_0_set_light_sbr(struct smu_context *smu, bool enable) +{ + int ret = 0; + + ret = smu_cmn_send_smc_msg_with_param(smu, smu_msg_lightsbr, enable ? 1 : 0, null); + + return ret; +} + +
|
Graphics
|
0e92159640f3708070d87dba79617dc7e7b63c1d
|
shaoyunl evan quan evan quan amd com
|
drivers
|
gpu
|
amd, drm, inc, pm, smu11, swsmu
|
drm/amd/pm: add a new sysfs entry for default power limit
|
driver doesn't keep the default bootup power limit and expose it to user. as requested we add it in driver.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add a new sysfs entry for default power limit
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['h', 'c']
| 11
| 75
| 15
|
--- diff --git a/drivers/gpu/drm/amd/include/kgd_pp_interface.h b/drivers/gpu/drm/amd/include/kgd_pp_interface.h --- a/drivers/gpu/drm/amd/include/kgd_pp_interface.h +++ b/drivers/gpu/drm/amd/include/kgd_pp_interface.h - int (*get_power_limit)(void *handle, uint32_t *limit, bool default_limit); + int (*get_power_limit)(void *handle, uint32_t *limit, uint32_t *max_limit, + bool default_limit); diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c + uint32_t max_limit = 0; - pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, true); - size = snprintf(buf, page_size, "%u ", limit * 1000000); + pp_funcs->get_power_limit(adev->powerplay.pp_handle, + &limit, &max_limit, true); + size = snprintf(buf, page_size, "%u ", max_limit * 1000000); - pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, false); + pp_funcs->get_power_limit(adev->powerplay.pp_handle, + &limit, null, false); +static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct amdgpu_device *adev = dev_get_drvdata(dev); + const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + int limit_type = to_sensor_dev_attr(attr)->index; + uint32_t limit = limit_type << 24; + ssize_t size; + int r; + + if (amdgpu_in_reset(adev)) + return -eperm; + + r = pm_runtime_get_sync(adev_to_drm(adev)->dev); + if (r < 0) { + pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); + return r; + } + + if (is_support_sw_smu(adev)) { + smu_get_power_limit(&adev->smu, &limit, smu_ppt_limit_default); + size = snprintf(buf, page_size, "%u ", limit * 1000000); + } else if (pp_funcs && pp_funcs->get_power_limit) { + pp_funcs->get_power_limit(adev->powerplay.pp_handle, + &limit, null, true); + size = snprintf(buf, page_size, "%u ", limit * 1000000); + } else { + size = snprintf(buf, page_size, " "); + } + + pm_runtime_mark_last_busy(adev_to_drm(adev)->dev); + pm_runtime_put_autosuspend(adev_to_drm(adev)->dev); + + return size; +} +static sensor_device_attr(power1_cap_default, s_irugo, amdgpu_hwmon_show_power_cap_default, null, 0); +static sensor_device_attr(power2_cap_default, s_irugo, amdgpu_hwmon_show_power_cap_default, null, 1); + &sensor_dev_attr_power1_cap_default.dev_attr.attr, + &sensor_dev_attr_power2_cap_default.dev_attr.attr, - attr == &sensor_dev_attr_power1_cap.dev_attr.attr)) + attr == &sensor_dev_attr_power1_cap.dev_attr.attr || + attr == &sensor_dev_attr_power1_cap_default.dev_attr.attr)) + attr == &sensor_dev_attr_power2_cap_default.dev_attr.attr || diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h + smu_ppt_limit_default, + uint32_t default_power_limit; diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h --- a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +++ b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h + uint32_t default_fast_ppt_limit; diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c --- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c -static int pp_get_power_limit(void *handle, uint32_t *limit, bool default_limit) +static int pp_get_power_limit(void *handle, uint32_t *limit, + uint32_t *max_limit, bool default_limit) - if (hwmgr->od_enabled) { - *limit *= (100 + hwmgr->platform_descriptor.tdpodlimit); - *limit /= 100; + if (max_limit) { + *max_limit = *limit; + if (hwmgr->od_enabled) { + *max_limit *= (100 + hwmgr->platform_descriptor.tdpodlimit); + *max_limit /= 100; + } diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c + case smu_ppt_limit_default: + *limit = smu->default_power_limit; + break; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c - smu->current_power_limit = power_limit; + smu->current_power_limit = smu->default_power_limit = power_limit; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c - smu->current_power_limit = power_limit; + smu->current_power_limit = smu->default_power_limit = power_limit; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c - smu->current_power_limit = power_limit; + smu->current_power_limit = smu->default_power_limit = power_limit; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c - smu->current_power_limit = ppt_limit / 1000; + smu->current_power_limit = smu->default_power_limit = ppt_limit / 1000; - power_context->current_fast_ppt_limit = ppt_limit / 1000; + power_context->current_fast_ppt_limit = + power_context->default_fast_ppt_limit = ppt_limit / 1000; + case smu_ppt_limit_default: + *ppt_limit = power_context->default_fast_ppt_limit; + break; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c - smu->current_power_limit = power_limit; + smu->current_power_limit = smu->default_power_limit = power_limit;
|
Graphics
|
6e58941cff74aac49659abc8b27740c0457c2397
|
eric huang evan quan evan quan amd com
|
drivers
|
gpu
|
amd, drm, inc, include, pm, powerplay, smu11, smu13, swsmu
|
drm/amdgpu: add additional sienna cichlid pci id
|
add new did.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add additional sienna cichlid pci id
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 1
| 1
| 0
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c + {0x1002, 0x73af, pci_any_id, pci_any_id, 0, 0, chip_sienna_cichlid},
|
Graphics
|
ed098aa34c51d81a16de93f59c64e36a136fd201
|
alex deucher guchun chen guchun chen amd com
|
drivers
|
gpu
|
amd, amdgpu, drm
|
drm/amdgpu: added support for dynamic gecc
|
updated host to send boot config to psp to enable gecc for sienna cichlid
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add support for dynamic gecc
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 1
| 23
| 0
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +static int psp_boot_config_set(struct amdgpu_device *adev) +{ + struct psp_context *psp = &adev->psp; + struct psp_gfx_cmd_resp *cmd = psp->cmd; + + if (adev->asic_type != chip_sienna_cichlid) + return 0; + + memset(cmd, 0, sizeof(struct psp_gfx_cmd_resp)); + + cmd->cmd_id = gfx_cmd_id_boot_cfg; + cmd->cmd.boot_cfg.sub_cmd = bootcfg_cmd_set; + cmd->cmd.boot_cfg.boot_config = boot_config_gecc; + cmd->cmd.boot_cfg.boot_config_valid = boot_config_gecc; + + return psp_cmd_submit_buf(psp, null, cmd, psp->fence_buf_mc_addr); +} + + ret = psp_boot_config_set(adev); + if (ret) { + drm_warn("psp set boot config@ "); + } +
|
Graphics
|
cad7b7510c4437687ea3ae3d0ecaf0982f1e235f
|
john clements hawking zhang hawking zhang amd com
|
drivers
|
gpu
|
amd, amdgpu, drm
|
drm/amdgpu: enable tmz by default on raven asics
|
this has been stable for a while.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
enable tmz by default on raven asics
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 2
| 12
| 2
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -int amdgpu_tmz; +int amdgpu_tmz = -1; /* auto */ -module_parm_desc(tmz, "enable tmz feature (-1 = auto, 0 = off (default), 1 = on)"); +module_parm_desc(tmz, "enable tmz feature (-1 = auto (default), 0 = off, 1 = on)"); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c + if (amdgpu_tmz == 0) { + adev->gmc.tmz_enabled = false; + dev_info(adev->dev, + "trusted memory zone (tmz) feature disabled (cmd line) "); + } else { + adev->gmc.tmz_enabled = true; + dev_info(adev->dev, + "trusted memory zone (tmz) feature enabled "); + } + break;
|
Graphics
|
58aa7790193af8fdf655b200d1ec46ad92899fbf
|
alex deucher christian k nig christian koenig amd com
|
drivers
|
gpu
|
amd, amdgpu, drm
|
drm/amdgpu: set amdgpu.noretry=1 for arcturus
|
setting amdgpu.noretry=1 as default for arcturus.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
set amdgpu.noretry=1 for arcturus
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 1
| 1
| 0
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c + case chip_arcturus:
|
Graphics
|
9b7f1e04677a9742ff93c66222c01bb30a24779a
|
philip cox kent russell kent russell amd com
|
drivers
|
gpu
|
amd, amdgpu, drm
|
drm/amd/display: add a backlight module option
|
there seem devices that don't work with the aux channel backlight control. for allowing such users to test with the other backlight control method, provide a new module option, aux_backlight, to specify enabling or disabling the aux backport support explicitly. as default, the aux support is detected by the hardware capability.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add a backlight module option
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['h', 'c']
| 3
| 10
| 0
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +extern int amdgpu_backlight; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +int amdgpu_backlight = -1; +module_parm_desc(backlight, "backlight control (0 = pwm, 1 = aux, -1 auto (default))"); +module_param_named(backlight, amdgpu_backlight, bint, 0444); + diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c + if (amdgpu_backlight == 0) + caps->aux_support = false; + else if (amdgpu_backlight == 1) + caps->aux_support = true; +
|
Graphics
|
7c20984795d7c26a8993ca2bd2c1cbad312b2ffa
|
takashi iwai
|
drivers
|
gpu
|
amd, amdgpu, amdgpu_dm, display, drm
|
drm/amd/display: add debugfs entry for lttpr register status
|
[why] functionality of lttpr is reporter through the dpcd register
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add debugfs entry for lttpr register status
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 1
| 66
| 0
|
--- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +static int dp_lttpr_status_show(struct seq_file *m, void *d) +{ + char *data; + struct amdgpu_dm_connector *connector = file_inode(m->file)->i_private; + struct dc_link *link = connector->dc_link; + uint32_t read_size = 1; + uint8_t repeater_count = 0; + + data = kzalloc(read_size, gfp_kernel); + if (!data) + return 0; + + dm_helpers_dp_read_dpcd(link->ctx, link, 0xf0002, data, read_size); + + switch ((uint8_t)*data) { + case 0x80: + repeater_count = 1; + break; + case 0x40: + repeater_count = 2; + break; + case 0x20: + repeater_count = 3; + break; + case 0x10: + repeater_count = 4; + break; + case 0x8: + repeater_count = 5; + break; + case 0x4: + repeater_count = 6; + break; + case 0x2: + repeater_count = 7; + break; + case 0x1: + repeater_count = 8; + break; + case 0x0: + repeater_count = 0; + break; + default: + repeater_count = (uint8_t)*data; + break; + } + + seq_printf(m, "phy repeater count: %d ", repeater_count); + + dm_helpers_dp_read_dpcd(link->ctx, link, 0xf0003, data, read_size); + + if ((uint8_t)*data == 0x55) + seq_printf(m, "phy repeater mode: transparent "); + else if ((uint8_t)*data == 0xaa) + seq_printf(m, "phy repeater mode: non-transparent "); + else if ((uint8_t)*data == 0x00) + seq_printf(m, "phy repeater mode: non lttpr "); + else + seq_printf(m, "phy repeater mode: read error "); + + kfree(data); + return 0; +} + +define_show_attribute(dp_lttpr_status); + {"lttpr_status", &dp_lttpr_status_fops},
|
Graphics
|
37bedd9929b925b25a4b5397d7f32d3600067688
|
aurabindo pillai
|
drivers
|
gpu
|
amd, amdgpu_dm, display, drm
|
drm/amd/display: add debugfs to control dmub trace buffer events
|
[why] we want to have a debugfs interface to enable or disable dmcub trace buffer events.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add debugfs to control dmub trace buffer events
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['h', 'c']
| 2
| 38
| 0
|
--- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h + bool dmcub_trace_event_en; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +#include "dc/dc_dmub_srv.h" +/* + * set dmcub trace event irq enable or disable. + * usage to enable dmcub trace event irq: echo 1 > /sys/kernel/debug/dri/0/amdgpu_dm_dmcub_trace_event_en + * usage to disable dmcub trace event irq: echo 0 > /sys/kernel/debug/dri/0/amdgpu_dm_dmcub_trace_event_en + */ +static int dmcub_trace_event_state_set(void *data, u64 val) +{ + struct amdgpu_device *adev = data; + + if (val == 1 || val == 0) { + dc_dmub_trace_event_control(adev->dm.dc, val); + adev->dm.dmcub_trace_event_en = (bool)val; + } else + return 0; + + return 0; +} + +/* + * the interface doesn't need get function, so it will return the + * value of zero + * usage: cat /sys/kernel/debug/dri/0/amdgpu_dm_dmcub_trace_event_en + */ +static int dmcub_trace_event_state_get(void *data, u64 *val) +{ + struct amdgpu_device *adev = data; + + *val = adev->dm.dmcub_trace_event_en; + return 0; +} + +define_debugfs_attribute(dmcub_trace_event_state_fops, dmcub_trace_event_state_get, + dmcub_trace_event_state_set, "%llu "); + + debugfs_create_file_unsafe("amdgpu_dm_dmcub_trace_event_en", 0644, root, + adev, &dmcub_trace_event_state_fops);
|
Graphics
|
46a83eba276cd3aecea6d7f1045bcf8cb1b83820
|
leo hanghong ma
|
drivers
|
gpu
|
amd, amdgpu_dm, display, drm
|
drm/amd/display: add debugfs to repress hpd and hpr_rx irqs
|
[why] for debugging reasons it can be beneficial to disable any hotplug and dp shortpulse interrupt handling.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add debugfs to repress hpd and hpr_rx irqs
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['h', 'c']
| 3
| 45
| 2
|
--- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -#ifdef config_drm_amd_dc_hdcp +#ifdef config_drm_amd_dc_hdcp + if (adev->dm.disable_hpd_irq) + return; + + if (adev->dm.disable_hpd_irq) + return; + + diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h - * copyright 2015 advanced micro devices, inc. + * copyright (c) 2015-2020 advanced micro devices, inc. all rights reserved. + bool disable_hpd_irq; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c + +/* + * disables all hpd and hpd rx interrupt handling in the + * driver when set to 1. default is 0. + */ +static int disable_hpd_set(void *data, u64 val) +{ + struct amdgpu_device *adev = data; + + adev->dm.disable_hpd_irq = (bool)val; + + return 0; +} + + +/* + * returns 1 if hpd and hprx interrupt handling is disabled, + * 0 otherwise. + */ +static int disable_hpd_get(void *data, u64 *val) +{ + struct amdgpu_device *adev = data; + + *val = adev->dm.disable_hpd_irq; + + return 0; +} + +define_debugfs_attribute(disable_hpd_ops, disable_hpd_get, + disable_hpd_set, "%llu "); + + + debugfs_create_file_unsafe("amdgpu_dm_disable_hpd", 0644, root, adev, + &disable_hpd_ops); +
|
Graphics
|
b972b4f913eee029233be88e1a84a7cc36073c8b
|
harry wentland
|
drivers
|
gpu
|
amd, amdgpu_dm, display, drm
|
drm/amd/display: add max bpc debugfs
|
[why] useful for testing when setting a max bpc value higher than the default is required
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add max bpc debugfs
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ']
|
['c']
| 1
| 152
| 1
|
--- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c + +/* + * function description: read max_requested_bpc property from the connector + * + * access it with the following command: + * + * cat /sys/kernel/debug/dri/0/dp-x/max_bpc + * + */ +static ssize_t dp_max_bpc_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) +{ + struct amdgpu_dm_connector *aconnector = file_inode(f)->i_private; + struct drm_connector *connector = &aconnector->base; + struct drm_device *dev = connector->dev; + struct dm_connector_state *state; + ssize_t result = 0; + char *rd_buf = null; + char *rd_buf_ptr = null; + const uint32_t rd_buf_size = 10; + int r; + + rd_buf = kcalloc(rd_buf_size, sizeof(char), gfp_kernel); + + if (!rd_buf) + return -enomem; + + mutex_lock(&dev->mode_config.mutex); + drm_modeset_lock(&dev->mode_config.connection_mutex, null); + + if (connector->state == null) + goto unlock; + + state = to_dm_connector_state(connector->state); + + rd_buf_ptr = rd_buf; + snprintf(rd_buf_ptr, rd_buf_size, + "%u ", + state->base.max_requested_bpc); + + while (size) { + if (*pos >= rd_buf_size) + break; + + r = put_user(*(rd_buf + result), buf); + if (r) { + result = r; /* r = -efault */ + goto unlock; + } + buf += 1; + size -= 1; + *pos += 1; + result += 1; + } +unlock: + drm_modeset_unlock(&dev->mode_config.connection_mutex); + mutex_unlock(&dev->mode_config.mutex); + kfree(rd_buf); + return result; +} + + +/* + * function description: set max_requested_bpc property on the connector + * + * this function will not force the input bpc on connector, it will only + * change the max value. this is equivalent to setting max_bpc through + * xrandr. + * + * the bpc value written must be >= 6 and <= 16. values outside of this + * range will result in errors. + * + * bpc values: + * 0x6 - 6 bpc + * 0x8 - 8 bpc + * 0xa - 10 bpc + * 0xc - 12 bpc + * 0x10 - 16 bpc + * + * write the max_bpc in the following way: + * + * echo 0x6 > /sys/kernel/debug/dri/0/dp-x/max_bpc + * + */ +static ssize_t dp_max_bpc_write(struct file *f, const char __user *buf, + size_t size, loff_t *pos) +{ + struct amdgpu_dm_connector *aconnector = file_inode(f)->i_private; + struct drm_connector *connector = &aconnector->base; + struct dm_connector_state *state; + struct drm_device *dev = connector->dev; + char *wr_buf = null; + uint32_t wr_buf_size = 42; + int max_param_num = 1; + long param[1] = {0}; + uint8_t param_nums = 0; + + if (size == 0) + return -einval; + + wr_buf = kcalloc(wr_buf_size, sizeof(char), gfp_kernel); + + if (!wr_buf) { + drm_debug_driver("no memory to allocate write buffer "); + return -enospc; + } + + if (parse_write_buffer_into_params(wr_buf, size, + (long *)param, buf, + max_param_num, + ¶m_nums)) { + kfree(wr_buf); + return -einval; + } + + if (param_nums <= 0) { + drm_debug_driver("user data not be read "); + kfree(wr_buf); + return -einval; + } + + if (param[0] < 6 || param[0] > 16) { + drm_debug_driver("bad max_bpc value "); + kfree(wr_buf); + return -einval; + } + + mutex_lock(&dev->mode_config.mutex); + drm_modeset_lock(&dev->mode_config.connection_mutex, null); + + if (connector->state == null) + goto unlock; + + state = to_dm_connector_state(connector->state); + state->base.max_requested_bpc = param[0]; +unlock: + drm_modeset_unlock(&dev->mode_config.connection_mutex); + mutex_unlock(&dev->mode_config.mutex); + + kfree(wr_buf); + return size; +} + +static const struct file_operations dp_max_bpc_debugfs_fops = { + .owner = this_module, + .read = dp_max_bpc_read, + .write = dp_max_bpc_write, + .llseek = default_llseek +}; + - {"dp_dsc_fec_support", &dp_dsc_fec_support_fops} + {"dp_dsc_fec_support", &dp_dsc_fec_support_fops}, + {"max_bpc", &dp_max_bpc_debugfs_fops}
|
Graphics
|
cca912e0a6b49f45c588e7cc50d3ad13bb859ca5
|
eryk brol
|
drivers
|
gpu
|
amd, amdgpu_dm, display, drm
|
drm/amdkfd: add aldebaran kfd support
|
add initial kfd support.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add aldebaran kfd support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ', 'amdkfd']
|
['c']
| 8
| 29
| 1
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +#include "mmhub_v1_7.h" diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c + case chip_aldebaran: diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c + case chip_aldebaran: diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c + [chip_aldebaran] = &arcturus_kfd2kgd, +static const struct kfd_device_info aldebaran_device_info = { + .asic_family = chip_aldebaran, + .asic_name = "aldebaran", + .max_pasid_bits = 16, + .max_no_of_hqd = 24, + .doorbell_size = 8, + .ih_ring_entry_size = 8 * sizeof(uint32_t), + .event_interrupt_class = &event_interrupt_class_v9, + .num_of_watch_points = 4, + .mqd_size_aligned = mqd_size_aligned, + .supports_cwsr = true, + .needs_iommu_device = false, + .needs_pci_atomics = false, + .num_sdma_engines = 2, + .num_xgmi_sdma_engines = 3, + .num_sdma_queues_per_engine = 8, +}; + + [chip_aldebaran] = {&aldebaran_device_info, null}, - } else if (kfd->device_info->asic_family == chip_arcturus) { + } else if (kfd->device_info->asic_family == chip_arcturus + || kfd->device_info->asic_family == chip_aldebaran) { diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c + case chip_aldebaran: diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c --- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c + case chip_aldebaran: diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c --- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c + case chip_aldebaran: diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c + case chip_aldebaran:
|
Graphics
|
36e22d59dd10e4261079dcec6a44fc22b2a435e0
|
yong zhao
|
drivers
|
gpu
|
amd, amdgpu, amdkfd, drm
|
drm/amdkfd: add kernel parameter to stop queue eviction on vm fault
|
this is to keep wavefront context for debug purpose
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add kernel parameter to stop queue eviction on vm fault
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['amdgpu ', 'amdkfd']
|
['h', 'c']
| 4
| 18
| 4
|
--- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +/** + * doc: no_queue_eviction_on_vm_fault (int) + * if set, process queues will not be evicted on gpuvm fault. this is to keep the wavefront context for debugging (0 = queue eviction, 1 = no queue eviction). the default is 0 (queue eviction). + */ +int amdgpu_no_queue_eviction_on_vm_fault = 0; +module_parm_desc(no_queue_eviction_on_vm_fault, "no queue eviction on vm fault (0 = queue eviction, 1 = no queue eviction)"); +module_param_named(no_queue_eviction_on_vm_fault, amdgpu_no_queue_eviction_on_vm_fault, int, 0444); diff --git a/drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c b/drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c --- a/drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c +++ b/drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c - ihre->source_id == cik_intsrc_gfx_page_inv_fault || - ihre->source_id == cik_intsrc_gfx_mem_prot_fault; + ((ihre->source_id == cik_intsrc_gfx_page_inv_fault || + ihre->source_id == cik_intsrc_gfx_mem_prot_fault) && + !amdgpu_no_queue_eviction_on_vm_fault); diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c --- a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c - client_id == soc15_ih_clientid_vmc || + ((client_id == soc15_ih_clientid_vmc || - client_id == soc15_ih_clientid_utcl2; + client_id == soc15_ih_clientid_utcl2) && + !amdgpu_no_queue_eviction_on_vm_fault); diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +/* + * don't evict process queues on vm fault + */ +extern int amdgpu_no_queue_eviction_on_vm_fault; +
|
Graphics
|
6d909c5da0166d62ffc656990fe1fff9ae66b37f
|
oak zeng felix kuehling felix kuehling amd com
|
drivers
|
gpu
|
amd, amdgpu, amdkfd, drm
|
x86/gpu: add alderlake-s stolen memory support
|
alderlake-s is a gen 12 based hybrid processor architecture. as it belongs to gen 12 family, it uses the same gtt stolen memory settings like its predecessors - icl(gen 11) and tgl(gen 12). inherit gen11 and gen 9 quirks for determining base and size of stolen memory.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 1
| 0
|
--- diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c + intel_adls_ids(&gen11_early_ops),
|
Graphics
|
c6bba9e5fedf1391a52f1cd21d1ed6ac5fd99e55
|
caz yokoyama
|
arch
|
x86
|
kernel
|
drm/i915/adl_s: add pch support
|
add support for alderpoint(adp) pch used with alderlake-s.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 2
| 10
| 1
|
- use drm_dbg_kms and drm_warn_on based on jani's feedback.(aswarup) --- diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c --- a/drivers/gpu/drm/i915/intel_pch.c +++ b/drivers/gpu/drm/i915/intel_pch.c + case intel_pch_adp_device_id_type: + drm_dbg_kms(&dev_priv->drm, "found alder lake pch "); + drm_warn_on(&dev_priv->drm, !is_alderlake_s(dev_priv)); + return pch_adp; - if (is_tigerlake(dev_priv) || is_rocketlake(dev_priv)) + if (is_alderlake_s(dev_priv)) + id = intel_pch_adp_device_id_type; + else if (is_tigerlake(dev_priv) || is_rocketlake(dev_priv)) diff --git a/drivers/gpu/drm/i915/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h --- a/drivers/gpu/drm/i915/intel_pch.h +++ b/drivers/gpu/drm/i915/intel_pch.h + pch_adp, /* alder lake pch */ +#define intel_pch_adp_device_id_type 0x7a80 +#define has_pch_adp(dev_priv) (intel_pch_type(dev_priv) == pch_adp)
|
Graphics
|
fb51970b8d115842821005032d0a34f7fec7f5fe
|
anusha srivatsa
|
drivers
|
gpu
|
drm, i915
|
drm/i915/adl_s: add interrupt support
|
adls follows icp/tgp like interrupts.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 1
| 2
|
--- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c - else if (has_pch_tgp(dev_priv) || has_pch_jsp(dev_priv) || - has_pch_icp(dev_priv) || has_pch_mcc(dev_priv)) + else if (intel_pch_type(dev_priv) >= pch_icp)
|
Graphics
|
fa58c9e4e36402ae3dfaa05914df9d22e2d4d458
|
anusha srivatsa
|
drivers
|
gpu
|
drm, i915
|
drm/i915/adl_s: add phys for alderlake s
|
alderlake-s has 5 combo phys, add reg definitions for combo phys and update the port to phy helper for adl-s.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 2
| 11
| 6
|
- change is_gen() >= 12 to is_tigerlake() in intel_phy_is_tc() --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c + else if (is_alderlake_s(dev_priv)) + return phy <= phy_e; - if (is_dg1(dev_priv) || is_rocketlake(dev_priv)) - return false; - else if (intel_gen(dev_priv) >= 12) + if (is_tigerlake(dev_priv)) - else if (intel_gen(dev_priv) >= 11 && !is_jsl_ehl(dev_priv)) + else if (is_icelake(dev_priv)) - if ((is_dg1(i915) || is_rocketlake(i915)) && port >= port_tc1) + if (is_alderlake_s(i915) && port >= port_tc1) + return phy_b + port - port_tc1; + else if ((is_dg1(i915) || is_rocketlake(i915)) && port >= port_tc1) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h +#define _adl_combophy_e 0x16b000 + - _rkl_combophy_d) + _rkl_combophy_d, \ + _adl_combophy_e)
|
Graphics
|
a84b4bd1172b8394d5540b51b3cf0f76c0dff17a
|
anusha srivatsa
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/adl_s: configure dpll for adl-s
|
add changes for configuring dpll for adl-s - reusing dg1 dpll 2 & dpll 3 for adl-s - extend cnl macro to choose dpll_enable for adl-s. - select cfgcr0 and cfgcr1 for adl-s plls.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 2
| 54
| 6
|
- reusing dg1 dpll 2 & dpll 3 for adl-s - extend cnl macro to choose dpll_enable - select cfgcr0 and cfgcr1 for adl-s plls. --- diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c - if (is_dg1(dev_priv)) { + if (is_alderlake_s(dev_priv)) { + dpll_mask = + bit(dpll_id_dg1_dpll3) | + bit(dpll_id_dg1_dpll2) | + bit(dpll_id_icl_dpll1) | + bit(dpll_id_icl_dpll0); + } else if (is_dg1(dev_priv)) { - if (is_dg1(dev_priv)) { + if (is_alderlake_s(dev_priv)) { + hw_state->cfgcr0 = intel_de_read(dev_priv, adls_dpll_cfgcr0(id)); + hw_state->cfgcr1 = intel_de_read(dev_priv, adls_dpll_cfgcr1(id)); + } else if (is_dg1(dev_priv)) { - if (is_dg1(dev_priv)) { + if (is_alderlake_s(dev_priv)) { + cfgcr0_reg = adls_dpll_cfgcr0(id); + cfgcr1_reg = adls_dpll_cfgcr1(id); + } else if (is_dg1(dev_priv)) { +static const struct dpll_info adls_plls[] = { + { "dpll 0", &combo_pll_funcs, dpll_id_icl_dpll0, 0 }, + { "dpll 1", &combo_pll_funcs, dpll_id_icl_dpll1, 0 }, + { "dpll 2", &combo_pll_funcs, dpll_id_dg1_dpll2, 0 }, + { "dpll 3", &combo_pll_funcs, dpll_id_dg1_dpll3, 0 }, + { }, +}; + +static const struct intel_dpll_mgr adls_pll_mgr = { + .dpll_info = adls_plls, + .get_dplls = icl_get_dplls, + .put_dplls = icl_put_dplls, + .update_ref_clks = icl_update_dpll_ref_clks, + .dump_hw_state = icl_dump_hw_state, +}; + - if (is_dg1(dev_priv)) + if (is_alderlake_s(dev_priv)) + dpll_mgr = &adls_pll_mgr; + else if (is_dg1(dev_priv)) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h -#define hdport_dpll_used_mask reg_genmask(14, 12) +#define hdport_dpll_used_mask reg_genmask(15, 12) +#define _adls_dpll2_enable 0x46018 +#define _adls_dpll3_enable 0x46030 -#define cnl_dpll_enable(pll) _mmio_pll(pll, dpll0_enable, dpll1_enable) +#define cnl_dpll_enable(pll) _mmio_pll3(pll, dpll0_enable, dpll1_enable, \ + _adls_dpll2_enable, _adls_dpll3_enable) +/* for adl-s dpll4_cfgcr0/1 are used to control dpll2 */ +#define _adls_dpll3_cfgcr0 0x1642c0 +#define _adls_dpll4_cfgcr0 0x164294 +#define adls_dpll_cfgcr0(pll) _mmio_pll3(pll, _tgl_dpll0_cfgcr0, \ + _tgl_dpll1_cfgcr0, \ + _adls_dpll4_cfgcr0, \ + _adls_dpll3_cfgcr0) + +#define _adls_dpll3_cfgcr1 0x1642c4 +#define _adls_dpll4_cfgcr1 0x164298 +#define adls_dpll_cfgcr1(pll) _mmio_pll3(pll, _tgl_dpll0_cfgcr1, \ + _tgl_dpll1_cfgcr1, \ + _adls_dpll4_cfgcr1, \ + _adls_dpll3_cfgcr1) +
|
Graphics
|
80d0f76588b55e5226d65776bb5fca7360837f1d
|
aditya swarup
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/adl_s: configure port clock registers for adl-s
|
add changes to configure port clock registers for adl-s. combo phy port clocks are configured by dpclka_cfgcr0 and dpclka_cfgcr1 registers.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 3
| 72
| 24
|
- use reg variable to assign adls specific registers inorder to replace - reuse icl_get_ddi_pll() for adls to fix issue with updating active --- diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c - u32 val; + u32 val, mask, sel; + i915_reg_t reg; + + if (is_alderlake_s(dev_priv)) { + reg = adls_dpclka_cfgcr(phy); + mask = adls_dpclka_cfgcr_ddi_clk_sel_mask(phy); + sel = ((pll->info->id) << adls_dpclka_cfgcr_ddi_shift(phy)); + } else if (is_rocketlake(dev_priv)) { + reg = icl_dpclka_cfgcr0; + mask = rkl_dpclka_cfgcr0_ddi_clk_sel_mask(phy); + sel = rkl_dpclka_cfgcr0_ddi_clk_sel(pll->info->id, phy); + } else { + reg = icl_dpclka_cfgcr0; + mask = icl_dpclka_cfgcr0_ddi_clk_sel_mask(phy); + sel = icl_dpclka_cfgcr0_ddi_clk_sel(pll->info->id, phy); + } - val = intel_de_read(dev_priv, icl_dpclka_cfgcr0); + val = intel_de_read(dev_priv, reg); - u32 mask, sel; - - if (is_rocketlake(dev_priv)) { - mask = rkl_dpclka_cfgcr0_ddi_clk_sel_mask(phy); - sel = rkl_dpclka_cfgcr0_ddi_clk_sel(pll->info->id, phy); - } else { - mask = icl_dpclka_cfgcr0_ddi_clk_sel_mask(phy); - sel = icl_dpclka_cfgcr0_ddi_clk_sel(pll->info->id, phy); - } - - intel_de_write(dev_priv, icl_dpclka_cfgcr0, val); - intel_de_posting_read(dev_priv, icl_dpclka_cfgcr0); + intel_de_write(dev_priv, reg, val); + intel_de_posting_read(dev_priv, reg); - intel_de_write(dev_priv, icl_dpclka_cfgcr0, val); + intel_de_write(dev_priv, reg, val); + i915_reg_t reg; - val = intel_de_read(dev_priv, icl_dpclka_cfgcr0); + if (is_alderlake_s(dev_priv)) + reg = adls_dpclka_cfgcr(phy); + else + reg = icl_dpclka_cfgcr0; + + val = intel_de_read(dev_priv, reg); - intel_de_write(dev_priv, icl_dpclka_cfgcr0, val); + + intel_de_write(dev_priv, reg, val); + bool ddi_clk_off; + i915_reg_t reg; - val = intel_de_read(dev_priv, icl_dpclka_cfgcr0); - bool ddi_clk_off = val & icl_dpclka_cfgcr0_clk_off(dev_priv, - phy); + + if (is_alderlake_s(dev_priv)) + reg = adls_dpclka_cfgcr(phy); + else + reg = icl_dpclka_cfgcr0; + + val = intel_de_read(dev_priv, reg); + ddi_clk_off = val & icl_dpclka_cfgcr0_clk_off(dev_priv, + phy); - intel_de_write(dev_priv, icl_dpclka_cfgcr0, val); + intel_de_write(dev_priv, reg, val); diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c + i915_reg_t reg; - if (is_rocketlake(dev_priv)) { + if (is_alderlake_s(dev_priv)) { + reg = adls_dpclka_cfgcr(phy); + mask = adls_dpclka_cfgcr_ddi_clk_sel_mask(phy); + shift = adls_dpclka_cfgcr_ddi_shift(phy); + } else if (is_rocketlake(dev_priv)) { + reg = icl_dpclka_cfgcr0; + reg = icl_dpclka_cfgcr0; - temp = intel_de_read(dev_priv, icl_dpclka_cfgcr0) & mask; + temp = intel_de_read(dev_priv, reg) & mask; diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h -#define icl_dpclka_cfgcr0_ddi_clk_off(phy) (1 << _pick(phy, 10, 11, 24)) +#define icl_dpclka_cfgcr0_ddi_clk_off(phy) (1 << _pick(phy, 10, 11, 24, 4, 5)) +/* adls clocks */ +#define _adls_dpclka_cfgcr0 0x164280 +#define _adls_dpclka_cfgcr1 0x1642bc +#define adls_dpclka_cfgcr(phy) _mmio_phy((phy) / 3, \ + _adls_dpclka_cfgcr0, \ + _adls_dpclka_cfgcr1) +#define adls_dpclka_cfgcr_ddi_shift(phy) (((phy) % 3) * 2) +/* adls dpclka_cfgcr0 ddi mask */ +#define adls_dpclka_ddii_sel_mask reg_genmask(5, 4) +#define adls_dpclka_ddib_sel_mask reg_genmask(3, 2) +#define adls_dpclka_ddia_sel_mask reg_genmask(1, 0) +/* adls dpclka_cfgcr1 ddi mask */ +#define adls_dpclka_ddik_sel_mask reg_genmask(3, 2) +#define adls_dpclka_ddij_sel_mask reg_genmask(1, 0) +#define adls_dpclka_cfgcr_ddi_clk_sel_mask(phy) _pick((phy), \ + adls_dpclka_ddia_sel_mask, \ + adls_dpclka_ddib_sel_mask, \ + adls_dpclka_ddii_sel_mask, \ + adls_dpclka_ddij_sel_mask, \ + adls_dpclka_ddik_sel_mask) +
|
Graphics
|
d6d2bc996e45073db16d1da1dde2116f3c86955c
|
aditya swarup
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/adl_s: initialize display for adl-s
|
initialize display outputs for adl-s. adl-s has 5 display outputs -> 1 edp, 2 hdmi and 2 dp++ outputs.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 7
| 1
|
- use port_tcx instead of port_d,e.. to stay consistent --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c - if (is_dg1(dev_priv) || is_rocketlake(dev_priv)) { + if (is_alderlake_s(dev_priv)) { + intel_ddi_init(dev_priv, port_a); + intel_ddi_init(dev_priv, port_tc1); + intel_ddi_init(dev_priv, port_tc2); + intel_ddi_init(dev_priv, port_tc3); + intel_ddi_init(dev_priv, port_tc4); + } else if (is_dg1(dev_priv) || is_rocketlake(dev_priv)) {
|
Graphics
|
e341c618acde39ea9bfd83d8262b4c4c70e92a5b
|
aditya swarup
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/adl_s: add adl-s ddc pin mapping
|
adl-s requires tc pins to set up ddc for combo phy b, c, d and e. combo phy a still uses the old ddc pin mapping.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 3
| 35
| 2
|
- modify adls_port_to_ddc_pin() to make phy_a the special case for --- diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c +static const u8 adls_ddc_pin_map[] = { + [icl_ddc_bus_ddi_a] = gmbus_pin_1_bxt, + [adls_ddc_bus_port_tc1] = gmbus_pin_9_tc1_icp, + [adls_ddc_bus_port_tc2] = gmbus_pin_10_tc2_icp, + [adls_ddc_bus_port_tc3] = gmbus_pin_11_tc3_icp, + [adls_ddc_bus_port_tc4] = gmbus_pin_12_tc4_icp, +}; + - if (intel_pch_type(dev_priv) >= pch_dg1) { + if (has_pch_adp(dev_priv)) { + ddc_pin_map = adls_ddc_pin_map; + n_entries = array_size(adls_ddc_pin_map); + } else if (intel_pch_type(dev_priv) >= pch_dg1) { diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c +static u8 adls_port_to_ddc_pin(struct drm_i915_private *dev_priv, enum port port) +{ + enum phy phy = intel_port_to_phy(dev_priv, port); + + warn_on(port == port_b || port == port_c); + + /* + * pin mapping for adl-s requires tc pins for all combo phy outputs + * except first combo output. + */ + if (phy == phy_a) + return gmbus_pin_1_bxt; + + return gmbus_pin_9_tc1_icp + phy - phy_b; +} + - if (intel_pch_type(dev_priv) >= pch_dg1) + if (has_pch_adp(dev_priv)) + ddc_pin = adls_port_to_ddc_pin(dev_priv, port); + else if (intel_pch_type(dev_priv) >= pch_dg1) diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h --- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h +++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h + adls_ddc_bus_port_tc1 = 0x2, + adls_ddc_bus_port_tc2, + adls_ddc_bus_port_tc3, + adls_ddc_bus_port_tc4
|
Graphics
|
7dc1f92f27f8d7046ff4bd4cb113b1f522b175e8
|
aditya swarup
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/adl_s: add vbt port and aux channel settings for adls
|
- adl-s driver internal mapping uses port d, e, f, g for combo phy b, c, d and e. - add adls specific port mappings for vbt port dvo settings. - select appropriate aux ch specific to adls based on port mapping.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 46
| 11
|
- adl-s driver internal mapping uses port d, e, f, g for combo phy b, c, - add adls specific port mappings for vbt port dvo settings. - select appropriate aux ch specific to adls based on port mapping. --- diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c + /* + * alderlake s ports used in the driver are port_a, port_d, port_e, + * port_f and port_g, we need to map that to correct vbt sections. + */ + static const int adls_port_mapping[][3] = { + [port_a] = { dvo_port_hdmia, dvo_port_dpa, -1 }, + [port_b] = { -1 }, + [port_c] = { -1 }, + [port_tc1] = { dvo_port_hdmib, dvo_port_dpb, -1 }, + [port_tc2] = { dvo_port_hdmic, dvo_port_dpc, -1 }, + [port_tc3] = { dvo_port_hdmid, dvo_port_dpd, -1 }, + [port_tc4] = { dvo_port_hdmie, dvo_port_dpe, -1 }, + }; - if (is_dg1(dev_priv) || is_rocketlake(dev_priv)) + if (is_alderlake_s(dev_priv)) + return __dvo_port_to_port(array_size(adls_port_mapping), + array_size(adls_port_mapping[0]), + adls_port_mapping, + dvo_port); + else if (is_dg1(dev_priv) || is_rocketlake(dev_priv)) + /* + * rkl/dg1 vbt uses phy based mapping. combo phys a,b,c,d + * map to ddi a,b,tc1,tc2 respectively. + * + * adl-s vbt uses phy based mapping. combo phys a,b,c,d,e + * map to ddi a,tc1,tc2,tc3,tc4 respectively. + */ - aux_ch = aux_ch_b; + if (is_alderlake_s(dev_priv)) + aux_ch = aux_ch_usbc1; + else + aux_ch = aux_ch_b; - /* - * rkl/dg1 vbt uses phy based mapping. combo phys a,b,c,d - * map to ddi a,b,tc1,tc2 respectively. - */ - aux_ch = (is_dg1(dev_priv) || is_rocketlake(dev_priv)) ? - aux_ch_usbc1 : aux_ch_c; + if (is_alderlake_s(dev_priv)) + aux_ch = aux_ch_usbc2; + else if (is_dg1(dev_priv) || is_rocketlake(dev_priv)) + aux_ch = aux_ch_usbc1; + else + aux_ch = aux_ch_c; - aux_ch = (is_dg1(dev_priv) || is_rocketlake(dev_priv)) ? - aux_ch_usbc2 : aux_ch_d; + if (is_alderlake_s(dev_priv)) + aux_ch = aux_ch_usbc3; + else if (is_dg1(dev_priv) || is_rocketlake(dev_priv)) + aux_ch = aux_ch_usbc2; + else + aux_ch = aux_ch_d; - aux_ch = aux_ch_e; + if (is_alderlake_s(dev_priv)) + aux_ch = aux_ch_usbc4; + else + aux_ch = aux_ch_e;
|
Graphics
|
18c283df5a0ece65ac1cfc6f1e2867fd24636252
|
aditya swarup matt roper matthew d roper intel com
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/adl_s: update combo phy master/slave relationships
|
adl-s switches up which phys are considered a master to other phys; phy-c is no longer a master, but phy-d is now.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 9
| 2
|
--- diff --git a/drivers/gpu/drm/i915/display/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c --- a/drivers/gpu/drm/i915/display/intel_combo_phy.c +++ b/drivers/gpu/drm/i915/display/intel_combo_phy.c + * adl-s: + * a(master) -> b(slave), c(slave) + * d(master) -> e(slave) - if ((is_dg1(dev_priv) || is_rocketlake(dev_priv)) && phy == phy_c) + if (phy == phy_a) + else if (is_alderlake_s(dev_priv)) + return phy == phy_d; + else if (is_dg1(dev_priv) || is_rocketlake(dev_priv)) + return phy == phy_c; - return phy == phy_a; + return false;
|
Graphics
|
52401eb8e3fced097628507e1d3056cc81d51ed9
|
matt roper anusha srivatsa anusha srivatsa intel com
|
drivers
|
gpu
|
display, drm, i915
|
perf record: create two hybrid 'cycles' events by default
|
when evlist is empty, for example no '-e' specified in perf record, one default 'cycles' event is added to evlist.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
alderlake-s platform enabling
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'build', 'c']
| 7
| 77
| 9
|
------------------------------------------------------------ ------------------------------------------------------------ ------------------------------------------------------------ ------------------------------------------------------------ ------------------------------------------------------------ --- diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c +#include "util/pmu-hybrid.h" +#include "util/evlist-hybrid.h" - if (rec->evlist->core.nr_entries == 0 && - __evlist__add_default(rec->evlist, !record.opts.no_samples) < 0) { - pr_err("not enough memory for event selector list "); - goto out; + if (rec->evlist->core.nr_entries == 0) { + if (perf_pmu__has_hybrid()) { + err = evlist__add_default_hybrid(rec->evlist, + !record.opts.no_samples); + } else { + err = __evlist__add_default(rec->evlist, + !record.opts.no_samples); + } + + if (err < 0) { + pr_err("not enough memory for event selector list "); + goto out; + } diff --git a/tools/perf/util/build b/tools/perf/util/build --- a/tools/perf/util/build +++ b/tools/perf/util/build +perf-y += evlist-hybrid.o diff --git a/tools/perf/util/evlist-hybrid.c b/tools/perf/util/evlist-hybrid.c --- /dev/null +++ b/tools/perf/util/evlist-hybrid.c +// spdx-license-identifier: gpl-2.0-only +#include <errno.h> +#include <inttypes.h> +#include "cpumap.h" +#include "evlist.h" +#include "evsel.h" +#include "../perf.h" +#include "util/pmu-hybrid.h" +#include "util/evlist-hybrid.h" +#include <unistd.h> +#include <stdlib.h> +#include <linux/err.h> +#include <linux/string.h> +#include <perf/evlist.h> +#include <perf/evsel.h> +#include <perf/cpumap.h> + +int evlist__add_default_hybrid(struct evlist *evlist, bool precise) +{ + struct evsel *evsel; + struct perf_pmu *pmu; + __u64 config; + struct perf_cpu_map *cpus; + + perf_pmu__for_each_hybrid_pmu(pmu) { + config = perf_count_hw_cpu_cycles | + ((__u64)pmu->type << perf_pmu_type_shift); + evsel = evsel__new_cycles(precise, perf_type_hardware, + config); + if (!evsel) + return -enomem; + + cpus = perf_cpu_map__get(pmu->cpus); + evsel->core.cpus = cpus; + evsel->core.own_cpus = perf_cpu_map__get(cpus); + evsel->pmu_name = strdup(pmu->name); + evlist__add(evlist, evsel); + } + + return 0; +} diff --git a/tools/perf/util/evlist-hybrid.h b/tools/perf/util/evlist-hybrid.h --- /dev/null +++ b/tools/perf/util/evlist-hybrid.h +/* spdx-license-identifier: gpl-2.0 */ +#ifndef __perf_evlist_hybrid_h +#define __perf_evlist_hybrid_h + +#include <linux/compiler.h> +#include <linux/kernel.h> +#include "evlist.h" +#include <unistd.h> + +int evlist__add_default_hybrid(struct evlist *evlist, bool precise); + +#endif /* __perf_evlist_hybrid_h */ diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c +#include "util/evlist-hybrid.h" - struct evsel *evsel = evsel__new_cycles(precise); + struct evsel *evsel; + evsel = evsel__new_cycles(precise, perf_type_hardware, + perf_count_hw_cpu_cycles); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c -struct evsel *evsel__new_cycles(bool precise) +struct evsel *evsel__new_cycles(bool precise, __u32 type, __u64 config) - .type = perf_type_hardware, - .config = perf_count_hw_cpu_cycles, + .type = type, + .config = config, diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h -struct evsel *evsel__new_cycles(bool precise); +struct evsel *evsel__new_cycles(bool precise, __u32 type, __u64 config);
|
Graphics
|
b53a0755d5c2d19b13db897d6faf4969e03e45ae
|
jin yao
|
tools
|
perf
|
util
|
drm/i915/adl_s: add adl-s platform info and pci ids
|
- add the initial platform information for alderlake-s. - specify ppgtt_size value - add dma_mask_size - add adls revids - hw tracking(selective update tracking enable) has been removed from adls. disable psr2 till we enable software/ manual tracking.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add adl-s platform info and pci ids
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 6
| 58
| 1
|
- add the initial platform information for alderlake-s. - specify ppgtt_size value - add dma_mask_size - add adls revids - hw tracking(selective update tracking enable) has been - add support for different adls soc steppings to select - make display/gt steppings info generic for reuse with tgl and adls. - modify the macros to reuse tgl_revids_get() - add hti support to adls device info.(mdroper) - rebase on tgl patch for applying was based on stepping info from - replace macros with pci ids in revid to stepping table. --- diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c +const struct i915_rev_steppings adls_revid_step_tbl[] = { + [0x0] = { .gt_stepping = step_a0, .disp_stepping = step_a0 }, + [0x1] = { .gt_stepping = step_a0, .disp_stepping = step_a2 }, + [0x4] = { .gt_stepping = step_b0, .disp_stepping = step_b0 }, + [0x8] = { .gt_stepping = step_c0, .disp_stepping = step_b0 }, + [0xc] = { .gt_stepping = step_d0, .disp_stepping = step_c0 }, +}; + diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h +#define is_alderlake_s(dev_priv) is_platform(dev_priv, intel_alderlake_s) + step_a2, +#define adls_revid_step_tbl_size 13 +extern const struct i915_rev_steppings adls_revid_step_tbl[adls_revid_step_tbl_size]; - if (is_tgl_u(dev_priv) || is_tgl_y(dev_priv)) { + if (is_alderlake_s(dev_priv)) { + revid_step_tbl = adls_revid_step_tbl; + size = array_size(adls_revid_step_tbl); + } else if (is_tgl_u(dev_priv) || is_tgl_y(dev_priv)) { +#define adls_revid_a0 0x0 +#define adls_revid_a2 0x1 +#define adls_revid_b0 0x4 +#define adls_revid_g0 0x8 +#define adls_revid_c0 0xc /*same as h0 adls soc stepping*/ + +#define is_adls_disp_stepping(p, since, until) \ + (is_alderlake_s(p) && \ + tgl_stepping_get(p)->disp_stepping >= (since) && \ + tgl_stepping_get(p)->disp_stepping <= (until)) + +#define is_adls_gt_stepping(p, since, until) \ + (is_alderlake_s(p) && \ + tgl_stepping_get(p)->gt_stepping >= (since) && \ + tgl_stepping_get(p)->gt_stepping <= (until)) + diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c +static const struct intel_device_info adl_s_info = { + gen12_features, + platform(intel_alderlake_s), + .pipe_mask = bit(pipe_a) | bit(pipe_b) | bit(pipe_c) | bit(pipe_d), + .require_force_probe = 1, + .display.has_hti = 1, + .display.has_psr_hw_tracking = 0, + .platform_engine_mask = + bit(rcs0) | bit(bcs0) | bit(vecs0) | bit(vcs0) | bit(vcs2), + .dma_mask_size = 46, +}; + + intel_adls_ids(&adl_s_info), diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c + platform_name(alderlake_s), diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h + intel_alderlake_s, diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h +/* adl-s */ +#define intel_adls_ids(info) \ + intel_vga_device(0x4680, info), \ + intel_vga_device(0x4681, info), \ + intel_vga_device(0x4682, info), \ + intel_vga_device(0x4683, info), \ + intel_vga_device(0x4690, info), \ + intel_vga_device(0x4691, info), \ + intel_vga_device(0x4692, info), \ + intel_vga_device(0x4693, info) +
|
Graphics
|
0883d63b19bbd6bb09f27786e768c1af09aa0ede
|
caz yokoyama
|
drivers
|
gpu
|
drm, gt, i915
|
drm/i915/mso: add splitter state readout for platforms that support it
|
add splitter configuration to crtc state, and read it where supported. also add splitter state dumping. the stream splitter will be required for edp mso.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
edp mso support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 4
| 79
| 2
|
- catch invalid splitter configuration (uma) - convert segment timings to full panel timings. - refer to splitter instead of mso in crtc state. - dump splitter state. --- diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c +static void intel_ddi_mso_get_config(struct intel_encoder *encoder, + struct intel_crtc_state *pipe_config) +{ + struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); + struct drm_i915_private *i915 = to_i915(crtc->base.dev); + enum pipe pipe = crtc->pipe; + u32 dss1; + + if (!has_mso(i915)) + return; + + dss1 = intel_de_read(i915, icl_pipe_dss_ctl1(pipe)); + + pipe_config->splitter.enable = dss1 & splitter_enable; + if (!pipe_config->splitter.enable) + return; + + /* splitter enable is supported for pipe a only. */ + if (drm_warn_on(&i915->drm, pipe != pipe_a)) { + pipe_config->splitter.enable = false; + return; + } + + switch (dss1 & splitter_configuration_mask) { + default: + drm_warn(&i915->drm, true, + "invalid splitter configuration, dss1=0x%08x ", dss1); + fallthrough; + case splitter_configuration_2_segment: + pipe_config->splitter.link_count = 2; + break; + case splitter_configuration_4_segment: + pipe_config->splitter.link_count = 4; + break; + } + + pipe_config->splitter.pixel_overlap = reg_field_get(overlap_pixels_mask, dss1); +} + + intel_ddi_mso_get_config(encoder, pipe_config); + diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c - intel_mode_from_crtc_timings(pipe_mode, pipe_mode); - intel_mode_from_crtc_timings(adjusted_mode, adjusted_mode); + if (crtc_state->splitter.enable) { + int n = crtc_state->splitter.link_count; + int overlap = crtc_state->splitter.pixel_overlap; + + /* + * edp mso uses segment timings from edid for transcoder + * timings, but full mode for everything else. + * + * h_full = (h_segment - pixel_overlap) * link_count + */ + pipe_mode->crtc_hdisplay = (pipe_mode->crtc_hdisplay - overlap) * n; + pipe_mode->crtc_hblank_start = (pipe_mode->crtc_hblank_start - overlap) * n; + pipe_mode->crtc_hblank_end = (pipe_mode->crtc_hblank_end - overlap) * n; + pipe_mode->crtc_hsync_start = (pipe_mode->crtc_hsync_start - overlap) * n; + pipe_mode->crtc_hsync_end = (pipe_mode->crtc_hsync_end - overlap) * n; + pipe_mode->crtc_htotal = (pipe_mode->crtc_htotal - overlap) * n; + pipe_mode->crtc_clock *= n; + + intel_mode_from_crtc_timings(pipe_mode, pipe_mode); + intel_mode_from_crtc_timings(adjusted_mode, pipe_mode); + } else { + intel_mode_from_crtc_timings(pipe_mode, pipe_mode); + intel_mode_from_crtc_timings(adjusted_mode, adjusted_mode); + } + drm_dbg_kms(&dev_priv->drm, "splitter: %s, link count %d, overlap %d ", + enableddisabled(pipe_config->splitter.enable), + pipe_config->splitter.link_count, + pipe_config->splitter.pixel_overlap); + diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h + + /* stream splitter for edp mso */ + struct { + bool enable; + u8 link_count; + u8 pixel_overlap; + } splitter; diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h +#define has_mso(i915) (intel_gen(i915) >= 12) +
|
Graphics
|
5b616a2958da0c75a6083e82859ca33be7662562
|
jani nikula
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/mso: add splitter state check
|
for starters, we expect the state to be zero, as we don't enable mso anywhere.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
edp mso support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 4
| 0
|
--- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c + pipe_conf_check_bool(splitter.enable); + pipe_conf_check_i(splitter.link_count); + pipe_conf_check_i(splitter.pixel_overlap); +
|
Graphics
|
5bc4fab7e79206926718c3d39cb70cbee22ef4ac
|
jani nikula
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/edp: modify fixed and downclock modes for mso
|
in the case of mso (multi-sst operation), the edid contains the timings for a single panel segment. we'll want to hide the fact from userspace, and expose modes that span the entire display.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
edp mso support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 29
| 0
|
--- diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c +static void intel_edp_mso_mode_fixup(struct intel_connector *connector, + struct drm_display_mode *mode) +{ + struct intel_dp *intel_dp = intel_attached_dp(connector); + struct drm_i915_private *i915 = to_i915(connector->base.dev); + int n = intel_dp->mso_link_count; + int overlap = intel_dp->mso_pixel_overlap; + + if (!mode || !n) + return; + + mode->hdisplay = (mode->hdisplay - overlap) * n; + mode->hsync_start = (mode->hsync_start - overlap) * n; + mode->hsync_end = (mode->hsync_end - overlap) * n; + mode->htotal = (mode->htotal - overlap) * n; + mode->clock *= n; + + drm_mode_set_name(mode); + + drm_dbg_kms(&i915->drm, + "[connector:%d:%s] using generated mso mode: ", + connector->base.base.id, connector->base.name); + drm_mode_debug_printmodeline(mode); +} + + /* multiply the mode clock and horizontal timings for mso */ + intel_edp_mso_mode_fixup(intel_connector, fixed_mode); + intel_edp_mso_mode_fixup(intel_connector, downclock_mode); +
|
Graphics
|
512005d949287c2a38f4d65f285b7fb9f8244ed0
|
jani nikula
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/edp: enable edp mso during link training
|
if the source and sink support mso, enable it during link training.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
edp mso support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 3
| 89
| 4
|
--- diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c +static void intel_ddi_mso_configure(const struct intel_crtc_state *crtc_state) +{ + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); + struct drm_i915_private *i915 = to_i915(crtc->base.dev); + enum pipe pipe = crtc->pipe; + u32 dss1 = 0; + + if (!has_mso(i915)) + return; + + if (crtc_state->splitter.enable) { + /* splitter enable is supported for pipe a only. */ + if (drm_warn_on(&i915->drm, pipe != pipe_a)) + return; + + dss1 |= splitter_enable; + dss1 |= overlap_pixels(crtc_state->splitter.pixel_overlap); + if (crtc_state->splitter.link_count == 2) + dss1 |= splitter_configuration_2_segment; + else + dss1 |= splitter_configuration_4_segment; + } + + intel_de_rmw(i915, icl_pipe_dss_ctl1(pipe), + splitter_enable | splitter_configuration_mask | + overlap_pixels_mask, dss1); +} + + /* + * 7.g program cog/mso configuration bits in dss_ctl1 if selected. + */ + intel_ddi_mso_configure(crtc_state); + + + /* splitter enable for edp mso is supported for pipe a only. */ + if (dig_port->dp.mso_link_count) + encoder->pipe_mask = bit(pipe_a); diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c + if (pipe_config->splitter.enable) { + int n = pipe_config->splitter.link_count; + int overlap = pipe_config->splitter.pixel_overlap; + + pipe_mode->crtc_hdisplay = (pipe_mode->crtc_hdisplay - overlap) * n; + pipe_mode->crtc_hblank_start = (pipe_mode->crtc_hblank_start - overlap) * n; + pipe_mode->crtc_hblank_end = (pipe_mode->crtc_hblank_end - overlap) * n; + pipe_mode->crtc_hsync_start = (pipe_mode->crtc_hsync_start - overlap) * n; + pipe_mode->crtc_hsync_end = (pipe_mode->crtc_hsync_end - overlap) * n; + pipe_mode->crtc_htotal = (pipe_mode->crtc_htotal - overlap) * n; + pipe_mode->crtc_clock *= n; + } + diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c + int pixel_clock; - intel_link_compute_m_n(output_bpp, pipe_config->lane_count, - intel_connector->panel.downclock_mode->clock, + + pixel_clock = intel_connector->panel.downclock_mode->clock; + if (pipe_config->splitter.enable) + pixel_clock /= pipe_config->splitter.link_count; + + intel_link_compute_m_n(output_bpp, pipe_config->lane_count, pixel_clock, + + /* fixme: abstract this better */ + if (pipe_config->splitter.enable) + pipe_config->dp_m2_n2.gmch_m *= pipe_config->splitter.link_count; + if (intel_dp->mso_link_count) { + int n = intel_dp->mso_link_count; + int overlap = intel_dp->mso_pixel_overlap; + + pipe_config->splitter.enable = true; + pipe_config->splitter.link_count = n; + pipe_config->splitter.pixel_overlap = overlap; + + drm_dbg_kms(&dev_priv->drm, "mso link count %d, pixel overlap %d ", + n, overlap); + + adjusted_mode->crtc_hdisplay = adjusted_mode->crtc_hdisplay / n + overlap; + adjusted_mode->crtc_hblank_start = adjusted_mode->crtc_hblank_start / n + overlap; + adjusted_mode->crtc_hblank_end = adjusted_mode->crtc_hblank_end / n + overlap; + adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hsync_start / n + overlap; + adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_end / n + overlap; + adjusted_mode->crtc_htotal = adjusted_mode->crtc_htotal / n + overlap; + adjusted_mode->crtc_clock /= n; + } + + /* fixme: abstract this better */ + if (pipe_config->splitter.enable) + pipe_config->dp_m_n.gmch_m *= pipe_config->splitter.link_count; + - drm_err(&i915->drm, "no source mso support, disabling "); - mso = 0; + if (!has_mso(i915)) { + drm_err(&i915->drm, "no source mso support, disabling "); + mso = 0; + }
|
Graphics
|
bc71194e889741eb54a3dcc35fc79215fa9449d2
|
jani nikula
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/display: support psr multiple instances
|
it is a preliminary work for supporting multiple edp psr and dp panelreplay. and it refactors singleton psr to multi transcoder supportable psr. and this moves and renames the i915_psr structure of drm_i915_private's to intel_dp's intel_psr structure. it also causes changes in psr interrupt handling routine for supporting multiple transcoders. but it does not change the scenario and timing of enabling and disabling psr. and it not support multiple pipes with a single transcoder psr case yet.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
multiple psr instance support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 10
| 487
| 376
|
- move calling of intel_psr_init() to intel_dp_init_connector() - remove wrong comments and add comments for a limit of supporting of - replace drm_debug_kms with drm_dbg_kms() / drm_warn with drm_warn() - reorder calling order of intel_psr2_program_trans_man_trk_ctl(). - in order to reduce changes keep the old name for drm_i915_private. - change restrictions of multiple instances of psr. - change the calling of intel_psr2_program_trans_man_trk_ctl() into - change a checking order of can_psr() and connector_status to original - drop unneeded intel_dp_update_pipe() function. - in order to wait a specific encoder which belong to crtc_state on - add an whitespace to comments. - add and use for_each_intel_psr_enabled_encoder() macro. - in order to use correct frontbuffer_bit for each pipe, - remove redundant or unneeded codes. - update comments. - add and use for_each_intel_encoder_can_psr() macro and - add source_support member variable into intel_psr structure. - update can_psr() macro that checks source_support. - move encoder's psr availity check to psr_init() from - remove redundant or unneeded codes. --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c - intel_psr_init(dev_priv); - diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h +#define for_each_intel_encoder_mask_can_psr(dev, intel_encoder, encoder_mask) \ + list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ + for_each_if(((encoder_mask) & drm_encoder_mask(&(intel_encoder)->base)) && \ + intel_encoder_can_psr(intel_encoder)) + +#define for_each_intel_encoder_can_psr(dev, intel_encoder) \ + for_each_intel_encoder((dev), (intel_encoder)) \ + for_each_if(intel_encoder_can_psr(intel_encoder)) + diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c - struct drm_i915_private *dev_priv = to_i915(connector->dev); - if (!can_psr(dev_priv)) { + if (!can_psr(intel_dp)) { -psr_source_status(struct drm_i915_private *dev_priv, struct seq_file *m) +psr_source_status(struct intel_dp *intel_dp, struct seq_file *m) - u32 val, status_val; + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); + u32 val, status_val; - if (dev_priv->psr.psr2_enabled) { + if (intel_dp->psr.psr2_enabled) { - edp_psr2_status(dev_priv->psr.transcoder)); + edp_psr2_status(intel_dp->psr.transcoder)); - edp_psr_status(dev_priv->psr.transcoder)); + edp_psr_status(intel_dp->psr.transcoder)); -static int i915_edp_psr_status(struct seq_file *m, void *data) +static int intel_psr_status(struct seq_file *m, struct intel_dp *intel_dp) - struct drm_i915_private *dev_priv = node_to_i915(m->private); - struct i915_psr *psr = &dev_priv->psr; + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); + struct intel_psr *psr = &intel_dp->psr; - if (!has_psr(dev_priv)) - return -enodev; - - if (psr->dp) - seq_printf(m, " [0x%02x]", psr->dp->psr_dpcd[0]); + if (psr->sink_support) + seq_printf(m, " [0x%02x]", intel_dp->psr_dpcd[0]); - edp_psr2_ctl(dev_priv->psr.transcoder)); + edp_psr2_ctl(intel_dp->psr.transcoder)); - edp_psr_ctl(dev_priv->psr.transcoder)); + edp_psr_ctl(intel_dp->psr.transcoder)); - psr_source_status(dev_priv, m); + psr_source_status(intel_dp, m); - edp_psr_perf_cnt(dev_priv->psr.transcoder)); + edp_psr_perf_cnt(intel_dp->psr.transcoder)); - psr2_su_status(dev_priv->psr.transcoder, frame)); + psr2_su_status(intel_dp->psr.transcoder, frame)); +static int i915_edp_psr_status(struct seq_file *m, void *data) +{ + struct drm_i915_private *dev_priv = node_to_i915(m->private); + struct intel_dp *intel_dp = null; + struct intel_encoder *encoder; + + if (!has_psr(dev_priv)) + return -enodev; + + /* find the first edp which supports psr */ + for_each_intel_encoder_can_psr(&dev_priv->drm, encoder) { + intel_dp = enc_to_intel_dp(encoder); + break; + } + + if (!intel_dp) + return -enodev; + + return intel_psr_status(m, intel_dp); +} + + struct intel_encoder *encoder; - int ret; + int ret = -enodev; - if (!can_psr(dev_priv)) - return -enodev; + if (!has_psr(dev_priv)) + return ret; - drm_dbg_kms(&dev_priv->drm, "setting psr debug to %llx ", val); + for_each_intel_encoder_can_psr(&dev_priv->drm, encoder) { + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); - wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm); + drm_dbg_kms(&dev_priv->drm, "setting psr debug to %llx ", val); - ret = intel_psr_debug_set(dev_priv, val); + wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm); - intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref); + // todo: split to each transcoder's psr debug state + ret = intel_psr_debug_set(intel_dp, val); + + intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref); + } + struct intel_encoder *encoder; - if (!can_psr(dev_priv)) + if (!has_psr(dev_priv)) - *val = read_once(dev_priv->psr.debug); - return 0; + for_each_intel_encoder_can_psr(&dev_priv->drm, encoder) { + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + // todo: split to each transcoder's psr debug state + *val = read_once(intel_dp->psr.debug); + return 0; + } + + return -enodev; - if (dev_priv->psr.enabled) - seq_puts(m, - " as psr is enabled, drrs is not enabled "); diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h +struct intel_psr { + /* mutex for psr state of the transcoder */ + struct mutex lock; + +#define i915_psr_debug_mode_mask 0x0f +#define i915_psr_debug_default 0x00 +#define i915_psr_debug_disable 0x01 +#define i915_psr_debug_enable 0x02 +#define i915_psr_debug_force_psr1 0x03 +#define i915_psr_debug_irq 0x10 + + u32 debug; + bool sink_support; + bool source_support; + bool enabled; + enum pipe pipe; + enum transcoder transcoder; + bool active; + struct work_struct work; + unsigned int busy_frontbuffer_bits; + bool sink_psr2_support; + bool link_standby; + bool colorimetry_support; + bool psr2_enabled; + bool psr2_sel_fetch_enabled; + u8 sink_sync_latency; + ktime_t last_entry_attempt; + ktime_t last_exit; + bool sink_not_reliable; + bool irq_aux_error; + u16 su_x_granularity; + bool dc3co_enabled; + u32 dc3co_exit_delay; + struct delayed_work dc3co_work; + struct drm_dp_vsc_sdp vsc; +}; + + + struct intel_psr psr; +#define can_psr(intel_dp) (has_psr(dp_to_i915(intel_dp)) && \ + (intel_dp)->psr.sink_support && \ + (intel_dp)->psr.source_support) + +static inline bool intel_encoder_can_psr(struct intel_encoder *encoder) +{ + if (!intel_encoder_is_dp(encoder)) + return false; + + return can_psr(enc_to_intel_dp(encoder)); +} + diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c - struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - - if (dev_priv->psr.psr2_enabled) { - if (dev_priv->psr.colorimetry_support && + if (intel_dp->psr.psr2_enabled) { + if (intel_dp->psr.colorimetry_support && - if (can_psr(i915) && intel_dp_is_edp(intel_dp)) { + if (can_psr(intel_dp) && intel_dp_is_edp(intel_dp)) { + intel_psr_init(intel_dp); + diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c -static bool psr_global_enabled(struct drm_i915_private *i915) +static bool psr_global_enabled(struct intel_dp *intel_dp) - switch (i915->psr.debug & i915_psr_debug_mode_mask) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + + switch (intel_dp->psr.debug & i915_psr_debug_mode_mask) { -static bool psr2_global_enabled(struct drm_i915_private *dev_priv) +static bool psr2_global_enabled(struct intel_dp *intel_dp) - switch (dev_priv->psr.debug & i915_psr_debug_mode_mask) { + switch (intel_dp->psr.debug & i915_psr_debug_mode_mask) { -static void psr_irq_control(struct drm_i915_private *dev_priv) +static void psr_irq_control(struct intel_dp *intel_dp) + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - u32 mask, val; + u32 mask, val; - imr_reg = trans_psr_imr(dev_priv->psr.transcoder); + imr_reg = trans_psr_imr(intel_dp->psr.transcoder); - trans_shift = dev_priv->psr.transcoder; + trans_shift = intel_dp->psr.transcoder; - if (dev_priv->psr.debug & i915_psr_debug_irq) + if (intel_dp->psr.debug & i915_psr_debug_irq) -void intel_psr_irq_handler(struct drm_i915_private *dev_priv, u32 psr_iir) +void intel_psr_irq_handler(struct intel_dp *intel_dp, u32 psr_iir) - enum transcoder cpu_transcoder = dev_priv->psr.transcoder; + enum transcoder cpu_transcoder = intel_dp->psr.transcoder; + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); + ktime_t time_ns = ktime_get(); - ktime_t time_ns = ktime_get(); - imr_reg = trans_psr_imr(dev_priv->psr.transcoder); + imr_reg = trans_psr_imr(intel_dp->psr.transcoder); - trans_shift = dev_priv->psr.transcoder; + trans_shift = intel_dp->psr.transcoder; - dev_priv->psr.last_entry_attempt = time_ns; + intel_dp->psr.last_entry_attempt = time_ns; - dev_priv->psr.last_exit = time_ns; + intel_dp->psr.last_exit = time_ns; - bool psr2_enabled = dev_priv->psr.psr2_enabled; + bool psr2_enabled = intel_dp->psr.psr2_enabled; - dev_priv->psr.irq_aux_error = true; + intel_dp->psr.irq_aux_error = true; - schedule_work(&dev_priv->psr.work); + schedule_work(&intel_dp->psr.work); - if (dev_priv->psr.dp) { - drm_warn(&dev_priv->drm, - "more than one edp panel found, psr support should be extended "); - return; - } - - dev_priv->psr.sink_support = true; - dev_priv->psr.sink_sync_latency = + intel_dp->psr.sink_support = true; + intel_dp->psr.sink_sync_latency = - dev_priv->psr.dp = intel_dp; - - dev_priv->psr.sink_psr2_support = y_req && alpm; + intel_dp->psr.sink_psr2_support = y_req && alpm; - dev_priv->psr.sink_psr2_support ? "" : "not "); + intel_dp->psr.sink_psr2_support ? "" : "not "); - if (dev_priv->psr.sink_psr2_support) { - dev_priv->psr.colorimetry_support = + if (intel_dp->psr.sink_psr2_support) { + intel_dp->psr.colorimetry_support = - dev_priv->psr.su_x_granularity = + intel_dp->psr.su_x_granularity = - edp_psr_aux_data(dev_priv->psr.transcoder, i >> 2), + edp_psr_aux_data(intel_dp->psr.transcoder, i >> 2), - intel_de_write(dev_priv, edp_psr_aux_ctl(dev_priv->psr.transcoder), + intel_de_write(dev_priv, edp_psr_aux_ctl(intel_dp->psr.transcoder), - if (dev_priv->psr.psr2_enabled) { + if (intel_dp->psr.psr2_enabled) { - if (dev_priv->psr.link_standby) + if (intel_dp->psr.link_standby) - idle_frames = max(idle_frames, dev_priv->psr.sink_sync_latency + 1); + idle_frames = max(idle_frames, intel_dp->psr.sink_sync_latency + 1); - if (dev_priv->psr.link_standby) + if (intel_dp->psr.link_standby) - val |= (intel_de_read(dev_priv, edp_psr_ctl(dev_priv->psr.transcoder)) & + val |= (intel_de_read(dev_priv, edp_psr_ctl(intel_dp->psr.transcoder)) & - intel_de_write(dev_priv, edp_psr_ctl(dev_priv->psr.transcoder), val); + intel_de_write(dev_priv, edp_psr_ctl(intel_dp->psr.transcoder), val); - val |= edp_psr2_frame_before_su(dev_priv->psr.sink_sync_latency + 1); + val |= edp_psr2_frame_before_su(intel_dp->psr.sink_sync_latency + 1); - if (dev_priv->psr.psr2_sel_fetch_enabled) { + if (intel_dp->psr.psr2_sel_fetch_enabled) { - psr2_man_trk_ctl(dev_priv->psr.transcoder), + psr2_man_trk_ctl(intel_dp->psr.transcoder), - psr2_man_trk_ctl(dev_priv->psr.transcoder), 0); + psr2_man_trk_ctl(intel_dp->psr.transcoder), 0); - intel_de_write(dev_priv, edp_psr_ctl(dev_priv->psr.transcoder), 0); + intel_de_write(dev_priv, edp_psr_ctl(intel_dp->psr.transcoder), 0); - intel_de_write(dev_priv, edp_psr2_ctl(dev_priv->psr.transcoder), val); + intel_de_write(dev_priv, edp_psr2_ctl(intel_dp->psr.transcoder), val); -static void psr2_program_idle_frames(struct drm_i915_private *dev_priv, +static void psr2_program_idle_frames(struct intel_dp *intel_dp, + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - val = intel_de_read(dev_priv, edp_psr2_ctl(dev_priv->psr.transcoder)); + val = intel_de_read(dev_priv, edp_psr2_ctl(intel_dp->psr.transcoder)); - intel_de_write(dev_priv, edp_psr2_ctl(dev_priv->psr.transcoder), val); + intel_de_write(dev_priv, edp_psr2_ctl(intel_dp->psr.transcoder), val); -static void tgl_psr2_enable_dc3co(struct drm_i915_private *dev_priv) +static void tgl_psr2_enable_dc3co(struct intel_dp *intel_dp) - psr2_program_idle_frames(dev_priv, 0); + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); + + psr2_program_idle_frames(intel_dp, 0); -static void tgl_psr2_disable_dc3co(struct drm_i915_private *dev_priv) +static void tgl_psr2_disable_dc3co(struct intel_dp *intel_dp) - struct intel_dp *intel_dp = dev_priv->psr.dp; + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - psr2_program_idle_frames(dev_priv, psr_compute_idle_frames(intel_dp)); + psr2_program_idle_frames(intel_dp, psr_compute_idle_frames(intel_dp)); - struct drm_i915_private *dev_priv = - container_of(work, typeof(*dev_priv), psr.dc3co_work.work); + struct intel_dp *intel_dp = + container_of(work, typeof(*intel_dp), psr.dc3co_work.work); - mutex_lock(&dev_priv->psr.lock); + mutex_lock(&intel_dp->psr.lock); - if (delayed_work_pending(&dev_priv->psr.dc3co_work)) + if (delayed_work_pending(&intel_dp->psr.dc3co_work)) - tgl_psr2_disable_dc3co(dev_priv); + tgl_psr2_disable_dc3co(intel_dp); - mutex_unlock(&dev_priv->psr.lock); + mutex_unlock(&intel_dp->psr.lock); -static void tgl_disallow_dc3co_on_psr2_exit(struct drm_i915_private *dev_priv) +static void tgl_disallow_dc3co_on_psr2_exit(struct intel_dp *intel_dp) - if (!dev_priv->psr.dc3co_enabled) + if (!intel_dp->psr.dc3co_enabled) - cancel_delayed_work(&dev_priv->psr.dc3co_work); + cancel_delayed_work(&intel_dp->psr.dc3co_work); - tgl_psr2_disable_dc3co(dev_priv); + tgl_psr2_disable_dc3co(intel_dp); - if (!dev_priv->psr.sink_psr2_support) + if (!intel_dp->psr.sink_psr2_support) - if (!psr2_global_enabled(dev_priv)) { + if (!psr2_global_enabled(intel_dp)) { - if (crtc_hdisplay % dev_priv->psr.su_x_granularity) { + if (crtc_hdisplay % intel_dp->psr.su_x_granularity) { - crtc_hdisplay, dev_priv->psr.su_x_granularity); + crtc_hdisplay, intel_dp->psr.su_x_granularity); - struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); - if (!can_psr(dev_priv)) + if (!can_psr(intel_dp)) - if (intel_dp != dev_priv->psr.dp) - return; - - if (!psr_global_enabled(dev_priv)) { + if (!psr_global_enabled(intel_dp)) { - /* - * hsw spec explicitly says psr is tied to port a. - * bdw+ platforms have a instance of psr registers per transcoder but - * for now it only supports one instance of psr, so lets keep it - * hardcoded to port_a - */ - if (dig_port->base.port != port_a) { - drm_dbg_kms(&dev_priv->drm, - "psr condition failed: port not supported "); - return; - } - - if (dev_priv->psr.sink_not_reliable) { + if (intel_dp->psr.sink_not_reliable) { + enum transcoder transcoder = intel_dp->psr.transcoder; - if (transcoder_has_psr2(dev_priv, dev_priv->psr.transcoder)) + if (transcoder_has_psr2(dev_priv, transcoder)) - intel_de_read(dev_priv, edp_psr2_ctl(dev_priv->psr.transcoder)) & edp_psr2_enable); + intel_de_read(dev_priv, edp_psr2_ctl(transcoder)) & edp_psr2_enable); - intel_de_read(dev_priv, edp_psr_ctl(dev_priv->psr.transcoder)) & edp_psr_enable); - drm_warn_on(&dev_priv->drm, dev_priv->psr.active); - lockdep_assert_held(&dev_priv->psr.lock); + intel_de_read(dev_priv, edp_psr_ctl(transcoder)) & edp_psr_enable); + drm_warn_on(&dev_priv->drm, intel_dp->psr.active); + lockdep_assert_held(&intel_dp->psr.lock); - if (dev_priv->psr.psr2_enabled) + if (intel_dp->psr.psr2_enabled) - dev_priv->psr.active = true; + intel_dp->psr.active = true; - if (dev_priv->psr.psr2_enabled && (is_gen(dev_priv, 9) && + if (intel_dp->psr.psr2_enabled && (is_gen(dev_priv, 9) && - intel_de_write(dev_priv, edp_psr_debug(dev_priv->psr.transcoder), + intel_de_write(dev_priv, edp_psr_debug(intel_dp->psr.transcoder), - psr_irq_control(dev_priv); + psr_irq_control(intel_dp); - dev_priv->psr.psr2_sel_fetch_enabled ? + intel_dp->psr.psr2_sel_fetch_enabled ? -static void intel_psr_enable_locked(struct drm_i915_private *dev_priv, +static void intel_psr_enable_locked(struct intel_dp *intel_dp, - struct intel_dp *intel_dp = dev_priv->psr.dp; + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - drm_warn_on(&dev_priv->drm, dev_priv->psr.enabled); + drm_warn_on(&dev_priv->drm, intel_dp->psr.enabled); - dev_priv->psr.psr2_enabled = crtc_state->has_psr2; - dev_priv->psr.busy_frontbuffer_bits = 0; - dev_priv->psr.pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe; - dev_priv->psr.dc3co_enabled = !!crtc_state->dc3co_exitline; - dev_priv->psr.transcoder = crtc_state->cpu_transcoder; + intel_dp->psr.psr2_enabled = crtc_state->has_psr2; + intel_dp->psr.busy_frontbuffer_bits = 0; + intel_dp->psr.pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe; + intel_dp->psr.dc3co_enabled = !!crtc_state->dc3co_exitline; + intel_dp->psr.transcoder = crtc_state->cpu_transcoder; - dev_priv->psr.dc3co_exit_delay = val; - dev_priv->psr.psr2_sel_fetch_enabled = crtc_state->enable_psr2_sel_fetch; + intel_dp->psr.dc3co_exit_delay = val; + intel_dp->psr.psr2_sel_fetch_enabled = crtc_state->enable_psr2_sel_fetch; - trans_psr_iir(dev_priv->psr.transcoder)); + trans_psr_iir(intel_dp->psr.transcoder)); - val &= edp_psr_error(dev_priv->psr.transcoder); + val &= edp_psr_error(intel_dp->psr.transcoder); - dev_priv->psr.sink_not_reliable = true; + intel_dp->psr.sink_not_reliable = true; - dev_priv->psr.psr2_enabled ? "2" : "1"); + intel_dp->psr.psr2_enabled ? "2" : "1"); - &dev_priv->psr.vsc); - intel_write_dp_vsc_sdp(encoder, crtc_state, &dev_priv->psr.vsc); + &intel_dp->psr.vsc); + intel_write_dp_vsc_sdp(encoder, crtc_state, &intel_dp->psr.vsc); - dev_priv->psr.enabled = true; + intel_dp->psr.enabled = true; - if (!can_psr(dev_priv) || dev_priv->psr.dp != intel_dp) + if (!can_psr(intel_dp)) - mutex_lock(&dev_priv->psr.lock); - intel_psr_enable_locked(dev_priv, crtc_state, conn_state); - mutex_unlock(&dev_priv->psr.lock); + mutex_lock(&intel_dp->psr.lock); + intel_psr_enable_locked(intel_dp, crtc_state, conn_state); + mutex_unlock(&intel_dp->psr.lock); -static void intel_psr_exit(struct drm_i915_private *dev_priv) +static void intel_psr_exit(struct intel_dp *intel_dp) + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - if (!dev_priv->psr.active) { - if (transcoder_has_psr2(dev_priv, dev_priv->psr.transcoder)) { + if (!intel_dp->psr.active) { + if (transcoder_has_psr2(dev_priv, intel_dp->psr.transcoder)) { - edp_psr2_ctl(dev_priv->psr.transcoder)); + edp_psr2_ctl(intel_dp->psr.transcoder)); - edp_psr_ctl(dev_priv->psr.transcoder)); + edp_psr_ctl(intel_dp->psr.transcoder)); - if (dev_priv->psr.psr2_enabled) { - tgl_disallow_dc3co_on_psr2_exit(dev_priv); + if (intel_dp->psr.psr2_enabled) { + tgl_disallow_dc3co_on_psr2_exit(intel_dp); - edp_psr2_ctl(dev_priv->psr.transcoder)); + edp_psr2_ctl(intel_dp->psr.transcoder)); - edp_psr2_ctl(dev_priv->psr.transcoder), val); + edp_psr2_ctl(intel_dp->psr.transcoder), val); - edp_psr_ctl(dev_priv->psr.transcoder)); + edp_psr_ctl(intel_dp->psr.transcoder)); - edp_psr_ctl(dev_priv->psr.transcoder), val); + edp_psr_ctl(intel_dp->psr.transcoder), val); - dev_priv->psr.active = false; + intel_dp->psr.active = false; - lockdep_assert_held(&dev_priv->psr.lock); + lockdep_assert_held(&intel_dp->psr.lock); - if (!dev_priv->psr.enabled) + if (!intel_dp->psr.enabled) - dev_priv->psr.psr2_enabled ? "2" : "1"); + intel_dp->psr.psr2_enabled ? "2" : "1"); - intel_psr_exit(dev_priv); + intel_psr_exit(intel_dp); - if (dev_priv->psr.psr2_enabled) { - psr_status = edp_psr2_status(dev_priv->psr.transcoder); + if (intel_dp->psr.psr2_enabled) { + psr_status = edp_psr2_status(intel_dp->psr.transcoder); - psr_status = edp_psr_status(dev_priv->psr.transcoder); + psr_status = edp_psr_status(intel_dp->psr.transcoder); - if (dev_priv->psr.psr2_sel_fetch_enabled && + if (intel_dp->psr.psr2_sel_fetch_enabled && - if (dev_priv->psr.psr2_enabled) + if (intel_dp->psr.psr2_enabled) - dev_priv->psr.enabled = false; + intel_dp->psr.enabled = false; - if (drm_warn_on(&dev_priv->drm, !can_psr(dev_priv))) + if (drm_warn_on(&dev_priv->drm, !can_psr(intel_dp))) - mutex_lock(&dev_priv->psr.lock); + mutex_lock(&intel_dp->psr.lock); - mutex_unlock(&dev_priv->psr.lock); - cancel_work_sync(&dev_priv->psr.work); - cancel_delayed_work_sync(&dev_priv->psr.dc3co_work); + mutex_unlock(&intel_dp->psr.lock); + cancel_work_sync(&intel_dp->psr.work); + cancel_delayed_work_sync(&intel_dp->psr.dc3co_work); -static void psr_force_hw_tracking_exit(struct drm_i915_private *dev_priv) +static void psr_force_hw_tracking_exit(struct intel_dp *intel_dp) + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); + - intel_psr_exit(dev_priv); + intel_psr_exit(intel_dp); - intel_de_write(dev_priv, cursurflive(dev_priv->psr.pipe), 0); + intel_de_write(dev_priv, cursurflive(intel_dp->psr.pipe), 0); - intel_psr_exit(dev_priv); + intel_psr_exit(intel_dp); - struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); - struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); - struct i915_psr *psr = &dev_priv->psr; + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev); + struct intel_encoder *encoder; - intel_de_write(dev_priv, psr2_man_trk_ctl(psr->transcoder), - crtc_state->psr2_man_track_ctl); + for_each_intel_encoder_mask_can_psr(&dev_priv->drm, encoder, + crtc_state->uapi.encoder_mask) { + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + if (!intel_dp->psr.enabled) + continue; + + intel_de_write(dev_priv, + psr2_man_trk_ctl(crtc_state->cpu_transcoder), + crtc_state->psr2_man_track_ctl); + } - struct i915_psr *psr = &dev_priv->psr; + struct intel_psr *psr = &intel_dp->psr; - if (!can_psr(dev_priv) || read_once(psr->dp) != intel_dp) + if (!can_psr(intel_dp)) - mutex_lock(&dev_priv->psr.lock); + mutex_lock(&intel_dp->psr.lock); - psr_force_hw_tracking_exit(dev_priv); + psr_force_hw_tracking_exit(intel_dp); - if (!dev_priv->psr.active && - !dev_priv->psr.busy_frontbuffer_bits) - schedule_work(&dev_priv->psr.work); + if (!intel_dp->psr.active && + !intel_dp->psr.busy_frontbuffer_bits) + schedule_work(&intel_dp->psr.work); - intel_psr_enable_locked(dev_priv, crtc_state, conn_state); + intel_psr_enable_locked(intel_dp, crtc_state, conn_state); - mutex_unlock(&dev_priv->psr.lock); + mutex_unlock(&intel_dp->psr.lock); - * intel_psr_wait_for_idle - wait for psr1 to idle - * @new_crtc_state: new crtc state + * psr_wait_for_idle - wait for psr1 to idle + * @intel_dp: intel dp - * this function is expected to be called from pipe_update_start() where it is - * not expected to race with psr enable or disable. - * + * -int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state, - u32 *out_value) +static int psr_wait_for_idle(struct intel_dp *intel_dp, u32 *out_value) - struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc); - struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); - - if (!dev_priv->psr.enabled || !new_crtc_state->has_psr) - return 0; - - /* fixme: update this for psr2 if we need to wait for idle */ - if (read_once(dev_priv->psr.psr2_enabled)) - return 0; + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - - edp_psr_status(dev_priv->psr.transcoder), + edp_psr_status(intel_dp->psr.transcoder), -static bool __psr_wait_for_idle_locked(struct drm_i915_private *dev_priv) +/** + * intel_psr_wait_for_idle - wait for psr1 to idle + * @new_crtc_state: new crtc state + * + * this function is expected to be called from pipe_update_start() where it is + * not expected to race with psr enable or disable. + */ +void intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state) +{ + struct drm_i915_private *dev_priv = to_i915(new_crtc_state->uapi.crtc->dev); + struct intel_encoder *encoder; + + if (!new_crtc_state->has_psr) + return; + + for_each_intel_encoder_mask_can_psr(&dev_priv->drm, encoder, + new_crtc_state->uapi.encoder_mask) { + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + u32 psr_status; + + mutex_lock(&intel_dp->psr.lock); + if (!intel_dp->psr.enabled || + (intel_dp->psr.enabled && intel_dp->psr.psr2_enabled)) { + mutex_unlock(&intel_dp->psr.lock); + continue; + } + + /* when the psr1 is enabled */ + if (psr_wait_for_idle(intel_dp, &psr_status)) + drm_err(&dev_priv->drm, + "psr idle timed out 0x%x, atomic update may fail ", + psr_status); + mutex_unlock(&intel_dp->psr.lock); + } +} + +static bool __psr_wait_for_idle_locked(struct intel_dp *intel_dp) + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - if (!dev_priv->psr.enabled) + if (!intel_dp->psr.enabled) - if (dev_priv->psr.psr2_enabled) { - reg = edp_psr2_status(dev_priv->psr.transcoder); + if (intel_dp->psr.psr2_enabled) { + reg = edp_psr2_status(intel_dp->psr.transcoder); - reg = edp_psr_status(dev_priv->psr.transcoder); + reg = edp_psr_status(intel_dp->psr.transcoder); - mutex_unlock(&dev_priv->psr.lock); + mutex_unlock(&intel_dp->psr.lock); - mutex_lock(&dev_priv->psr.lock); - return err == 0 && dev_priv->psr.enabled; + mutex_lock(&intel_dp->psr.lock); + return err == 0 && intel_dp->psr.enabled; -int intel_psr_debug_set(struct drm_i915_private *dev_priv, u64 val) +int intel_psr_debug_set(struct intel_dp *intel_dp, u64 val) + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - ret = mutex_lock_interruptible(&dev_priv->psr.lock); + ret = mutex_lock_interruptible(&intel_dp->psr.lock); - old_mode = dev_priv->psr.debug & i915_psr_debug_mode_mask; - dev_priv->psr.debug = val; + old_mode = intel_dp->psr.debug & i915_psr_debug_mode_mask; + intel_dp->psr.debug = val; - if (dev_priv->psr.enabled) - psr_irq_control(dev_priv); + if (intel_dp->psr.enabled) + psr_irq_control(intel_dp); - mutex_unlock(&dev_priv->psr.lock); + mutex_unlock(&intel_dp->psr.lock); -static void intel_psr_handle_irq(struct drm_i915_private *dev_priv) +static void intel_psr_handle_irq(struct intel_dp *intel_dp) - struct i915_psr *psr = &dev_priv->psr; + struct intel_psr *psr = &intel_dp->psr; - intel_psr_disable_locked(psr->dp); + intel_psr_disable_locked(intel_dp); - drm_dp_dpcd_writeb(&psr->dp->aux, dp_set_power, dp_set_power_d0); + drm_dp_dpcd_writeb(&intel_dp->aux, dp_set_power, dp_set_power_d0); - struct drm_i915_private *dev_priv = - container_of(work, typeof(*dev_priv), psr.work); + struct intel_dp *intel_dp = + container_of(work, typeof(*intel_dp), psr.work); - mutex_lock(&dev_priv->psr.lock); + mutex_lock(&intel_dp->psr.lock); - if (!dev_priv->psr.enabled) + if (!intel_dp->psr.enabled) - if (read_once(dev_priv->psr.irq_aux_error)) - intel_psr_handle_irq(dev_priv); + if (read_once(intel_dp->psr.irq_aux_error)) + intel_psr_handle_irq(intel_dp); - if (!__psr_wait_for_idle_locked(dev_priv)) + if (!__psr_wait_for_idle_locked(intel_dp)) - if (dev_priv->psr.busy_frontbuffer_bits || dev_priv->psr.active) + if (intel_dp->psr.busy_frontbuffer_bits || intel_dp->psr.active) - intel_psr_activate(dev_priv->psr.dp); + intel_psr_activate(intel_dp); - mutex_unlock(&dev_priv->psr.lock); + mutex_unlock(&intel_dp->psr.lock); - if (!can_psr(dev_priv)) - return; + struct intel_encoder *encoder; - mutex_lock(&dev_priv->psr.lock); - if (!dev_priv->psr.enabled) { - mutex_unlock(&dev_priv->psr.lock); - return; - } + for_each_intel_encoder_can_psr(&dev_priv->drm, encoder) { + unsigned int pipe_frontbuffer_bits = frontbuffer_bits; + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); - frontbuffer_bits &= intel_frontbuffer_all_mask(dev_priv->psr.pipe); - dev_priv->psr.busy_frontbuffer_bits |= frontbuffer_bits; + mutex_lock(&intel_dp->psr.lock); + if (!intel_dp->psr.enabled) { + mutex_unlock(&intel_dp->psr.lock); + continue; + } - if (frontbuffer_bits) - intel_psr_exit(dev_priv); + pipe_frontbuffer_bits &= + intel_frontbuffer_all_mask(intel_dp->psr.pipe); + intel_dp->psr.busy_frontbuffer_bits |= pipe_frontbuffer_bits; - mutex_unlock(&dev_priv->psr.lock); -} + if (pipe_frontbuffer_bits) + intel_psr_exit(intel_dp); + mutex_unlock(&intel_dp->psr.lock); + } +} -tgl_dc3co_flush(struct drm_i915_private *dev_priv, - unsigned int frontbuffer_bits, enum fb_op_origin origin) +tgl_dc3co_flush(struct intel_dp *intel_dp, unsigned int frontbuffer_bits, + enum fb_op_origin origin) - mutex_lock(&dev_priv->psr.lock); + mutex_lock(&intel_dp->psr.lock); - if (!dev_priv->psr.dc3co_enabled) + if (!intel_dp->psr.dc3co_enabled) - if (!dev_priv->psr.psr2_enabled || !dev_priv->psr.active) + if (!intel_dp->psr.psr2_enabled || !intel_dp->psr.active) - intel_frontbuffer_all_mask(dev_priv->psr.pipe))) + intel_frontbuffer_all_mask(intel_dp->psr.pipe))) - tgl_psr2_enable_dc3co(dev_priv); - mod_delayed_work(system_wq, &dev_priv->psr.dc3co_work, - dev_priv->psr.dc3co_exit_delay); + tgl_psr2_enable_dc3co(intel_dp); + mod_delayed_work(system_wq, &intel_dp->psr.dc3co_work, + intel_dp->psr.dc3co_exit_delay); - mutex_unlock(&dev_priv->psr.lock); + mutex_unlock(&intel_dp->psr.lock); - if (!can_psr(dev_priv)) - return; + struct intel_encoder *encoder; - if (origin == origin_flip) { - tgl_dc3co_flush(dev_priv, frontbuffer_bits, origin); - return; - } + for_each_intel_encoder_can_psr(&dev_priv->drm, encoder) { + unsigned int pipe_frontbuffer_bits = frontbuffer_bits; + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); - mutex_lock(&dev_priv->psr.lock); - if (!dev_priv->psr.enabled) { - mutex_unlock(&dev_priv->psr.lock); - return; - } + if (origin == origin_flip) { + tgl_dc3co_flush(intel_dp, frontbuffer_bits, origin); + continue; + } + + mutex_lock(&intel_dp->psr.lock); + if (!intel_dp->psr.enabled) { + mutex_unlock(&intel_dp->psr.lock); + continue; + } - frontbuffer_bits &= intel_frontbuffer_all_mask(dev_priv->psr.pipe); - dev_priv->psr.busy_frontbuffer_bits &= ~frontbuffer_bits; + pipe_frontbuffer_bits &= + intel_frontbuffer_all_mask(intel_dp->psr.pipe); + intel_dp->psr.busy_frontbuffer_bits &= ~pipe_frontbuffer_bits; - /* by definition flush = invalidate + flush */ - if (frontbuffer_bits) - psr_force_hw_tracking_exit(dev_priv); + /* by definition flush = invalidate + flush */ + if (pipe_frontbuffer_bits) + psr_force_hw_tracking_exit(intel_dp); - if (!dev_priv->psr.active && !dev_priv->psr.busy_frontbuffer_bits) - schedule_work(&dev_priv->psr.work); - mutex_unlock(&dev_priv->psr.lock); + if (!intel_dp->psr.active && !intel_dp->psr.busy_frontbuffer_bits) + schedule_work(&intel_dp->psr.work); + mutex_unlock(&intel_dp->psr.lock); + } - * @dev_priv: i915 device private + * @intel_dp: intel dp - * this function is called only once at driver load to initialize basic - * psr stuff. + * this function is called after the initializing connector. + * (the initializing of connector treats the handling of connector capabilities) + * and it initializes basic psr stuff for each dp encoder. -void intel_psr_init(struct drm_i915_private *dev_priv) +void intel_psr_init(struct intel_dp *intel_dp) + struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); + - if (!dev_priv->psr.sink_support) + if (!intel_dp->psr.sink_support) + /* + * hsw spec explicitly says psr is tied to port a. + * bdw+ platforms have a instance of psr registers per transcoder but + * bdw, gen9 and gen11 are not validated by hw team in other transcoder + * than edp one. + * for now it only supports one instance of psr for bdw, gen9 and gen11. + * so lets keep it hardcoded to port_a for bdw, gen9 and gen11. + * but gen12 supports a instance of psr registers per transcoder. + */ + if (intel_gen(dev_priv) < 12 && dig_port->base.port != port_a) { + drm_dbg_kms(&dev_priv->drm, + "psr condition failed: port not supported "); + return; + } + + intel_dp->psr.source_support = true; + - dev_priv->psr.link_standby = false; + intel_dp->psr.link_standby = false; - dev_priv->psr.link_standby = dev_priv->vbt.psr.full_link; + intel_dp->psr.link_standby = dev_priv->vbt.psr.full_link; - init_work(&dev_priv->psr.work, intel_psr_work); - init_delayed_work(&dev_priv->psr.dc3co_work, tgl_dc3co_disable_work); - mutex_init(&dev_priv->psr.lock); + init_work(&intel_dp->psr.work, intel_psr_work); + init_delayed_work(&intel_dp->psr.dc3co_work, tgl_dc3co_disable_work); + mutex_init(&intel_dp->psr.lock); - struct i915_psr *psr = &dev_priv->psr; + struct intel_psr *psr = &intel_dp->psr; - struct i915_psr *psr = &dev_priv->psr; + struct intel_psr *psr = &intel_dp->psr; - struct i915_psr *psr = &dev_priv->psr; + struct intel_psr *psr = &intel_dp->psr; - if (!can_psr(dev_priv) || !intel_dp_is_edp(intel_dp)) + if (!can_psr(intel_dp) || !intel_dp_is_edp(intel_dp)) - if (!psr->enabled || psr->dp != intel_dp) + if (!psr->enabled) - struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); - if (!can_psr(dev_priv) || !intel_dp_is_edp(intel_dp)) + if (!can_psr(intel_dp) || !intel_dp_is_edp(intel_dp)) - mutex_lock(&dev_priv->psr.lock); - ret = (dev_priv->psr.dp == intel_dp && dev_priv->psr.enabled); - mutex_unlock(&dev_priv->psr.lock); + mutex_lock(&intel_dp->psr.lock); + ret = intel_dp->psr.enabled; + mutex_unlock(&intel_dp->psr.lock); diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h --- a/drivers/gpu/drm/i915/display/intel_psr.h +++ b/drivers/gpu/drm/i915/display/intel_psr.h -#define can_psr(dev_priv) (has_psr(dev_priv) && dev_priv->psr.sink_support) -int intel_psr_debug_set(struct drm_i915_private *dev_priv, u64 value); +int intel_psr_debug_set(struct intel_dp *intel_dp, u64 value); -void intel_psr_init(struct drm_i915_private *dev_priv); +void intel_psr_init(struct intel_dp *intel_dp); -void intel_psr_irq_handler(struct drm_i915_private *dev_priv, u32 psr_iir); +void intel_psr_irq_handler(struct intel_dp *intel_dp, u32 psr_iir); -int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state, - u32 *out_value); +void intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state); diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c --- a/drivers/gpu/drm/i915/display/intel_sprite.c +++ b/drivers/gpu/drm/i915/display/intel_sprite.c - u32 psr_status; - if (intel_psr_wait_for_idle(new_crtc_state, &psr_status)) - drm_err(&dev_priv->drm, - "psr idle timed out 0x%x, atomic update may fail ", - psr_status); + intel_psr_wait_for_idle(new_crtc_state); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -struct i915_psr { - struct mutex lock; - -#define i915_psr_debug_mode_mask 0x0f -#define i915_psr_debug_default 0x00 -#define i915_psr_debug_disable 0x01 -#define i915_psr_debug_enable 0x02 -#define i915_psr_debug_force_psr1 0x03 -#define i915_psr_debug_irq 0x10 - - u32 debug; - bool sink_support; - bool enabled; - struct intel_dp *dp; - enum pipe pipe; - enum transcoder transcoder; - bool active; - struct work_struct work; - unsigned busy_frontbuffer_bits; - bool sink_psr2_support; - bool link_standby; - bool colorimetry_support; - bool psr2_enabled; - bool psr2_sel_fetch_enabled; - u8 sink_sync_latency; - ktime_t last_entry_attempt; - ktime_t last_exit; - bool sink_not_reliable; - bool irq_aux_error; - u16 su_x_granularity; - bool dc3co_enabled; - u32 dc3co_exit_delay; - struct delayed_work dc3co_work; - struct drm_dp_vsc_sdp vsc; -}; - - struct i915_psr psr; - diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c - u32 psr_iir = intel_uncore_read(&dev_priv->uncore, edp_psr_iir); + struct intel_encoder *encoder; - intel_psr_irq_handler(dev_priv, psr_iir); - intel_uncore_write(&dev_priv->uncore, edp_psr_iir, psr_iir); + for_each_intel_encoder_can_psr(&dev_priv->drm, encoder) { + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + u32 psr_iir = intel_uncore_read(&dev_priv->uncore, + edp_psr_iir); + + intel_psr_irq_handler(intel_dp, psr_iir); + intel_uncore_write(&dev_priv->uncore, + edp_psr_iir, psr_iir); + break; + } + struct intel_encoder *encoder; - if (intel_gen(dev_priv) >= 12) - iir_reg = trans_psr_iir(dev_priv->psr.transcoder); - else - iir_reg = edp_psr_iir; + for_each_intel_encoder_can_psr(&dev_priv->drm, encoder) { + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); - psr_iir = intel_uncore_read(&dev_priv->uncore, iir_reg); - intel_uncore_write(&dev_priv->uncore, iir_reg, psr_iir); + if (intel_gen(dev_priv) >= 12) + iir_reg = trans_psr_iir(intel_dp->psr.transcoder); + else + iir_reg = edp_psr_iir; - if (psr_iir) - found = true; + psr_iir = intel_uncore_read(&dev_priv->uncore, iir_reg); + intel_uncore_write(&dev_priv->uncore, iir_reg, psr_iir); - intel_psr_irq_handler(dev_priv, psr_iir); + if (psr_iir) + found = true; + + intel_psr_irq_handler(intel_dp, psr_iir); + + /* prior gen12 only have one edp psr */ + if (intel_gen(dev_priv) < 12) + break; + }
|
Graphics
|
b64d6c51380b7dea17d5503a250ca9cc84025453
|
gwan gyeong mun
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/display: support multiple transcoders' psr status on debugfs
|
in order to support the psr state of each transcoder, it adds i915_psr_status to sub-directory of each transcoder.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
multiple psr instance support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 16
| 0
|
- remove checking of gen12 for i915_psr_status. - add check of has_psr() - remove meaningless check routine. --- diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c +static int i915_psr_status_show(struct seq_file *m, void *data) +{ + struct drm_connector *connector = m->private; + struct intel_dp *intel_dp = + intel_attached_dp(to_intel_connector(connector)); + + return intel_psr_status(m, intel_dp); +} +define_show_attribute(i915_psr_status); + + if (has_psr(dev_priv) && + connector->connector_type == drm_mode_connector_edp) { + debugfs_create_file("i915_psr_status", 0444, root, + connector, &i915_psr_status_fops); + } +
|
Graphics
|
759cd2a6d1bf1a129e7705992198ff8bd1d2fed4
|
gwan gyeong mun
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915/display: support ddr5 mem types
|
add ddr5 and lpddr5 return values from punit fw.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
support ddr5 mem types
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 3
| 20
| 2
|
--- diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c --- a/drivers/gpu/drm/i915/display/intel_bw.c +++ b/drivers/gpu/drm/i915/display/intel_bw.c - qi->t_bl = dev_priv->dram_info.type == intel_dram_ddr4 ? 4 : 16; + switch (dram_info->type) { + case intel_dram_ddr4: + qi->t_bl = 4; + break; + case intel_dram_ddr5: + qi->t_bl = 8; + break; + default: + qi->t_bl = 16; + break; + } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h - intel_dram_lpddr4 + intel_dram_lpddr4, + intel_dram_ddr5, + intel_dram_lpddr5, diff --git a/drivers/gpu/drm/i915/intel_dram.c b/drivers/gpu/drm/i915/intel_dram.c --- a/drivers/gpu/drm/i915/intel_dram.c +++ b/drivers/gpu/drm/i915/intel_dram.c + case 1: + dram_info->type = intel_dram_ddr5; + break; + case 2: + dram_info->type = intel_dram_lpddr5; + break;
|
Graphics
|
1f1257a67ca34deb9708814c491053be8520644b
|
clint taylor jos roberto de souza jose souza intel com
|
drivers
|
gpu
|
display, drm, i915
|
drm/i915: extract active lookup engine to a helper
|
move active engine lookup to exported i915_request_active_engine.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
default request/fence expiry + watchdog
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 3
| 49
| 33
|
--- diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c -static bool -__active_engine(struct i915_request *rq, struct intel_engine_cs **active) -{ - struct intel_engine_cs *engine, *locked; - bool ret = false; - - /* - * serialise with __i915_request_submit() so that it sees - * is-banned?, or we know the request is already inflight. - * - * note that rq->engine is unstable, and so we double - * check that we have acquired the lock on the final engine. - */ - locked = read_once(rq->engine); - spin_lock_irq(&locked->active.lock); - while (unlikely(locked != (engine = read_once(rq->engine)))) { - spin_unlock(&locked->active.lock); - locked = engine; - spin_lock(&locked->active.lock); - } - - if (i915_request_is_active(rq)) { - if (!__i915_request_is_complete(rq)) - *active = locked; - ret = true; - } - - spin_unlock_irq(&locked->active.lock); - - return ret; -} - - found = __active_engine(rq, &engine); + found = i915_request_active_engine(rq, &engine); diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c +/** + * i915_request_active_engine + * @rq: request to inspect + * @active: pointer in which to return the active engine + * + * fills the currently active engine to the @active pointer if the request + * is active and still not completed. + * + * returns true if request was active or false otherwise. + */ +bool +i915_request_active_engine(struct i915_request *rq, + struct intel_engine_cs **active) +{ + struct intel_engine_cs *engine, *locked; + bool ret = false; + + /* + * serialise with __i915_request_submit() so that it sees + * is-banned?, or we know the request is already inflight. + * + * note that rq->engine is unstable, and so we double + * check that we have acquired the lock on the final engine. + */ + locked = read_once(rq->engine); + spin_lock_irq(&locked->active.lock); + while (unlikely(locked != (engine = read_once(rq->engine)))) { + spin_unlock(&locked->active.lock); + locked = engine; + spin_lock(&locked->active.lock); + } + + if (i915_request_is_active(rq)) { + if (!__i915_request_is_complete(rq)) + *active = locked; + ret = true; + } + + spin_unlock_irq(&locked->active.lock); + + return ret; +} + + diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h --- a/drivers/gpu/drm/i915/i915_request.h +++ b/drivers/gpu/drm/i915/i915_request.h +bool +i915_request_active_engine(struct i915_request *rq, + struct intel_engine_cs **active); +
|
Graphics
|
7dbc19da5daf45cb16f3bff900b69d44c512c333
|
tvrtko ursulin matthew auld matthew auld intel com
|
drivers
|
gpu
|
drm, gem, i915
|
drm/i915: individual request cancellation
|
currently, we cancel outstanding requests within a context when the context is closed. we may also want to cancel individual requests using the same graceful preemption mechanism.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
default request/fence expiry + watchdog
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 5
| 242
| 6
|
--- diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c --- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c + intel_engine_flush_submission(engine); diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +static bool bad_request(const struct i915_request *rq) +{ + return rq->fence.error && i915_request_started(rq); +} + - if (unlikely(intel_context_is_banned(ce))) + if (unlikely(intel_context_is_banned(ce) || bad_request(rq))) - if (unlikely(intel_context_is_banned(rq->context))) + if (unlikely(intel_context_is_banned(rq->context) || bad_request(rq))) diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c +#include "gt/intel_engine.h" +#include "gt/intel_engine_heartbeat.h" +#include "gt/intel_reset.h" -void i915_request_set_error_once(struct i915_request *rq, int error) +bool i915_request_set_error_once(struct i915_request *rq, int error) - return; + return false; - return; + return false; + + return true; +static void __cancel_request(struct i915_request *rq) +{ + struct intel_engine_cs *engine = null; + + i915_request_active_engine(rq, &engine); + + if (engine && intel_engine_pulse(engine)) + intel_gt_handle_error(engine->gt, engine->mask, 0, + "request cancellation by %s", + current->comm); +} + +void i915_request_cancel(struct i915_request *rq, int error) +{ + if (!i915_request_set_error_once(rq, error)) + return; + + set_bit(i915_fence_flag_sentinel, &rq->fence.flags); + + __cancel_request(rq); +} + diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h --- a/drivers/gpu/drm/i915/i915_request.h +++ b/drivers/gpu/drm/i915/i915_request.h -void i915_request_set_error_once(struct i915_request *rq, int error); +bool i915_request_set_error_once(struct i915_request *rq, int error); +void i915_request_cancel(struct i915_request *rq, int error); + diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c --- a/drivers/gpu/drm/i915/selftests/i915_request.c +++ b/drivers/gpu/drm/i915/selftests/i915_request.c +static int __cancel_inactive(struct intel_engine_cs *engine) +{ + struct intel_context *ce; + struct igt_spinner spin; + struct i915_request *rq; + int err = 0; + + if (igt_spinner_init(&spin, engine->gt)) + return -enomem; + + ce = intel_context_create(engine); + if (is_err(ce)) { + err = ptr_err(ce); + goto out_spin; + } + + rq = igt_spinner_create_request(&spin, ce, mi_arb_check); + if (is_err(rq)) { + err = ptr_err(rq); + goto out_ce; + } + + pr_debug("%s: cancelling inactive request ", engine->name); + i915_request_cancel(rq, -eintr); + i915_request_get(rq); + i915_request_add(rq); + + if (i915_request_wait(rq, 0, hz / 5) < 0) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("%s: failed to cancel inactive request ", engine->name); + intel_engine_dump(engine, &p, "%s ", engine->name); + err = -etime; + goto out_rq; + } + + if (rq->fence.error != -eintr) { + pr_err("%s: fence not cancelled (%u) ", + engine->name, rq->fence.error); + err = -einval; + } + +out_rq: + i915_request_put(rq); +out_ce: + intel_context_put(ce); +out_spin: + igt_spinner_fini(&spin); + if (err) + pr_err("%s: %s error %d ", __func__, engine->name, err); + return err; +} + +static int __cancel_active(struct intel_engine_cs *engine) +{ + struct intel_context *ce; + struct igt_spinner spin; + struct i915_request *rq; + int err = 0; + + if (igt_spinner_init(&spin, engine->gt)) + return -enomem; + + ce = intel_context_create(engine); + if (is_err(ce)) { + err = ptr_err(ce); + goto out_spin; + } + + rq = igt_spinner_create_request(&spin, ce, mi_arb_check); + if (is_err(rq)) { + err = ptr_err(rq); + goto out_ce; + } + + pr_debug("%s: cancelling active request ", engine->name); + i915_request_get(rq); + i915_request_add(rq); + if (!igt_wait_for_spinner(&spin, rq)) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("failed to start spinner on %s ", engine->name); + intel_engine_dump(engine, &p, "%s ", engine->name); + err = -etime; + goto out_rq; + } + i915_request_cancel(rq, -eintr); + + if (i915_request_wait(rq, 0, hz / 5) < 0) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("%s: failed to cancel active request ", engine->name); + intel_engine_dump(engine, &p, "%s ", engine->name); + err = -etime; + goto out_rq; + } + + if (rq->fence.error != -eintr) { + pr_err("%s: fence not cancelled (%u) ", + engine->name, rq->fence.error); + err = -einval; + } + +out_rq: + i915_request_put(rq); +out_ce: + intel_context_put(ce); +out_spin: + igt_spinner_fini(&spin); + if (err) + pr_err("%s: %s error %d ", __func__, engine->name, err); + return err; +} + +static int __cancel_completed(struct intel_engine_cs *engine) +{ + struct intel_context *ce; + struct igt_spinner spin; + struct i915_request *rq; + int err = 0; + + if (igt_spinner_init(&spin, engine->gt)) + return -enomem; + + ce = intel_context_create(engine); + if (is_err(ce)) { + err = ptr_err(ce); + goto out_spin; + } + + rq = igt_spinner_create_request(&spin, ce, mi_arb_check); + if (is_err(rq)) { + err = ptr_err(rq); + goto out_ce; + } + igt_spinner_end(&spin); + i915_request_get(rq); + i915_request_add(rq); + + if (i915_request_wait(rq, 0, hz / 5) < 0) { + err = -etime; + goto out_rq; + } + + pr_debug("%s: cancelling completed request ", engine->name); + i915_request_cancel(rq, -eintr); + if (rq->fence.error) { + pr_err("%s: fence not cancelled (%u) ", + engine->name, rq->fence.error); + err = -einval; + } + +out_rq: + i915_request_put(rq); +out_ce: + intel_context_put(ce); +out_spin: + igt_spinner_fini(&spin); + if (err) + pr_err("%s: %s error %d ", __func__, engine->name, err); + return err; +} + +static int live_cancel_request(void *arg) +{ + struct drm_i915_private *i915 = arg; + struct intel_engine_cs *engine; + + /* + * check cancellation of requests. we expect to be able to immediately + * cancel active requests, even if they are currently on the gpu. + */ + + for_each_uabi_engine(engine, i915) { + struct igt_live_test t; + int err, err2; + + if (!intel_engine_has_preemption(engine)) + continue; + + err = igt_live_test_begin(&t, i915, __func__, engine->name); + if (err) + return err; + + err = __cancel_inactive(engine); + if (err == 0) + err = __cancel_active(engine); + if (err == 0) + err = __cancel_completed(engine); + + err2 = igt_live_test_end(&t); + if (err) + return err; + if (err2) + return err2; + } + + return 0; +} + + subtest(live_cancel_request),
|
Graphics
|
38b237eab2bc7feac87a4c9d870368e935a0091b
|
chris wilson
|
drivers
|
gpu
|
drm, gt, i915, selftests
|
drm/i915: restrict sentinel requests further
|
disallow sentinel requests follow previous sentinels to make request cancellation work better when faced with a chain of requests which have all been marked as in error.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
default request/fence expiry + watchdog
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 1
| 1
|
--- diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c - if (unlikely((i915_request_flags(prev) ^ i915_request_flags(next)) & + if (unlikely((i915_request_flags(prev) | i915_request_flags(next)) &
|
Graphics
|
8f922e4227585d43ea3622be64d441b8b92ec62d
|
tvrtko ursulin
|
drivers
|
gpu
|
drm, gt, i915
|
drm/i915: handle async cancellation in sentinel assert
|
with the watchdog cancelling requests asynchronously to preempt-to-busy we need to relax one assert making it apply only to requests not in error.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
default request/fence expiry + watchdog
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 8
| 4
|
--- diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c - struct i915_request * const *port, *rq; + struct i915_request * const *port, *rq, *prev = null; - bool sentinel = false; + * + * nb: due to the async nature of preempt-to-busy and request + * cancellation we need to handle the case where request + * becomes a sentinel in parallel to csb processing. - if (sentinel) { + if (prev && i915_request_has_sentinel(prev) && + !read_once(prev->fence.error)) { - sentinel = i915_request_has_sentinel(rq); + prev = rq;
|
Graphics
|
90a79a91dcc0e8b1986a2ad9b00cf3b281fb09f0
|
tvrtko ursulin
|
drivers
|
gpu
|
drm, gt, i915
|
drm/i915: request watchdog infrastructure
|
prepares the plumbing for setting request/fence expiration time. all code is put in place but is never activated due yet missing ability to actually configure the timer.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
default request/fence expiry + watchdog
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 8
| 106
| 0
|
--- diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h --- a/drivers/gpu/drm/i915/gt/intel_context_types.h +++ b/drivers/gpu/drm/i915/gt/intel_context_types.h + struct { + u64 timeout_us; + } watchdog; + diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.h b/drivers/gpu/drm/i915/gt/intel_execlists_submission.h --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.h +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.h +#include <linux/llist.h> +struct intel_gt; diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c + init_llist_head(>->watchdog.list); + init_work(>->watchdog.work, intel_gt_watchdog_work); + diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h --- a/drivers/gpu/drm/i915/gt/intel_gt.h +++ b/drivers/gpu/drm/i915/gt/intel_gt.h +void intel_gt_watchdog_work(struct work_struct *work); + diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c --- a/drivers/gpu/drm/i915/gt/intel_gt_requests.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.c +#include "intel_execlists_submission.h" + + flush_work(>->watchdog.work); +} + +void intel_gt_watchdog_work(struct work_struct *work) +{ + struct intel_gt *gt = + container_of(work, typeof(*gt), watchdog.work); + struct i915_request *rq, *rn; + struct llist_node *first; + + first = llist_del_all(>->watchdog.list); + if (!first) + return; + + llist_for_each_entry_safe(rq, rn, first, watchdog.link) { + if (!i915_request_completed(rq)) { + struct dma_fence *f = &rq->fence; + + pr_notice("fence expiration time out i915-%s:%s:%llx! ", + f->ops->get_driver_name(f), + f->ops->get_timeline_name(f), + f->seqno); + i915_request_cancel(rq, -eintr); + } + i915_request_put(rq); + } diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h +#include <linux/llist.h> +#include <linux/workqueue.h> + struct { + struct llist_head list; + struct work_struct work; + } watchdog; + diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c +static void __rq_init_watchdog(struct i915_request *rq) +{ + rq->watchdog.timer.function = null; +} + +static enum hrtimer_restart __rq_watchdog_expired(struct hrtimer *hrtimer) +{ + struct i915_request *rq = + container_of(hrtimer, struct i915_request, watchdog.timer); + struct intel_gt *gt = rq->engine->gt; + + if (!i915_request_completed(rq)) { + if (llist_add(&rq->watchdog.link, >->watchdog.list)) + schedule_work(>->watchdog.work); + } else { + i915_request_put(rq); + } + + return hrtimer_norestart; +} + +static void __rq_arm_watchdog(struct i915_request *rq) +{ + struct i915_request_watchdog *wdg = &rq->watchdog; + struct intel_context *ce = rq->context; + + if (!ce->watchdog.timeout_us) + return; + + hrtimer_init(&wdg->timer, clock_monotonic, hrtimer_mode_rel); + wdg->timer.function = __rq_watchdog_expired; + hrtimer_start_range_ns(&wdg->timer, + ns_to_ktime(ce->watchdog.timeout_us * + nsec_per_usec), + nsec_per_msec, + hrtimer_mode_rel); + i915_request_get(rq); +} + +static void __rq_cancel_watchdog(struct i915_request *rq) +{ + struct i915_request_watchdog *wdg = &rq->watchdog; + + if (wdg->timer.function && hrtimer_try_to_cancel(&wdg->timer) > 0) + i915_request_put(rq); +} + + __rq_cancel_watchdog(rq); + + else + __rq_arm_watchdog(request); + __rq_init_watchdog(rq); diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h --- a/drivers/gpu/drm/i915/i915_request.h +++ b/drivers/gpu/drm/i915/i915_request.h +#include <linux/hrtimer.h> +#include <linux/llist.h> + /** watchdog support fields. */ + struct i915_request_watchdog { + struct llist_node link; + struct hrtimer timer; + } watchdog; +
|
Graphics
|
9b4d0598ee940df33ea6cbbba8c80e951223131b
|
tvrtko ursulin
|
drivers
|
gpu
|
drm, gt, i915
|
drm/i915: fail too long user submissions by default
|
a new kconfig option config_drm_i915_request_timeout is added, defaulting to 20s, and this timeout is applied to all users contexts using the previously added watchdog facility.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
default request/fence expiry + watchdog
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['profile', 'h', 'c']
| 4
| 66
| 1
|
--- diff --git a/drivers/gpu/drm/i915/kconfig.profile b/drivers/gpu/drm/i915/kconfig.profile --- a/drivers/gpu/drm/i915/kconfig.profile +++ b/drivers/gpu/drm/i915/kconfig.profile +config drm_i915_request_timeout + int "default timeout for requests (ms)" + default 20000 # milliseconds + help + configures the default timeout after which any user submissions will + be forcefully terminated. + + beware setting this value lower, or close to heartbeat interval + rounded to whole seconds times three, in order to avoid allowing + misbehaving applications causing total rendering failure in unrelated + clients. + + may be 0 to disable the timeout. + diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c + + intel_context_set_watchdog_us(ce, ctx->watchdog.timeout_us); +static int __apply_watchdog(struct intel_context *ce, void *timeout_us) +{ + return intel_context_set_watchdog_us(ce, (uintptr_t)timeout_us); +} + +static int +__set_watchdog(struct i915_gem_context *ctx, unsigned long timeout_us) +{ + int ret; + + ret = context_apply_all(ctx, __apply_watchdog, + (void *)(uintptr_t)timeout_us); + if (!ret) + ctx->watchdog.timeout_us = timeout_us; + + return ret; +} + +static void __set_default_fence_expiry(struct i915_gem_context *ctx) +{ + struct drm_i915_private *i915 = ctx->i915; + int ret; + + if (!is_active(config_drm_i915_request_timeout)) + return; + + /* default expiry for user fences. */ + ret = __set_watchdog(ctx, config_drm_i915_request_timeout * 1000); + if (ret) + drm_notice(&i915->drm, + "failed to configure default fence expiry! (%d)", + ret); +} + + __set_default_fence_expiry(ctx); + diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h + struct { + u64 timeout_us; + } watchdog; + diff --git a/drivers/gpu/drm/i915/gt/intel_context_param.h b/drivers/gpu/drm/i915/gt/intel_context_param.h --- a/drivers/gpu/drm/i915/gt/intel_context_param.h +++ b/drivers/gpu/drm/i915/gt/intel_context_param.h -struct intel_context; +#include <linux/types.h> + +#include "intel_context.h" +static inline int +intel_context_set_watchdog_us(struct intel_context *ce, u64 timeout_us) +{ + ce->watchdog.timeout_us = timeout_us; + return 0; +} +
|
Graphics
|
e8dbb566b338cc25f78278378dfcc21bfa8d62a0
|
tvrtko ursulin
|
drivers
|
gpu
|
drm, gem, gt, i915
|
drm/i915: allow configuring default request expiry via modparam
|
module parameter is added (request_timeout_ms) to allow configuring the default request/fence expiry.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
default request/fence expiry + watchdog
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 3
| 9
| 2
|
--- diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c - if (!is_active(config_drm_i915_request_timeout)) + if (!is_active(config_drm_i915_request_timeout) || + !i915->params.request_timeout_ms) - ret = __set_watchdog(ctx, config_drm_i915_request_timeout * 1000); + ret = __set_watchdog(ctx, i915->params.request_timeout_ms * 1000); diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c +#if config_drm_i915_request_timeout +i915_param_named_unsafe(request_timeout_ms, uint, 0600, + "default request/fence/batch buffer expiration timeout."); +#endif + diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h + param(unsigned int, request_timeout_ms, config_drm_i915_request_timeout, 0600) \
|
Graphics
|
54d4e9f5c4d7b3ae639b985ea9fc470469cc17ff
|
tvrtko ursulin
|
drivers
|
gpu
|
drm, gem, i915
|
drm/i915/gem: drop legacy execbuffer support (v2)
|
libdrm has supported the newer execbuffer2 ioctl and using it by default when it exists since libdrm commit b50964027bef which landed mar 2, 2010. the i915 and i965 drivers in mesa at the time both used libdrm and so did the intel x11 back-end. the sna back-end for x11 has always used execbuffer2.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
drop legacy ioctls on new hw
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['h', 'c']
| 4
| 2
| 103
|
- add a comment saying what linux version it's being removed in. --- diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c -/* - * legacy execbuffer just creates an exec2 list from the original exec object - * list array and passes it to the real function. - */ -int -i915_gem_execbuffer_ioctl(struct drm_device *dev, void *data, - struct drm_file *file) -{ - struct drm_i915_private *i915 = to_i915(dev); - struct drm_i915_gem_execbuffer *args = data; - struct drm_i915_gem_execbuffer2 exec2; - struct drm_i915_gem_exec_object *exec_list = null; - struct drm_i915_gem_exec_object2 *exec2_list = null; - const size_t count = args->buffer_count; - unsigned int i; - int err; - - if (!check_buffer_count(count)) { - drm_dbg(&i915->drm, "execbuf2 with %zd buffers ", count); - return -einval; - } - - exec2.buffers_ptr = args->buffers_ptr; - exec2.buffer_count = args->buffer_count; - exec2.batch_start_offset = args->batch_start_offset; - exec2.batch_len = args->batch_len; - exec2.dr1 = args->dr1; - exec2.dr4 = args->dr4; - exec2.num_cliprects = args->num_cliprects; - exec2.cliprects_ptr = args->cliprects_ptr; - exec2.flags = i915_exec_render; - i915_execbuffer2_set_context_id(exec2, 0); - - err = i915_gem_check_execbuffer(&exec2); - if (err) - return err; - - /* copy in the exec list from userland */ - exec_list = kvmalloc_array(count, sizeof(*exec_list), - __gfp_nowarn | gfp_kernel); - - /* allocate extra slots for use by the command parser */ - exec2_list = kvmalloc_array(count + 2, eb_element_size(), - __gfp_nowarn | gfp_kernel); - if (exec_list == null || exec2_list == null) { - drm_dbg(&i915->drm, - "failed to allocate exec list for %d buffers ", - args->buffer_count); - kvfree(exec_list); - kvfree(exec2_list); - return -enomem; - } - err = copy_from_user(exec_list, - u64_to_user_ptr(args->buffers_ptr), - sizeof(*exec_list) * count); - if (err) { - drm_dbg(&i915->drm, "copy %d exec entries failed %d ", - args->buffer_count, err); - kvfree(exec_list); - kvfree(exec2_list); - return -efault; - } - - for (i = 0; i < args->buffer_count; i++) { - exec2_list[i].handle = exec_list[i].handle; - exec2_list[i].relocation_count = exec_list[i].relocation_count; - exec2_list[i].relocs_ptr = exec_list[i].relocs_ptr; - exec2_list[i].alignment = exec_list[i].alignment; - exec2_list[i].offset = exec_list[i].offset; - if (intel_gen(to_i915(dev)) < 4) - exec2_list[i].flags = exec_object_needs_fence; - else - exec2_list[i].flags = 0; - } - - err = i915_gem_do_execbuffer(dev, file, &exec2, exec2_list); - if (exec2.flags & __exec_has_reloc) { - struct drm_i915_gem_exec_object __user *user_exec_list = - u64_to_user_ptr(args->buffers_ptr); - - /* copy the new buffer offsets back to the user's exec list. */ - for (i = 0; i < args->buffer_count; i++) { - if (!(exec2_list[i].offset & update)) - continue; - - exec2_list[i].offset = - gen8_canonical_addr(exec2_list[i].offset & pin_offset_mask); - exec2_list[i].offset &= pin_offset_mask; - if (__copy_to_user(&user_exec_list[i].offset, - &exec2_list[i].offset, - sizeof(user_exec_list[i].offset))) - break; - } - } - - kvfree(exec_list); - kvfree(exec2_list); - return err; -} - diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h b/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h --- a/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_ioctls.h -int i915_gem_execbuffer_ioctl(struct drm_device *dev, void *data, - struct drm_file *file); diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c - drm_ioctl_def_drv(i915_gem_execbuffer, i915_gem_execbuffer_ioctl, drm_auth), + drm_ioctl_def_drv(i915_gem_execbuffer, drm_invalid_op, drm_auth), diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h +/* drm_ioctl_i915_gem_execbuffer was removed in linux 5.13 */
|
Graphics
|
b5b6f6a610127b17f20c0ca03dd27beee4ddc2b2
|
jason ekstrand
|
drivers
|
gpu
|
drm, gem, i915
|
drm/i915/gem: drop relocation support on all new hardware (v6)
|
the vulkan driver in mesa for intel hardware never uses relocations if it's running on a version of i915 that supports at least softpin which all versions of i915 supporting gen12 do. on the opengl side, gen12+ is only supported by iris which never uses relocations. the older i965 driver in mesa does use relocations but it only supports intel hardware through gen11 and has been deprecated for all hardware gen9+. the compute driver also never uses relocations. this only leaves the media driver which is supposed to be switching to softpin going forward. making softpin a requirement for all future hardware seems reasonable.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
drop legacy ioctls on new hw
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 7
| 0
|
- allow tgl-lp platforms as they've already shipped - warn_on platforms with lmem support in case the check is wrong - call out rocket lake in the commit message - drop the has_lmem check as it's already covered by the version check - move the check to eb_validate_vma() with all the other exec_object --- diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c + /* relocations are disallowed for all platforms after tgl-lp. this + * also covers all platforms with local memory. + */ + if (entry->relocation_count && + intel_gen(eb->i915) >= 12 && !is_tigerlake(eb->i915)) + return -einval; +
|
Graphics
|
2eb8e1a69d9f8cc9c0a75e327f854957224ba421
|
jason ekstrand
|
drivers
|
gpu
|
drm, gem, i915
|
drm/i915: disable pread/pwrite ioctl's for future platforms (v3)
|
the rationale for this change is roughly as follows:
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
drop legacy ioctls on new hw
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['intel ']
|
['c']
| 1
| 14
| 0
|
- improved commit message with the status of all usermode drivers - a more future-proof platform check - drop the has_lmem checks as they're already covered by the version --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c + struct drm_i915_private *i915 = to_i915(dev); + /* pread is disallowed for all platforms after tgl-lp. this also + * covers all platforms with local memory. + */ + if (intel_gen(i915) >= 12 && !is_tigerlake(i915)) + return -eopnotsupp; + + struct drm_i915_private *i915 = to_i915(dev); + /* pwrite is disallowed for all platforms after tgl-lp. this also + * covers all platforms with local memory. + */ + if (intel_gen(i915) >= 12 && !is_tigerlake(i915)) + return -eopnotsupp; +
|
Graphics
|
f8d1ff107d2cdd59cdc6cce11722e351b4b328ae
|
ashutosh dixit
|
drivers
|
gpu
|
drm, i915
|
drm: add gud usb display driver
|
this adds a usb display driver with the intention that it can be used with future usb interfaced low end displays/adapters. the linux gadget device driver will serve as the canonical device implementation.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add gud usb display driver
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['c', 'h', 'kconfig', 'maintainers', 'makefile']
| 10
| 2,458
| 0
|
- plane rotation - connector tv properties - use devm_drm_dev_alloc() and drmm_mode_config_init() - drm_fbdev_generic_setup: use preferred_bpp=0, 16 was a copy paste error - the drm_backlight_helper is dropped, copy in the code - support protocol version backwards compatibility for device - use donated openmoko usb pid - use direct compression from framebuffer when pitch matches, not only on - use __le16 in struct gud_drm_req_get_connector_status - set edid property when the device only provides edid - clear compression fields in struct gud_drm_req_set_buffer - fix protocol version negotiation - remove mode->vrefresh, it's calculated - drop the status req polling which was a workaround for something that - add a flag for the linux gadget to require a status request on - use protocol specific error codes (peter) - add a flag for devices that want to receive the entire framebuffer on - retry a failed framebuffer flush - if mode has changed wait for worker and clear pending damage before - increase error counter on bulk transfer failures - use drm_mode_connector_usb - handle r1 kmalloc error (peter) - don't try and replicate the usb get descriptor request standard for the - make max_buffer_size optional (peter), drop the pow2 requirement since - don't pre-alloc a control request buffer, it was only 4k - let gud.h describe the whole protocol explicitly and don't let drm - drop display mode .hskew and .vscan from the protocol - shorten names: s/gud_drm_/gud_/ s/gud_drm_/gud_/ (peter) - fix gud_pipe_check() connector picking when switching connector - drop gud_drm_driver_gem_create_object() cached is default now - retrieve usb device from struct drm_device.dev instead of keeping a - honour fb->offsets[0] - fix mode fetching when connector status is forced - check edid length reported by the device - use drm_do_get_edid() so userspace can overrride edid - set epoch counter to signal connector status change - gud_drm_driver can be const now - gud_drm_format_r1: use non-human ascii values (daniel) - change name to: gud usb display (thomas, simon) - change one __u32 -> __le32 in protocol header - always log fb flush errors, unless the previous one failed - run backlight update in a worker to avoid upsetting lockdep (daniel) - drop backlight_ops.get_brightness, there's no readback from the device - set dma mask, needed by dma-buf importers - use obj-y in makefile (peter) - fix missing le32_to_cpu() when using gud_display_magic (peter) - set initial brightness on backlight device - lz4_compress_default() can return zero, check for that - fix memory leak in gud_pipe_check() error path (peter) - improve debug and error messages (peter) - don't pass length in protocol structs (peter) - pass usb interface to gud_usb_control_msg() et al. (peter) - improve gud_connector_fill_properties() (peter) - add gud_pixel_format_rgb111 (peter) - remove gud_req_set_version (peter) - fix drm_ioctl_mode_obj_setproperty and the rotation property - fix dma-buf import (thomas) - forgot to filter rgb111 from reaching userspace - handle a device that only returns unknown device properties (peter) - s/gud_pixel_format_rgb111/gud_pixel_format_xrgb1111/ (peter) - fix r1 and xrgb1111 format conversion - add fixme about big endian being broken (peter, ilia) --- diff --git a/maintainers b/maintainers --- a/maintainers +++ b/maintainers +drm driver for generic usb display +m: noralf trnnes <noralf@tronnes.org> +s: maintained +w: https://github.com/notro/gud/wiki +t: git git://anongit.freedesktop.org/drm/drm-misc +f: drivers/gpu/drm/gud/ +f: include/drm/gud.h + diff --git a/drivers/gpu/drm/kconfig b/drivers/gpu/drm/kconfig --- a/drivers/gpu/drm/kconfig +++ b/drivers/gpu/drm/kconfig +source "drivers/gpu/drm/gud/kconfig" + diff --git a/drivers/gpu/drm/makefile b/drivers/gpu/drm/makefile --- a/drivers/gpu/drm/makefile +++ b/drivers/gpu/drm/makefile +obj-y += gud/ diff --git a/drivers/gpu/drm/gud/kconfig b/drivers/gpu/drm/gud/kconfig --- /dev/null +++ b/drivers/gpu/drm/gud/kconfig +# spdx-license-identifier: gpl-2.0 + +config drm_gud + tristate "gud usb display" + depends on drm && usb + select lz4_compress + select drm_kms_helper + select drm_gem_shmem_helper + select backlight_class_device + help + this is a drm display driver for gud usb displays or display + adapters. + + if m is selected the module will be called gud. diff --git a/drivers/gpu/drm/gud/makefile b/drivers/gpu/drm/gud/makefile --- /dev/null +++ b/drivers/gpu/drm/gud/makefile +# spdx-license-identifier: gpl-2.0 + +gud-y := gud_drv.o gud_pipe.o gud_connector.o +obj-$(config_drm_gud) += gud.o diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c --- /dev/null +++ b/drivers/gpu/drm/gud/gud_connector.c +// spdx-license-identifier: mit +/* + * copyright 2020 noralf trnnes + */ + +#include <linux/backlight.h> +#include <linux/workqueue.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_state_helper.h> +#include <drm/drm_connector.h> +#include <drm/drm_drv.h> +#include <drm/drm_encoder.h> +#include <drm/drm_file.h> +#include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_simple_kms_helper.h> +#include <drm/gud.h> + +#include "gud_internal.h" + +struct gud_connector { + struct drm_connector connector; + struct drm_encoder encoder; + struct backlight_device *backlight; + struct work_struct backlight_work; + + /* supported properties */ + u16 *properties; + unsigned int num_properties; + + /* initial gadget tv state if applicable, applied on state reset */ + struct drm_tv_connector_state initial_tv_state; + + /* + * initial gadget backlight brightness if applicable, applied on state reset. + * the value -enodev is used to signal no backlight. + */ + int initial_brightness; +}; + +static inline struct gud_connector *to_gud_connector(struct drm_connector *connector) +{ + return container_of(connector, struct gud_connector, connector); +} + +static void gud_conn_err(struct drm_connector *connector, const char *msg, int ret) +{ + dev_err(connector->dev->dev, "%s: %s (ret=%d) ", connector->name, msg, ret); +} + +/* + * use a worker to avoid taking kms locks inside the backlight lock. + * other display drivers use backlight within their kms locks. + * this avoids inconsistent locking rules, which would upset lockdep. + */ +static void gud_connector_backlight_update_status_work(struct work_struct *work) +{ + struct gud_connector *gconn = container_of(work, struct gud_connector, backlight_work); + struct drm_connector *connector = &gconn->connector; + struct drm_connector_state *connector_state; + struct drm_device *drm = connector->dev; + struct drm_modeset_acquire_ctx ctx; + struct drm_atomic_state *state; + int idx, ret; + + if (!drm_dev_enter(drm, &idx)) + return; + + state = drm_atomic_state_alloc(drm); + if (!state) { + ret = -enomem; + goto exit; + } + + drm_modeset_acquire_init(&ctx, 0); + state->acquire_ctx = &ctx; +retry: + connector_state = drm_atomic_get_connector_state(state, connector); + if (is_err(connector_state)) { + ret = ptr_err(connector_state); + goto out; + } + + /* reuse tv.brightness to avoid having to subclass */ + connector_state->tv.brightness = gconn->backlight->props.brightness; + + ret = drm_atomic_commit(state); +out: + if (ret == -edeadlk) { + drm_atomic_state_clear(state); + drm_modeset_backoff(&ctx); + goto retry; + } + + drm_atomic_state_put(state); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +exit: + drm_dev_exit(idx); + + if (ret) + dev_err(drm->dev, "failed to update backlight, err=%d ", ret); +} + +static int gud_connector_backlight_update_status(struct backlight_device *bd) +{ + struct drm_connector *connector = bl_get_data(bd); + struct gud_connector *gconn = to_gud_connector(connector); + + /* the usb timeout is 5 seconds so use system_long_wq for worst case scenario */ + queue_work(system_long_wq, &gconn->backlight_work); + + return 0; +} + +static const struct backlight_ops gud_connector_backlight_ops = { + .update_status = gud_connector_backlight_update_status, +}; + +static int gud_connector_backlight_register(struct gud_connector *gconn) +{ + struct drm_connector *connector = &gconn->connector; + struct backlight_device *bd; + const char *name; + const struct backlight_properties props = { + .type = backlight_raw, + .scale = backlight_scale_non_linear, + .max_brightness = 100, + .brightness = gconn->initial_brightness, + }; + + name = kasprintf(gfp_kernel, "card%d-%s-backlight", + connector->dev->primary->index, connector->name); + if (!name) + return -enomem; + + bd = backlight_device_register(name, connector->kdev, connector, + &gud_connector_backlight_ops, &props); + kfree(name); + if (is_err(bd)) + return ptr_err(bd); + + gconn->backlight = bd; + + return 0; +} + +static int gud_connector_detect(struct drm_connector *connector, + struct drm_modeset_acquire_ctx *ctx, bool force) +{ + struct gud_device *gdrm = to_gud_device(connector->dev); + int idx, ret; + u8 status; + + if (!drm_dev_enter(connector->dev, &idx)) + return connector_status_disconnected; + + if (force) { + ret = gud_usb_set(gdrm, gud_req_set_connector_force_detect, + connector->index, null, 0); + if (ret) { + ret = connector_status_unknown; + goto exit; + } + } + + ret = gud_usb_get_u8(gdrm, gud_req_get_connector_status, connector->index, &status); + if (ret) { + ret = connector_status_unknown; + goto exit; + } + + switch (status & gud_connector_status_connected_mask) { + case gud_connector_status_disconnected: + ret = connector_status_disconnected; + break; + case gud_connector_status_connected: + ret = connector_status_connected; + break; + default: + ret = connector_status_unknown; + break; + }; + + if (status & gud_connector_status_changed) + connector->epoch_counter += 1; +exit: + drm_dev_exit(idx); + + return ret; +} + +struct gud_connector_get_edid_ctx { + void *buf; + size_t len; + bool edid_override; +}; + +static int gud_connector_get_edid_block(void *data, u8 *buf, unsigned int block, size_t len) +{ + struct gud_connector_get_edid_ctx *ctx = data; + size_t start = block * edid_length; + + ctx->edid_override = false; + + if (start + len > ctx->len) + return -1; + + memcpy(buf, ctx->buf + start, len); + + return 0; +} + +static int gud_connector_get_modes(struct drm_connector *connector) +{ + struct gud_device *gdrm = to_gud_device(connector->dev); + struct gud_display_mode_req *reqmodes = null; + struct gud_connector_get_edid_ctx edid_ctx; + unsigned int i, num_modes = 0; + struct edid *edid = null; + int idx, ret; + + if (!drm_dev_enter(connector->dev, &idx)) + return 0; + + edid_ctx.edid_override = true; + edid_ctx.buf = kmalloc(gud_connector_max_edid_len, gfp_kernel); + if (!edid_ctx.buf) + goto out; + + ret = gud_usb_get(gdrm, gud_req_get_connector_edid, connector->index, + edid_ctx.buf, gud_connector_max_edid_len); + if (ret > 0 && ret % edid_length) { + gud_conn_err(connector, "invalid edid size", ret); + } else if (ret > 0) { + edid_ctx.len = ret; + edid = drm_do_get_edid(connector, gud_connector_get_edid_block, &edid_ctx); + } + + kfree(edid_ctx.buf); + drm_connector_update_edid_property(connector, edid); + + if (edid && edid_ctx.edid_override) + goto out; + + reqmodes = kmalloc_array(gud_connector_max_num_modes, sizeof(*reqmodes), gfp_kernel); + if (!reqmodes) + goto out; + + ret = gud_usb_get(gdrm, gud_req_get_connector_modes, connector->index, + reqmodes, gud_connector_max_num_modes * sizeof(*reqmodes)); + if (ret <= 0) + goto out; + if (ret % sizeof(*reqmodes)) { + gud_conn_err(connector, "invalid display mode array size", ret); + goto out; + } + + num_modes = ret / sizeof(*reqmodes); + + for (i = 0; i < num_modes; i++) { + struct drm_display_mode *mode; + + mode = drm_mode_create(connector->dev); + if (!mode) { + num_modes = i; + goto out; + } + + gud_to_display_mode(mode, &reqmodes[i]); + drm_mode_probed_add(connector, mode); + } +out: + if (!num_modes) + num_modes = drm_add_edid_modes(connector, edid); + + kfree(reqmodes); + kfree(edid); + drm_dev_exit(idx); + + return num_modes; +} + +static int gud_connector_atomic_check(struct drm_connector *connector, + struct drm_atomic_state *state) +{ + struct drm_connector_state *new_state; + struct drm_crtc_state *new_crtc_state; + struct drm_connector_state *old_state; + + new_state = drm_atomic_get_new_connector_state(state, connector); + if (!new_state->crtc) + return 0; + + old_state = drm_atomic_get_old_connector_state(state, connector); + new_crtc_state = drm_atomic_get_new_crtc_state(state, new_state->crtc); + + if (old_state->tv.margins.left != new_state->tv.margins.left || + old_state->tv.margins.right != new_state->tv.margins.right || + old_state->tv.margins.top != new_state->tv.margins.top || + old_state->tv.margins.bottom != new_state->tv.margins.bottom || + old_state->tv.mode != new_state->tv.mode || + old_state->tv.brightness != new_state->tv.brightness || + old_state->tv.contrast != new_state->tv.contrast || + old_state->tv.flicker_reduction != new_state->tv.flicker_reduction || + old_state->tv.overscan != new_state->tv.overscan || + old_state->tv.saturation != new_state->tv.saturation || + old_state->tv.hue != new_state->tv.hue) + new_crtc_state->connectors_changed = true; + + return 0; +} + +static const struct drm_connector_helper_funcs gud_connector_helper_funcs = { + .detect_ctx = gud_connector_detect, + .get_modes = gud_connector_get_modes, + .atomic_check = gud_connector_atomic_check, +}; + +static int gud_connector_late_register(struct drm_connector *connector) +{ + struct gud_connector *gconn = to_gud_connector(connector); + + if (gconn->initial_brightness < 0) + return 0; + + return gud_connector_backlight_register(gconn); +} + +static void gud_connector_early_unregister(struct drm_connector *connector) +{ + struct gud_connector *gconn = to_gud_connector(connector); + + backlight_device_unregister(gconn->backlight); + cancel_work_sync(&gconn->backlight_work); +} + +static void gud_connector_destroy(struct drm_connector *connector) +{ + struct gud_connector *gconn = to_gud_connector(connector); + + drm_connector_cleanup(connector); + kfree(gconn->properties); + kfree(gconn); +} + +static void gud_connector_reset(struct drm_connector *connector) +{ + struct gud_connector *gconn = to_gud_connector(connector); + + drm_atomic_helper_connector_reset(connector); + connector->state->tv = gconn->initial_tv_state; + /* set margins from command line */ + drm_atomic_helper_connector_tv_reset(connector); + if (gconn->initial_brightness >= 0) + connector->state->tv.brightness = gconn->initial_brightness; +} + +static const struct drm_connector_funcs gud_connector_funcs = { + .fill_modes = drm_helper_probe_single_connector_modes, + .late_register = gud_connector_late_register, + .early_unregister = gud_connector_early_unregister, + .destroy = gud_connector_destroy, + .reset = gud_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +/* + * the tv.mode property is shared among the connectors and its enum names are + * driver specific. this means that if more than one connector uses tv.mode, + * the enum names has to be the same. + */ +static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connector *connector) +{ + size_t buf_len = gud_connector_tv_mode_max_num * gud_connector_tv_mode_name_len; + const char *modes[gud_connector_tv_mode_max_num]; + unsigned int i, num_modes; + char *buf; + int ret; + + buf = kmalloc(buf_len, gfp_kernel); + if (!buf) + return -enomem; + + ret = gud_usb_get(gdrm, gud_req_get_connector_tv_mode_values, + connector->index, buf, buf_len); + if (ret < 0) + goto free; + if (!ret || ret % gud_connector_tv_mode_name_len) { + ret = -eio; + goto free; + } + + num_modes = ret / gud_connector_tv_mode_name_len; + for (i = 0; i < num_modes; i++) + modes[i] = &buf[i * gud_connector_tv_mode_name_len]; + + ret = drm_mode_create_tv_properties(connector->dev, num_modes, modes); +free: + kfree(buf); + if (ret < 0) + gud_conn_err(connector, "failed to add tv modes", ret); + + return ret; +} + +static struct drm_property * +gud_connector_property_lookup(struct drm_connector *connector, u16 prop) +{ + struct drm_mode_config *config = &connector->dev->mode_config; + + switch (prop) { + case gud_property_tv_left_margin: + return config->tv_left_margin_property; + case gud_property_tv_right_margin: + return config->tv_right_margin_property; + case gud_property_tv_top_margin: + return config->tv_top_margin_property; + case gud_property_tv_bottom_margin: + return config->tv_bottom_margin_property; + case gud_property_tv_mode: + return config->tv_mode_property; + case gud_property_tv_brightness: + return config->tv_brightness_property; + case gud_property_tv_contrast: + return config->tv_contrast_property; + case gud_property_tv_flicker_reduction: + return config->tv_flicker_reduction_property; + case gud_property_tv_overscan: + return config->tv_overscan_property; + case gud_property_tv_saturation: + return config->tv_saturation_property; + case gud_property_tv_hue: + return config->tv_hue_property; + default: + return err_ptr(-einval); + } +} + +static unsigned int *gud_connector_tv_state_val(u16 prop, struct drm_tv_connector_state *state) +{ + switch (prop) { + case gud_property_tv_left_margin: + return &state->margins.left; + case gud_property_tv_right_margin: + return &state->margins.right; + case gud_property_tv_top_margin: + return &state->margins.top; + case gud_property_tv_bottom_margin: + return &state->margins.bottom; + case gud_property_tv_mode: + return &state->mode; + case gud_property_tv_brightness: + return &state->brightness; + case gud_property_tv_contrast: + return &state->contrast; + case gud_property_tv_flicker_reduction: + return &state->flicker_reduction; + case gud_property_tv_overscan: + return &state->overscan; + case gud_property_tv_saturation: + return &state->saturation; + case gud_property_tv_hue: + return &state->hue; + default: + return err_ptr(-einval); + } +} + +static int gud_connector_add_properties(struct gud_device *gdrm, struct gud_connector *gconn) +{ + struct drm_connector *connector = &gconn->connector; + struct drm_device *drm = &gdrm->drm; + struct gud_property_req *properties; + unsigned int i, num_properties; + int ret; + + properties = kcalloc(gud_connector_properties_max_num, sizeof(*properties), gfp_kernel); + if (!properties) + return -enomem; + + ret = gud_usb_get(gdrm, gud_req_get_connector_properties, connector->index, + properties, gud_connector_properties_max_num * sizeof(*properties)); + if (ret <= 0) + goto out; + if (ret % sizeof(*properties)) { + ret = -eio; + goto out; + } + + num_properties = ret / sizeof(*properties); + ret = 0; + + gconn->properties = kcalloc(num_properties, sizeof(*gconn->properties), gfp_kernel); + if (!gconn->properties) { + ret = -enomem; + goto out; + } + + for (i = 0; i < num_properties; i++) { + u16 prop = le16_to_cpu(properties[i].prop); + u64 val = le64_to_cpu(properties[i].val); + struct drm_property *property; + unsigned int *state_val; + + drm_dbg(drm, "property: %u = %llu(0x%llx) ", prop, val, val); + + switch (prop) { + case gud_property_tv_left_margin: + fallthrough; + case gud_property_tv_right_margin: + fallthrough; + case gud_property_tv_top_margin: + fallthrough; + case gud_property_tv_bottom_margin: + ret = drm_mode_create_tv_margin_properties(drm); + if (ret) + goto out; + break; + case gud_property_tv_mode: + ret = gud_connector_add_tv_mode(gdrm, connector); + if (ret) + goto out; + break; + case gud_property_tv_brightness: + fallthrough; + case gud_property_tv_contrast: + fallthrough; + case gud_property_tv_flicker_reduction: + fallthrough; + case gud_property_tv_overscan: + fallthrough; + case gud_property_tv_saturation: + fallthrough; + case gud_property_tv_hue: + /* this is a no-op if already added. */ + ret = drm_mode_create_tv_properties(drm, 0, null); + if (ret) + goto out; + break; + case gud_property_backlight_brightness: + if (val > 100) { + ret = -einval; + goto out; + } + gconn->initial_brightness = val; + break; + default: + /* new ones might show up in future devices, skip those we don't know. */ + drm_dbg(drm, "ignoring unknown property: %u ", prop); + continue; + } + + gconn->properties[gconn->num_properties++] = prop; + + if (prop == gud_property_backlight_brightness) + continue; /* not a drm property */ + + property = gud_connector_property_lookup(connector, prop); + if (warn_on(is_err(property))) + continue; + + state_val = gud_connector_tv_state_val(prop, &gconn->initial_tv_state); + if (warn_on(is_err(state_val))) + continue; + + *state_val = val; + drm_object_attach_property(&connector->base, property, 0); + } +out: + kfree(properties); + + return ret; +} + +int gud_connector_fill_properties(struct drm_connector_state *connector_state, + struct gud_property_req *properties) +{ + struct gud_connector *gconn = to_gud_connector(connector_state->connector); + unsigned int i; + + for (i = 0; i < gconn->num_properties; i++) { + u16 prop = gconn->properties[i]; + u64 val; + + if (prop == gud_property_backlight_brightness) { + val = connector_state->tv.brightness; + } else { + unsigned int *state_val; + + state_val = gud_connector_tv_state_val(prop, &connector_state->tv); + if (warn_on_once(is_err(state_val))) + return ptr_err(state_val); + + val = *state_val; + } + + properties[i].prop = cpu_to_le16(prop); + properties[i].val = cpu_to_le64(val); + } + + return gconn->num_properties; +} + +static int gud_connector_create(struct gud_device *gdrm, unsigned int index, + struct gud_connector_descriptor_req *desc) +{ + struct drm_device *drm = &gdrm->drm; + struct gud_connector *gconn; + struct drm_connector *connector; + struct drm_encoder *encoder; + int ret, connector_type; + u32 flags; + + gconn = kzalloc(sizeof(*gconn), gfp_kernel); + if (!gconn) + return -enomem; + + init_work(&gconn->backlight_work, gud_connector_backlight_update_status_work); + gconn->initial_brightness = -enodev; + flags = le32_to_cpu(desc->flags); + connector = &gconn->connector; + + drm_dbg(drm, "connector: index=%u type=%u flags=0x%x ", index, desc->connector_type, flags); + + switch (desc->connector_type) { + case gud_connector_type_panel: + connector_type = drm_mode_connector_usb; + break; + case gud_connector_type_vga: + connector_type = drm_mode_connector_vga; + break; + case gud_connector_type_dvi: + connector_type = drm_mode_connector_dvid; + break; + case gud_connector_type_composite: + connector_type = drm_mode_connector_composite; + break; + case gud_connector_type_svideo: + connector_type = drm_mode_connector_svideo; + break; + case gud_connector_type_component: + connector_type = drm_mode_connector_component; + break; + case gud_connector_type_displayport: + connector_type = drm_mode_connector_displayport; + break; + case gud_connector_type_hdmi: + connector_type = drm_mode_connector_hdmia; + break; + default: /* future types */ + connector_type = drm_mode_connector_usb; + break; + }; + + drm_connector_helper_add(connector, &gud_connector_helper_funcs); + ret = drm_connector_init(drm, connector, &gud_connector_funcs, connector_type); + if (ret) { + kfree(connector); + return ret; + } + + if (warn_on(connector->index != index)) + return -einval; + + if (flags & gud_connector_flags_poll_status) + connector->polled = (drm_connector_poll_connect | drm_connector_poll_disconnect); + if (flags & gud_connector_flags_interlace) + connector->interlace_allowed = true; + if (flags & gud_connector_flags_doublescan) + connector->doublescan_allowed = true; + + ret = gud_connector_add_properties(gdrm, gconn); + if (ret) { + gud_conn_err(connector, "failed to add properties", ret); + return ret; + } + + /* the first connector is attached to the existing simple pipe encoder */ + if (!connector->index) { + encoder = &gdrm->pipe.encoder; + } else { + encoder = &gconn->encoder; + + ret = drm_simple_encoder_init(drm, encoder, drm_mode_encoder_none); + if (ret) + return ret; + + encoder->possible_crtcs = 1; + } + + return drm_connector_attach_encoder(connector, encoder); +} + +int gud_get_connectors(struct gud_device *gdrm) +{ + struct gud_connector_descriptor_req *descs; + unsigned int i, num_connectors; + int ret; + + descs = kmalloc_array(gud_connectors_max_num, sizeof(*descs), gfp_kernel); + if (!descs) + return -enomem; + + ret = gud_usb_get(gdrm, gud_req_get_connectors, 0, + descs, gud_connectors_max_num * sizeof(descs)); + if (ret < 0) + goto free; + if (!ret || ret % sizeof(*descs)) { + ret = -eio; + goto free; + } + + num_connectors = ret / sizeof(*descs); + + for (i = 0; i < num_connectors; i++) { + ret = gud_connector_create(gdrm, i, &descs[i]); + if (ret) + goto free; + } +free: + kfree(descs); + + return ret; +} diff --git a/drivers/gpu/drm/gud/gud_drv.c b/drivers/gpu/drm/gud/gud_drv.c --- /dev/null +++ b/drivers/gpu/drm/gud/gud_drv.c +// spdx-license-identifier: mit +/* + * copyright 2020 noralf trnnes + */ + +#include <linux/dma-buf.h> +#include <linux/dma-mapping.h> +#include <linux/lz4.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/string_helpers.h> +#include <linux/usb.h> +#include <linux/vmalloc.h> +#include <linux/workqueue.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_damage_helper.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_atomic_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_gem_shmem_helper.h> +#include <drm/drm_managed.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_simple_kms_helper.h> +#include <drm/gud.h> + +#include "gud_internal.h" + +/* only used internally */ +static const struct drm_format_info gud_drm_format_r1 = { + .format = gud_drm_format_r1, + .num_planes = 1, + .char_per_block = { 1, 0, 0 }, + .block_w = { 8, 0, 0 }, + .block_h = { 1, 0, 0 }, + .hsub = 1, + .vsub = 1, +}; + +static const struct drm_format_info gud_drm_format_xrgb1111 = { + .format = gud_drm_format_xrgb1111, + .num_planes = 1, + .char_per_block = { 1, 0, 0 }, + .block_w = { 2, 0, 0 }, + .block_h = { 1, 0, 0 }, + .hsub = 1, + .vsub = 1, +}; + +static int gud_usb_control_msg(struct usb_interface *intf, bool in, + u8 request, u16 value, void *buf, size_t len) +{ + u8 requesttype = usb_type_vendor | usb_recip_interface; + u8 ifnum = intf->cur_altsetting->desc.binterfacenumber; + struct usb_device *usb = interface_to_usbdev(intf); + unsigned int pipe; + + if (len && !buf) + return -einval; + + if (in) { + pipe = usb_rcvctrlpipe(usb, 0); + requesttype |= usb_dir_in; + } else { + pipe = usb_sndctrlpipe(usb, 0); + requesttype |= usb_dir_out; + } + + return usb_control_msg(usb, pipe, request, requesttype, value, + ifnum, buf, len, usb_ctrl_get_timeout); +} + +static int gud_get_display_descriptor(struct usb_interface *intf, + struct gud_display_descriptor_req *desc) +{ + void *buf; + int ret; + + buf = kmalloc(sizeof(*desc), gfp_kernel); + if (!buf) + return -enomem; + + ret = gud_usb_control_msg(intf, true, gud_req_get_descriptor, 0, buf, sizeof(*desc)); + memcpy(desc, buf, sizeof(*desc)); + kfree(buf); + if (ret < 0) + return ret; + if (ret != sizeof(*desc)) + return -eio; + + if (desc->magic != le32_to_cpu(gud_display_magic)) + return -enodata; + + drm_dev_debug_driver(&intf->dev, + "version=%u flags=0x%x compression=0x%x max_buffer_size=%u ", + desc->version, le32_to_cpu(desc->flags), desc->compression, + le32_to_cpu(desc->max_buffer_size)); + + if (!desc->version || !desc->max_width || !desc->max_height || + le32_to_cpu(desc->min_width) > le32_to_cpu(desc->max_width) || + le32_to_cpu(desc->min_height) > le32_to_cpu(desc->max_height)) + return -einval; + + return 0; +} + +static int gud_status_to_errno(u8 status) +{ + switch (status) { + case gud_status_ok: + return 0; + case gud_status_busy: + return -ebusy; + case gud_status_request_not_supported: + return -eopnotsupp; + case gud_status_protocol_error: + return -eproto; + case gud_status_invalid_parameter: + return -einval; + case gud_status_error: + return -eremoteio; + default: + return -eremoteio; + } +} + +static int gud_usb_get_status(struct usb_interface *intf) +{ + int ret, status = -eio; + u8 *buf; + + buf = kmalloc(sizeof(*buf), gfp_kernel); + if (!buf) + return -enomem; + + ret = gud_usb_control_msg(intf, true, gud_req_get_status, 0, buf, sizeof(*buf)); + if (ret == sizeof(*buf)) + status = gud_status_to_errno(*buf); + kfree(buf); + + if (ret < 0) + return ret; + + return status; +} + +static int gud_usb_transfer(struct gud_device *gdrm, bool in, u8 request, u16 index, + void *buf, size_t len) +{ + struct usb_interface *intf = to_usb_interface(gdrm->drm.dev); + int idx, ret; + + drm_dbg(&gdrm->drm, "%s: request=0x%x index=%u len=%zu ", + in ? "get" : "set", request, index, len); + + if (!drm_dev_enter(&gdrm->drm, &idx)) + return -enodev; + + mutex_lock(&gdrm->ctrl_lock); + + ret = gud_usb_control_msg(intf, in, request, index, buf, len); + if (ret == -epipe || ((gdrm->flags & gud_display_flag_status_on_set) && !in && ret >= 0)) { + int status; + + status = gud_usb_get_status(intf); + if (status < 0) { + ret = status; + } else if (ret < 0) { + dev_err_once(gdrm->drm.dev, + "unexpected status ok for failed transfer "); + ret = -epipe; + } + } + + if (ret < 0) { + drm_dbg(&gdrm->drm, "ret=%d ", ret); + gdrm->stats_num_errors++; + } + + mutex_unlock(&gdrm->ctrl_lock); + drm_dev_exit(idx); + + return ret; +} + +/* + * @buf cannot be allocated on the stack. + * returns number of bytes received or negative error code on failure. + */ +int gud_usb_get(struct gud_device *gdrm, u8 request, u16 index, void *buf, size_t max_len) +{ + return gud_usb_transfer(gdrm, true, request, index, buf, max_len); +} + +/* + * @buf can be allocated on the stack or null. + * returns zero on success or negative error code on failure. + */ +int gud_usb_set(struct gud_device *gdrm, u8 request, u16 index, void *buf, size_t len) +{ + void *trbuf = null; + int ret; + + if (buf && len) { + trbuf = kmemdup(buf, len, gfp_kernel); + if (!trbuf) + return -enomem; + } + + ret = gud_usb_transfer(gdrm, false, request, index, trbuf, len); + kfree(trbuf); + if (ret < 0) + return ret; + + return ret != len ? -eio : 0; +} + +/* + * @val can be allocated on the stack. + * returns zero on success or negative error code on failure. + */ +int gud_usb_get_u8(struct gud_device *gdrm, u8 request, u16 index, u8 *val) +{ + u8 *buf; + int ret; + + buf = kmalloc(sizeof(*val), gfp_kernel); + if (!buf) + return -enomem; + + ret = gud_usb_get(gdrm, request, index, buf, sizeof(*val)); + *val = *buf; + kfree(buf); + if (ret < 0) + return ret; + + return ret != sizeof(*val) ? -eio : 0; +} + +/* returns zero on success or negative error code on failure. */ +int gud_usb_set_u8(struct gud_device *gdrm, u8 request, u8 val) +{ + return gud_usb_set(gdrm, request, 0, &val, sizeof(val)); +} + +static int gud_get_properties(struct gud_device *gdrm) +{ + struct gud_property_req *properties; + unsigned int i, num_properties; + int ret; + + properties = kcalloc(gud_properties_max_num, sizeof(*properties), gfp_kernel); + if (!properties) + return -enomem; + + ret = gud_usb_get(gdrm, gud_req_get_properties, 0, + properties, gud_properties_max_num * sizeof(*properties)); + if (ret <= 0) + goto out; + if (ret % sizeof(*properties)) { + ret = -eio; + goto out; + } + + num_properties = ret / sizeof(*properties); + ret = 0; + + gdrm->properties = drmm_kcalloc(&gdrm->drm, num_properties, sizeof(*gdrm->properties), + gfp_kernel); + if (!gdrm->properties) { + ret = -enomem; + goto out; + } + + for (i = 0; i < num_properties; i++) { + u16 prop = le16_to_cpu(properties[i].prop); + u64 val = le64_to_cpu(properties[i].val); + + switch (prop) { + case gud_property_rotation: + /* + * drm uapi matches the protocol so use the value directly, + * but mask out any additions on future devices. + */ + val &= gud_rotation_mask; + ret = drm_plane_create_rotation_property(&gdrm->pipe.plane, + drm_mode_rotate_0, val); + break; + default: + /* new ones might show up in future devices, skip those we don't know. */ + drm_dbg(&gdrm->drm, "ignoring unknown property: %u ", prop); + continue; + } + + if (ret) + goto out; + + gdrm->properties[gdrm->num_properties++] = prop; + } +out: + kfree(properties); + + return ret; +} + +/* + * fixme: dma-buf sharing requires dma support by the importing device. + * this function is a workaround to make usb devices work as well. + * see todo.rst for how to fix the issue in the dma-buf framework. + */ +static struct drm_gem_object *gud_gem_prime_import(struct drm_device *drm, struct dma_buf *dma_buf) +{ + struct gud_device *gdrm = to_gud_device(drm); + + if (!gdrm->dmadev) + return err_ptr(-enodev); + + return drm_gem_prime_import_dev(drm, dma_buf, gdrm->dmadev); +} + +static int gud_stats_debugfs(struct seq_file *m, void *data) +{ + struct drm_info_node *node = m->private; + struct gud_device *gdrm = to_gud_device(node->minor->dev); + char buf[10]; + + string_get_size(gdrm->bulk_len, 1, string_units_2, buf, sizeof(buf)); + seq_printf(m, "max buffer size: %s ", buf); + seq_printf(m, "number of errors: %u ", gdrm->stats_num_errors); + + seq_puts(m, "compression: "); + if (gdrm->compression & gud_compression_lz4) + seq_puts(m, " lz4"); + if (!gdrm->compression) + seq_puts(m, " none"); + seq_puts(m, " "); + + if (gdrm->compression) { + u64 remainder; + u64 ratio = div64_u64_rem(gdrm->stats_length, gdrm->stats_actual_length, + &remainder); + u64 ratio_frac = div64_u64(remainder * 10, gdrm->stats_actual_length); + + seq_printf(m, "compression ratio: %llu.%llu ", ratio, ratio_frac); + } + + return 0; +} + +static const struct drm_info_list gud_debugfs_list[] = { + { "stats", gud_stats_debugfs, 0, null }, +}; + +static void gud_debugfs_init(struct drm_minor *minor) +{ + drm_debugfs_create_files(gud_debugfs_list, array_size(gud_debugfs_list), + minor->debugfs_root, minor); +} + +static const struct drm_simple_display_pipe_funcs gud_pipe_funcs = { + .check = gud_pipe_check, + .update = gud_pipe_update, + .prepare_fb = drm_gem_simple_display_pipe_prepare_fb, +}; + +static const struct drm_mode_config_funcs gud_mode_config_funcs = { + .fb_create = drm_gem_fb_create_with_dirty, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +static const u64 gud_pipe_modifiers[] = { + drm_format_mod_linear, + drm_format_mod_invalid +}; + +define_drm_gem_fops(gud_fops); + +static const struct drm_driver gud_drm_driver = { + .driver_features = driver_modeset | driver_gem | driver_atomic, + .fops = &gud_fops, + drm_gem_shmem_driver_ops, + .gem_prime_import = gud_gem_prime_import, + .debugfs_init = gud_debugfs_init, + + .name = "gud", + .desc = "generic usb display", + .date = "20200422", + .major = 1, + .minor = 0, +}; + +static void gud_free_buffers_and_mutex(struct drm_device *drm, void *unused) +{ + struct gud_device *gdrm = to_gud_device(drm); + + vfree(gdrm->compress_buf); + kfree(gdrm->bulk_buf); + mutex_destroy(&gdrm->ctrl_lock); + mutex_destroy(&gdrm->damage_lock); +} + +static int gud_probe(struct usb_interface *intf, const struct usb_device_id *id) +{ + const struct drm_format_info *xrgb8888_emulation_format = null; + bool rgb565_supported = false, xrgb8888_supported = false; + unsigned int num_formats_dev, num_formats = 0; + struct usb_endpoint_descriptor *bulk_out; + struct gud_display_descriptor_req desc; + struct device *dev = &intf->dev; + size_t max_buffer_size = 0; + struct gud_device *gdrm; + struct drm_device *drm; + u8 *formats_dev; + u32 *formats; + int ret, i; + + ret = usb_find_bulk_out_endpoint(intf->cur_altsetting, &bulk_out); + if (ret) + return ret; + + ret = gud_get_display_descriptor(intf, &desc); + if (ret) { + drm_dev_debug_driver(dev, "not a display interface: ret=%d ", ret); + return -enodev; + } + + if (desc.version > 1) { + dev_err(dev, "protocol version %u is not supported ", desc.version); + return -enodev; + } + + gdrm = devm_drm_dev_alloc(dev, &gud_drm_driver, struct gud_device, drm); + if (is_err(gdrm)) + return ptr_err(gdrm); + + drm = &gdrm->drm; + drm->mode_config.funcs = &gud_mode_config_funcs; + ret = drmm_mode_config_init(drm); + if (ret) + return ret; + + gdrm->flags = le32_to_cpu(desc.flags); + gdrm->compression = desc.compression & gud_compression_lz4; + + if (gdrm->flags & gud_display_flag_full_update && gdrm->compression) + return -einval; + + mutex_init(&gdrm->ctrl_lock); + mutex_init(&gdrm->damage_lock); + init_work(&gdrm->work, gud_flush_work); + gud_clear_damage(gdrm); + + ret = drmm_add_action_or_reset(drm, gud_free_buffers_and_mutex, null); + if (ret) + return ret; + + drm->mode_config.min_width = le32_to_cpu(desc.min_width); + drm->mode_config.max_width = le32_to_cpu(desc.max_width); + drm->mode_config.min_height = le32_to_cpu(desc.min_height); + drm->mode_config.max_height = le32_to_cpu(desc.max_height); + + formats_dev = devm_kmalloc(dev, gud_formats_max_num, gfp_kernel); + /* add room for emulated xrgb8888 */ + formats = devm_kmalloc_array(dev, gud_formats_max_num + 1, sizeof(*formats), gfp_kernel); + if (!formats_dev || !formats) + return -enomem; + + ret = gud_usb_get(gdrm, gud_req_get_formats, 0, formats_dev, gud_formats_max_num); + if (ret < 0) + return ret; + + num_formats_dev = ret; + for (i = 0; i < num_formats_dev; i++) { + const struct drm_format_info *info; + size_t fmt_buf_size; + u32 format; + + format = gud_to_fourcc(formats_dev[i]); + if (!format) { + drm_dbg(drm, "unsupported format: 0x%02x ", formats_dev[i]); + continue; + } + + if (format == gud_drm_format_r1) + info = &gud_drm_format_r1; + else if (format == gud_drm_format_xrgb1111) + info = &gud_drm_format_xrgb1111; + else + info = drm_format_info(format); + + switch (format) { + case gud_drm_format_r1: + fallthrough; + case gud_drm_format_xrgb1111: + if (!xrgb8888_emulation_format) + xrgb8888_emulation_format = info; + break; + case drm_format_rgb565: + rgb565_supported = true; + if (!xrgb8888_emulation_format) + xrgb8888_emulation_format = info; + break; + case drm_format_xrgb8888: + xrgb8888_supported = true; + break; + }; + + fmt_buf_size = drm_format_info_min_pitch(info, 0, drm->mode_config.max_width) * + drm->mode_config.max_height; + max_buffer_size = max(max_buffer_size, fmt_buf_size); + + if (format == gud_drm_format_r1 || format == gud_drm_format_xrgb1111) + continue; /* internal not for userspace */ + + formats[num_formats++] = format; + } + + if (!num_formats && !xrgb8888_emulation_format) { + dev_err(dev, "no supported pixel formats found "); + return -einval; + } + + /* prefer speed over color depth */ + if (rgb565_supported) + drm->mode_config.preferred_depth = 16; + + if (!xrgb8888_supported && xrgb8888_emulation_format) { + gdrm->xrgb8888_emulation_format = xrgb8888_emulation_format; + formats[num_formats++] = drm_format_xrgb8888; + } + + if (desc.max_buffer_size) + max_buffer_size = le32_to_cpu(desc.max_buffer_size); +retry: + /* + * use plain kmalloc here since devm_kmalloc() places struct devres at the beginning + * of the buffer it allocates. this wastes a lot of memory when allocating big buffers. + * asking for 2m would actually allocate 4m. this would also prevent getting the biggest + * possible buffer potentially leading to split transfers. + */ + gdrm->bulk_buf = kmalloc(max_buffer_size, gfp_kernel | __gfp_nowarn); + if (!gdrm->bulk_buf) { + max_buffer_size = roundup_pow_of_two(max_buffer_size) / 2; + if (max_buffer_size < sz_512k) + return -enomem; + goto retry; + } + + gdrm->bulk_pipe = usb_sndbulkpipe(interface_to_usbdev(intf), usb_endpoint_num(bulk_out)); + gdrm->bulk_len = max_buffer_size; + + if (gdrm->compression & gud_compression_lz4) { + gdrm->lz4_comp_mem = devm_kmalloc(dev, lz4_mem_compress, gfp_kernel); + if (!gdrm->lz4_comp_mem) + return -enomem; + + gdrm->compress_buf = vmalloc(gdrm->bulk_len); + if (!gdrm->compress_buf) + return -enomem; + } + + ret = drm_simple_display_pipe_init(drm, &gdrm->pipe, &gud_pipe_funcs, + formats, num_formats, + gud_pipe_modifiers, null); + if (ret) + return ret; + + devm_kfree(dev, formats); + devm_kfree(dev, formats_dev); + + ret = gud_get_properties(gdrm); + if (ret) { + dev_err(dev, "failed to get properties (error=%d) ", ret); + return ret; + } + + drm_plane_enable_fb_damage_clips(&gdrm->pipe.plane); + + ret = gud_get_connectors(gdrm); + if (ret) { + dev_err(dev, "failed to get connectors (error=%d) ", ret); + return ret; + } + + drm_mode_config_reset(drm); + + usb_set_intfdata(intf, gdrm); + + gdrm->dmadev = usb_intf_get_dma_device(intf); + if (!gdrm->dmadev) + dev_warn(dev, "buffer sharing not supported"); + + ret = drm_dev_register(drm, 0); + if (ret) { + put_device(gdrm->dmadev); + return ret; + } + + drm_kms_helper_poll_init(drm); + + drm_fbdev_generic_setup(drm, 0); + + return 0; +} + +static void gud_disconnect(struct usb_interface *interface) +{ + struct gud_device *gdrm = usb_get_intfdata(interface); + struct drm_device *drm = &gdrm->drm; + + drm_dbg(drm, "%s: ", __func__); + + drm_kms_helper_poll_fini(drm); + drm_dev_unplug(drm); + drm_atomic_helper_shutdown(drm); + put_device(gdrm->dmadev); + gdrm->dmadev = null; +} + +static int gud_suspend(struct usb_interface *intf, pm_message_t message) +{ + struct gud_device *gdrm = usb_get_intfdata(intf); + + return drm_mode_config_helper_suspend(&gdrm->drm); +} + +static int gud_resume(struct usb_interface *intf) +{ + struct gud_device *gdrm = usb_get_intfdata(intf); + + drm_mode_config_helper_resume(&gdrm->drm); + + return 0; +} + +static const struct usb_device_id gud_id_table[] = { + { usb_device_interface_class(0x1d50, 0x614d, usb_class_vendor_spec) }, + { } +}; + +module_device_table(usb, gud_id_table); + +static struct usb_driver gud_usb_driver = { + .name = "gud", + .probe = gud_probe, + .disconnect = gud_disconnect, + .id_table = gud_id_table, + .suspend = gud_suspend, + .resume = gud_resume, + .reset_resume = gud_resume, +}; + +module_usb_driver(gud_usb_driver); + +module_author("noralf trnnes"); +module_license("dual mit/gpl"); diff --git a/drivers/gpu/drm/gud/gud_internal.h b/drivers/gpu/drm/gud/gud_internal.h --- /dev/null +++ b/drivers/gpu/drm/gud/gud_internal.h +/* spdx-license-identifier: mit */ + +#ifndef __linux_gud_internal_h +#define __linux_gud_internal_h + +#include <linux/list.h> +#include <linux/mutex.h> +#include <linux/usb.h> +#include <linux/workqueue.h> +#include <uapi/drm/drm_fourcc.h> + +#include <drm/drm_modes.h> +#include <drm/drm_simple_kms_helper.h> + +struct gud_device { + struct drm_device drm; + struct drm_simple_display_pipe pipe; + struct device *dmadev; + struct work_struct work; + u32 flags; + const struct drm_format_info *xrgb8888_emulation_format; + + u16 *properties; + unsigned int num_properties; + + unsigned int bulk_pipe; + void *bulk_buf; + size_t bulk_len; + + u8 compression; + void *lz4_comp_mem; + void *compress_buf; + + u64 stats_length; + u64 stats_actual_length; + unsigned int stats_num_errors; + + struct mutex ctrl_lock; /* serialize get/set and status transfers */ + + struct mutex damage_lock; /* protects the following members: */ + struct drm_framebuffer *fb; + struct drm_rect damage; + bool prev_flush_failed; +}; + +static inline struct gud_device *to_gud_device(struct drm_device *drm) +{ + return container_of(drm, struct gud_device, drm); +} + +static inline struct usb_device *gud_to_usb_device(struct gud_device *gdrm) +{ + return interface_to_usbdev(to_usb_interface(gdrm->drm.dev)); +} + +int gud_usb_get(struct gud_device *gdrm, u8 request, u16 index, void *buf, size_t len); +int gud_usb_set(struct gud_device *gdrm, u8 request, u16 index, void *buf, size_t len); +int gud_usb_get_u8(struct gud_device *gdrm, u8 request, u16 index, u8 *val); +int gud_usb_set_u8(struct gud_device *gdrm, u8 request, u8 val); + +void gud_clear_damage(struct gud_device *gdrm); +void gud_flush_work(struct work_struct *work); +int gud_pipe_check(struct drm_simple_display_pipe *pipe, + struct drm_plane_state *new_plane_state, + struct drm_crtc_state *new_crtc_state); +void gud_pipe_update(struct drm_simple_display_pipe *pipe, + struct drm_plane_state *old_state); +int gud_connector_fill_properties(struct drm_connector_state *connector_state, + struct gud_property_req *properties); +int gud_get_connectors(struct gud_device *gdrm); + +/* driver internal fourcc transfer formats */ +#define gud_drm_format_r1 0x00000122 +#define gud_drm_format_xrgb1111 0x03121722 + +static inline u8 gud_from_fourcc(u32 fourcc) +{ + switch (fourcc) { + case gud_drm_format_r1: + return gud_pixel_format_r1; + case gud_drm_format_xrgb1111: + return gud_pixel_format_xrgb1111; + case drm_format_rgb565: + return gud_pixel_format_rgb565; + case drm_format_xrgb8888: + return gud_pixel_format_xrgb8888; + case drm_format_argb8888: + return gud_pixel_format_argb8888; + }; + + return 0; +} + +static inline u32 gud_to_fourcc(u8 format) +{ + switch (format) { + case gud_pixel_format_r1: + return gud_drm_format_r1; + case gud_pixel_format_xrgb1111: + return gud_drm_format_xrgb1111; + case gud_pixel_format_rgb565: + return drm_format_rgb565; + case gud_pixel_format_xrgb8888: + return drm_format_xrgb8888; + case gud_pixel_format_argb8888: + return drm_format_argb8888; + }; + + return 0; +} + +static inline void gud_from_display_mode(struct gud_display_mode_req *dst, + const struct drm_display_mode *src) +{ + u32 flags = src->flags & gud_display_mode_flag_user_mask; + + if (src->type & drm_mode_type_preferred) + flags |= gud_display_mode_flag_preferred; + + dst->clock = cpu_to_le32(src->clock); + dst->hdisplay = cpu_to_le16(src->hdisplay); + dst->hsync_start = cpu_to_le16(src->hsync_start); + dst->hsync_end = cpu_to_le16(src->hsync_end); + dst->htotal = cpu_to_le16(src->htotal); + dst->vdisplay = cpu_to_le16(src->vdisplay); + dst->vsync_start = cpu_to_le16(src->vsync_start); + dst->vsync_end = cpu_to_le16(src->vsync_end); + dst->vtotal = cpu_to_le16(src->vtotal); + dst->flags = cpu_to_le32(flags); +} + +static inline void gud_to_display_mode(struct drm_display_mode *dst, + const struct gud_display_mode_req *src) +{ + u32 flags = le32_to_cpu(src->flags); + + memset(dst, 0, sizeof(*dst)); + dst->clock = le32_to_cpu(src->clock); + dst->hdisplay = le16_to_cpu(src->hdisplay); + dst->hsync_start = le16_to_cpu(src->hsync_start); + dst->hsync_end = le16_to_cpu(src->hsync_end); + dst->htotal = le16_to_cpu(src->htotal); + dst->vdisplay = le16_to_cpu(src->vdisplay); + dst->vsync_start = le16_to_cpu(src->vsync_start); + dst->vsync_end = le16_to_cpu(src->vsync_end); + dst->vtotal = le16_to_cpu(src->vtotal); + dst->flags = flags & gud_display_mode_flag_user_mask; + dst->type = drm_mode_type_driver; + if (flags & gud_display_mode_flag_preferred) + dst->type |= drm_mode_type_preferred; + drm_mode_set_name(dst); +} + +#endif diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c --- /dev/null +++ b/drivers/gpu/drm/gud/gud_pipe.c +// spdx-license-identifier: mit +/* + * copyright 2020 noralf trnnes + */ + +#include <linux/dma-buf.h> +#include <linux/lz4.h> +#include <linux/usb.h> +#include <linux/workqueue.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_connector.h> +#include <drm/drm_damage_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_format_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_gem_shmem_helper.h> +#include <drm/drm_print.h> +#include <drm/drm_rect.h> +#include <drm/drm_simple_kms_helper.h> +#include <drm/gud.h> + +#include "gud_internal.h" + +/* + * fixme: the driver is probably broken on big endian machines. + * see discussion: + * https://lore.kernel.org/dri-devel/cakb7uvihlx0hgbop3vbg7o+atwzcuvcpvubdfmdmpg0njxe-cq@mail.gmail.com/ + */ + +static bool gud_is_big_endian(void) +{ +#if defined(__big_endian) + return true; +#else + return false; +#endif +} + +static size_t gud_xrgb8888_to_r124(u8 *dst, const struct drm_format_info *format, + void *src, struct drm_framebuffer *fb, + struct drm_rect *rect) +{ + unsigned int block_width = drm_format_info_block_width(format, 0); + unsigned int bits_per_pixel = 8 / block_width; + unsigned int x, y, width, height; + u8 pix, *pix8, *block = dst; /* assign to silence compiler warning */ + size_t len; + void *buf; + + warn_on_once(format->char_per_block[0] != 1); + + /* start on a byte boundary */ + rect->x1 = align_down(rect->x1, block_width); + width = drm_rect_width(rect); + height = drm_rect_height(rect); + len = drm_format_info_min_pitch(format, 0, width) * height; + + buf = kmalloc(width * height, gfp_kernel); + if (!buf) + return 0; + + drm_fb_xrgb8888_to_gray8(buf, src, fb, rect); + pix8 = buf; + + for (y = 0; y < height; y++) { + for (x = 0; x < width; x++) { + unsigned int pixpos = x % block_width; /* within byte from the left */ + unsigned int pixshift = (block_width - pixpos - 1) * bits_per_pixel; + + if (!pixpos) { + block = dst++; + *block = 0; + } + + pix = (*pix8++) >> (8 - bits_per_pixel); + *block |= pix << pixshift; + } + } + + kfree(buf); + + return len; +} + +static size_t gud_xrgb8888_to_color(u8 *dst, const struct drm_format_info *format, + void *src, struct drm_framebuffer *fb, + struct drm_rect *rect) +{ + unsigned int block_width = drm_format_info_block_width(format, 0); + unsigned int bits_per_pixel = 8 / block_width; + u8 r, g, b, pix, *block = dst; /* assign to silence compiler warning */ + unsigned int x, y, width; + u32 *pix32; + size_t len; + + /* start on a byte boundary */ + rect->x1 = align_down(rect->x1, block_width); + width = drm_rect_width(rect); + len = drm_format_info_min_pitch(format, 0, width) * drm_rect_height(rect); + + for (y = rect->y1; y < rect->y2; y++) { + pix32 = src + (y * fb->pitches[0]); + pix32 += rect->x1; + + for (x = 0; x < width; x++) { + unsigned int pixpos = x % block_width; /* within byte from the left */ + unsigned int pixshift = (block_width - pixpos - 1) * bits_per_pixel; + + if (!pixpos) { + block = dst++; + *block = 0; + } + + r = *pix32 >> 16; + g = *pix32 >> 8; + b = *pix32++; + + switch (format->format) { + case gud_drm_format_xrgb1111: + pix = ((r >> 7) << 2) | ((g >> 7) << 1) | (b >> 7); + break; + default: + warn_on_once(1); + return len; + }; + + *block |= pix << pixshift; + } + } + + return len; +} + +static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, + const struct drm_format_info *format, struct drm_rect *rect, + struct gud_set_buffer_req *req) +{ + struct dma_buf_attachment *import_attach = fb->obj[0]->import_attach; + u8 compression = gdrm->compression; + struct dma_buf_map map; + void *vaddr, *buf; + size_t pitch, len; + int ret = 0; + + pitch = drm_format_info_min_pitch(format, 0, drm_rect_width(rect)); + len = pitch * drm_rect_height(rect); + if (len > gdrm->bulk_len) + return -e2big; + + ret = drm_gem_shmem_vmap(fb->obj[0], &map); + if (ret) + return ret; + + vaddr = map.vaddr + fb->offsets[0]; + + if (import_attach) { + ret = dma_buf_begin_cpu_access(import_attach->dmabuf, dma_from_device); + if (ret) + goto vunmap; + } +retry: + if (compression) + buf = gdrm->compress_buf; + else + buf = gdrm->bulk_buf; + + /* + * imported buffers are assumed to be write-combined and thus uncached + * with slow reads (at least on arm). + */ + if (format != fb->format) { + if (format->format == gud_drm_format_r1) { + len = gud_xrgb8888_to_r124(buf, format, vaddr, fb, rect); + if (!len) { + ret = -enomem; + goto end_cpu_access; + } + } else if (format->format == drm_format_rgb565) { + drm_fb_xrgb8888_to_rgb565(buf, vaddr, fb, rect, gud_is_big_endian()); + } else { + len = gud_xrgb8888_to_color(buf, format, vaddr, fb, rect); + } + } else if (gud_is_big_endian() && format->cpp[0] > 1) { + drm_fb_swab(buf, vaddr, fb, rect, !import_attach); + } else if (compression && !import_attach && pitch == fb->pitches[0]) { + /* can compress directly from the framebuffer */ + buf = vaddr + rect->y1 * pitch; + } else { + drm_fb_memcpy(buf, vaddr, fb, rect); + } + + memset(req, 0, sizeof(*req)); + req->x = cpu_to_le32(rect->x1); + req->y = cpu_to_le32(rect->y1); + req->width = cpu_to_le32(drm_rect_width(rect)); + req->height = cpu_to_le32(drm_rect_height(rect)); + req->length = cpu_to_le32(len); + + if (compression & gud_compression_lz4) { + int complen; + + complen = lz4_compress_default(buf, gdrm->bulk_buf, len, len, gdrm->lz4_comp_mem); + if (complen <= 0) { + compression = 0; + goto retry; + } + + req->compression = gud_compression_lz4; + req->compressed_length = cpu_to_le32(complen); + } + +end_cpu_access: + if (import_attach) + dma_buf_end_cpu_access(import_attach->dmabuf, dma_from_device); +vunmap: + drm_gem_shmem_vunmap(fb->obj[0], &map); + + return ret; +} + +static int gud_flush_rect(struct gud_device *gdrm, struct drm_framebuffer *fb, + const struct drm_format_info *format, struct drm_rect *rect) +{ + struct usb_device *usb = gud_to_usb_device(gdrm); + struct gud_set_buffer_req req; + int ret, actual_length; + size_t len, trlen; + + drm_dbg(&gdrm->drm, "flushing [fb:%d] " drm_rect_fmt " ", fb->base.id, drm_rect_arg(rect)); + + ret = gud_prep_flush(gdrm, fb, format, rect, &req); + if (ret) + return ret; + + len = le32_to_cpu(req.length); + + if (req.compression) + trlen = le32_to_cpu(req.compressed_length); + else + trlen = len; + + gdrm->stats_length += len; + /* did it wrap around? */ + if (gdrm->stats_length <= len && gdrm->stats_actual_length) { + gdrm->stats_length = len; + gdrm->stats_actual_length = 0; + } + gdrm->stats_actual_length += trlen; + + if (!(gdrm->flags & gud_display_flag_full_update) || gdrm->prev_flush_failed) { + ret = gud_usb_set(gdrm, gud_req_set_buffer, 0, &req, sizeof(req)); + if (ret) + return ret; + } + + ret = usb_bulk_msg(usb, gdrm->bulk_pipe, gdrm->bulk_buf, trlen, + &actual_length, msecs_to_jiffies(3000)); + if (!ret && trlen != actual_length) + ret = -eio; + if (ret) + gdrm->stats_num_errors++; + + return ret; +} + +void gud_clear_damage(struct gud_device *gdrm) +{ + gdrm->damage.x1 = int_max; + gdrm->damage.y1 = int_max; + gdrm->damage.x2 = 0; + gdrm->damage.y2 = 0; +} + +static void gud_add_damage(struct gud_device *gdrm, struct drm_rect *damage) +{ + gdrm->damage.x1 = min(gdrm->damage.x1, damage->x1); + gdrm->damage.y1 = min(gdrm->damage.y1, damage->y1); + gdrm->damage.x2 = max(gdrm->damage.x2, damage->x2); + gdrm->damage.y2 = max(gdrm->damage.y2, damage->y2); +} + +static void gud_retry_failed_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, + struct drm_rect *damage) +{ + /* + * pipe_update waits for the worker when the display mode is going to change. + * this ensures that the width and height is still the same making it safe to + * add back the damage. + */ + + mutex_lock(&gdrm->damage_lock); + if (!gdrm->fb) { + drm_framebuffer_get(fb); + gdrm->fb = fb; + } + gud_add_damage(gdrm, damage); + mutex_unlock(&gdrm->damage_lock); + + /* retry only once to avoid a possible storm in case of continues errors. */ + if (!gdrm->prev_flush_failed) + queue_work(system_long_wq, &gdrm->work); + gdrm->prev_flush_failed = true; +} + +void gud_flush_work(struct work_struct *work) +{ + struct gud_device *gdrm = container_of(work, struct gud_device, work); + const struct drm_format_info *format; + struct drm_framebuffer *fb; + struct drm_rect damage; + unsigned int i, lines; + int idx, ret = 0; + size_t pitch; + + if (!drm_dev_enter(&gdrm->drm, &idx)) + return; + + mutex_lock(&gdrm->damage_lock); + fb = gdrm->fb; + gdrm->fb = null; + damage = gdrm->damage; + gud_clear_damage(gdrm); + mutex_unlock(&gdrm->damage_lock); + + if (!fb) + goto out; + + format = fb->format; + if (format->format == drm_format_xrgb8888 && gdrm->xrgb8888_emulation_format) + format = gdrm->xrgb8888_emulation_format; + + /* split update if it's too big */ + pitch = drm_format_info_min_pitch(format, 0, drm_rect_width(&damage)); + lines = drm_rect_height(&damage); + + if (gdrm->bulk_len < lines * pitch) + lines = gdrm->bulk_len / pitch; + + for (i = 0; i < div_round_up(drm_rect_height(&damage), lines); i++) { + struct drm_rect rect = damage; + + rect.y1 += i * lines; + rect.y2 = min_t(u32, rect.y1 + lines, damage.y2); + + ret = gud_flush_rect(gdrm, fb, format, &rect); + if (ret) { + if (ret != -enodev && ret != -econnreset && + ret != -eshutdown && ret != -eproto) { + bool prev_flush_failed = gdrm->prev_flush_failed; + + gud_retry_failed_flush(gdrm, fb, &damage); + if (!prev_flush_failed) + dev_err_ratelimited(fb->dev->dev, + "failed to flush framebuffer: error=%d ", ret); + } + break; + } + + gdrm->prev_flush_failed = false; + } + + drm_framebuffer_put(fb); +out: + drm_dev_exit(idx); +} + +static void gud_fb_queue_damage(struct gud_device *gdrm, struct drm_framebuffer *fb, + struct drm_rect *damage) +{ + struct drm_framebuffer *old_fb = null; + + mutex_lock(&gdrm->damage_lock); + + if (fb != gdrm->fb) { + old_fb = gdrm->fb; + drm_framebuffer_get(fb); + gdrm->fb = fb; + } + + gud_add_damage(gdrm, damage); + + mutex_unlock(&gdrm->damage_lock); + + queue_work(system_long_wq, &gdrm->work); + + if (old_fb) + drm_framebuffer_put(old_fb); +} + +int gud_pipe_check(struct drm_simple_display_pipe *pipe, + struct drm_plane_state *new_plane_state, + struct drm_crtc_state *new_crtc_state) +{ + struct gud_device *gdrm = to_gud_device(pipe->crtc.dev); + struct drm_plane_state *old_plane_state = pipe->plane.state; + const struct drm_display_mode *mode = &new_crtc_state->mode; + struct drm_atomic_state *state = new_plane_state->state; + struct drm_framebuffer *old_fb = old_plane_state->fb; + struct drm_connector_state *connector_state = null; + struct drm_framebuffer *fb = new_plane_state->fb; + const struct drm_format_info *format = fb->format; + struct drm_connector *connector; + unsigned int i, num_properties; + struct gud_state_req *req; + int idx, ret; + size_t len; + + if (warn_on_once(!fb)) + return -einval; + + if (old_plane_state->rotation != new_plane_state->rotation) + new_crtc_state->mode_changed = true; + + if (old_fb && old_fb->format != format) + new_crtc_state->mode_changed = true; + + if (!new_crtc_state->mode_changed && !new_crtc_state->connectors_changed) + return 0; + + /* only one connector is supported */ + if (hweight32(new_crtc_state->connector_mask) != 1) + return -einval; + + if (format->format == drm_format_xrgb8888 && gdrm->xrgb8888_emulation_format) + format = gdrm->xrgb8888_emulation_format; + + for_each_new_connector_in_state(state, connector, connector_state, i) { + if (connector_state->crtc) + break; + } + + /* + * drm_ioctl_mode_obj_setproperty on the rotation property will not have + * the connector included in the state. + */ + if (!connector_state) { + struct drm_connector_list_iter conn_iter; + + drm_connector_list_iter_begin(pipe->crtc.dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (connector->state->crtc) { + connector_state = connector->state; + break; + } + } + drm_connector_list_iter_end(&conn_iter); + } + + if (warn_on_once(!connector_state)) + return -enoent; + + len = struct_size(req, properties, + gud_properties_max_num + gud_connector_properties_max_num); + req = kzalloc(len, gfp_kernel); + if (!req) + return -enomem; + + gud_from_display_mode(&req->mode, mode); + + req->format = gud_from_fourcc(format->format); + if (warn_on_once(!req->format)) { + ret = -einval; + goto out; + } + + req->connector = drm_connector_index(connector_state->connector); + + ret = gud_connector_fill_properties(connector_state, req->properties); + if (ret < 0) + goto out; + + num_properties = ret; + for (i = 0; i < gdrm->num_properties; i++) { + u16 prop = gdrm->properties[i]; + u64 val; + + switch (prop) { + case gud_property_rotation: + /* drm uapi matches the protocol so use value directly */ + val = new_plane_state->rotation; + break; + default: + warn_on_once(1); + ret = -einval; + goto out; + } + + req->properties[num_properties + i].prop = cpu_to_le16(prop); + req->properties[num_properties + i].val = cpu_to_le64(val); + num_properties++; + } + + if (drm_dev_enter(fb->dev, &idx)) { + len = struct_size(req, properties, num_properties); + ret = gud_usb_set(gdrm, gud_req_set_state_check, 0, req, len); + drm_dev_exit(idx); + } else { + ret = -enodev; + } +out: + kfree(req); + + return ret; +} + +void gud_pipe_update(struct drm_simple_display_pipe *pipe, + struct drm_plane_state *old_state) +{ + struct drm_device *drm = pipe->crtc.dev; + struct gud_device *gdrm = to_gud_device(drm); + struct drm_plane_state *state = pipe->plane.state; + struct drm_framebuffer *fb = state->fb; + struct drm_crtc *crtc = &pipe->crtc; + struct drm_rect damage; + int idx; + + if (crtc->state->mode_changed || !crtc->state->enable) { + cancel_work_sync(&gdrm->work); + mutex_lock(&gdrm->damage_lock); + if (gdrm->fb) { + drm_framebuffer_put(gdrm->fb); + gdrm->fb = null; + } + gud_clear_damage(gdrm); + mutex_unlock(&gdrm->damage_lock); + } + + if (!drm_dev_enter(drm, &idx)) + return; + + if (!old_state->fb) + gud_usb_set_u8(gdrm, gud_req_set_controller_enable, 1); + + if (fb && (crtc->state->mode_changed || crtc->state->connectors_changed)) + gud_usb_set(gdrm, gud_req_set_state_commit, 0, null, 0); + + if (crtc->state->active_changed) + gud_usb_set_u8(gdrm, gud_req_set_display_enable, crtc->state->active); + + if (drm_atomic_helper_damage_merged(old_state, state, &damage)) { + if (gdrm->flags & gud_display_flag_full_update) + drm_rect_init(&damage, 0, 0, fb->width, fb->height); + gud_fb_queue_damage(gdrm, fb, &damage); + } + + if (!crtc->state->enable) + gud_usb_set_u8(gdrm, gud_req_set_controller_enable, 0); + + drm_dev_exit(idx); +} diff --git a/include/drm/gud.h b/include/drm/gud.h --- /dev/null +++ b/include/drm/gud.h +/* spdx-license-identifier: mit */ +/* + * copyright 2020 noralf trnnes + */ + +#ifndef __linux_gud_h +#define __linux_gud_h + +#include <linux/types.h> + +/* + * struct gud_display_descriptor_req - display descriptor + * @magic: magic value gud_display_magic + * @version: protocol version + * @flags: flags + * - status_on_set: always do a status request after a set request. + * this is used by the linux gadget driver since it has + * no way to control the status stage of a control out + * request that has a payload. + * - full_update: always send the entire framebuffer when flushing changes. + * the gud_req_set_buffer request will not be sent + * before each bulk transfer, it will only be sent if the + * previous bulk transfer had failed. this gives the device + * a chance to reset its state machine if needed. + * this flag can not be used in combination with compression. + * @compression: supported compression types + * - gud_compression_lz4: lz4 lossless compression. + * @max_buffer_size: maximum buffer size the device can handle (optional). + * this is useful for devices that don't have a big enough + * buffer to decompress the entire framebuffer in one go. + * @min_width: minimum pixel width the controller can handle + * @max_width: maximum width + * @min_height: minimum height + * @max_height: maximum height + * + * devices that have only one display mode will have min_width == max_width + * and min_height == max_height. + */ +struct gud_display_descriptor_req { + __le32 magic; +#define gud_display_magic 0x1d50614d + __u8 version; + __le32 flags; +#define gud_display_flag_status_on_set bit(0) +#define gud_display_flag_full_update bit(1) + __u8 compression; +#define gud_compression_lz4 bit(0) + __le32 max_buffer_size; + __le32 min_width; + __le32 max_width; + __le32 min_height; + __le32 max_height; +} __packed; + +/* + * struct gud_property_req - property + * @prop: property + * @val: value + */ +struct gud_property_req { + __le16 prop; + __le64 val; +} __packed; + +/* + * struct gud_display_mode_req - display mode + * @clock: pixel clock in khz + * @hdisplay: horizontal display size + * @hsync_start: horizontal sync start + * @hsync_end: horizontal sync end + * @htotal: horizontal total size + * @vdisplay: vertical display size + * @vsync_start: vertical sync start + * @vsync_end: vertical sync end + * @vtotal: vertical total size + * @flags: bits 0-13 are the same as in the randr protocol and also what drm uses. + * the deprecated bits are reused for internal protocol flags leaving us + * free to follow drm for the other bits in the future. + * - flag_preferred: set on the preferred display mode. + */ +struct gud_display_mode_req { + __le32 clock; + __le16 hdisplay; + __le16 hsync_start; + __le16 hsync_end; + __le16 htotal; + __le16 vdisplay; + __le16 vsync_start; + __le16 vsync_end; + __le16 vtotal; + __le32 flags; +#define gud_display_mode_flag_phsync bit(0) +#define gud_display_mode_flag_nhsync bit(1) +#define gud_display_mode_flag_pvsync bit(2) +#define gud_display_mode_flag_nvsync bit(3) +#define gud_display_mode_flag_interlace bit(4) +#define gud_display_mode_flag_dblscan bit(5) +#define gud_display_mode_flag_csync bit(6) +#define gud_display_mode_flag_pcsync bit(7) +#define gud_display_mode_flag_ncsync bit(8) +#define gud_display_mode_flag_hskew bit(9) +/* bcast and pixelmultiplex are deprecated */ +#define gud_display_mode_flag_dblclk bit(12) +#define gud_display_mode_flag_clkdiv2 bit(13) +#define gud_display_mode_flag_user_mask \ + (gud_display_mode_flag_phsync | gud_display_mode_flag_nhsync | \ + gud_display_mode_flag_pvsync | gud_display_mode_flag_nvsync | \ + gud_display_mode_flag_interlace | gud_display_mode_flag_dblscan | \ + gud_display_mode_flag_csync | gud_display_mode_flag_pcsync | \ + gud_display_mode_flag_ncsync | gud_display_mode_flag_hskew | \ + gud_display_mode_flag_dblclk | gud_display_mode_flag_clkdiv2) +/* internal protocol flags */ +#define gud_display_mode_flag_preferred bit(10) +} __packed; + +/* + * struct gud_connector_descriptor_req - connector descriptor + * @connector_type: connector type (gud_connector_type_*). + * if the host doesn't support the type it should fall back to panel. + * @flags: flags + * - poll_status: connector status can change (polled every 10 seconds) + * - interlace: interlaced modes are supported + * - doublescan: doublescan modes are supported + */ +struct gud_connector_descriptor_req { + __u8 connector_type; +#define gud_connector_type_panel 0 +#define gud_connector_type_vga 1 +#define gud_connector_type_composite 2 +#define gud_connector_type_svideo 3 +#define gud_connector_type_component 4 +#define gud_connector_type_dvi 5 +#define gud_connector_type_displayport 6 +#define gud_connector_type_hdmi 7 + __le32 flags; +#define gud_connector_flags_poll_status bit(0) +#define gud_connector_flags_interlace bit(1) +#define gud_connector_flags_doublescan bit(2) +} __packed; + +/* + * struct gud_set_buffer_req - set buffer transfer info + * @x: x position of rectangle + * @y: y position + * @width: pixel width of rectangle + * @height: pixel height + * @length: buffer length in bytes + * @compression: transfer compression + * @compressed_length: compressed buffer length + * + * this request is issued right before the bulk transfer. + * @x, @y, @width and @height specifies the rectangle where the buffer should be + * placed inside the framebuffer. + */ +struct gud_set_buffer_req { + __le32 x; + __le32 y; + __le32 width; + __le32 height; + __le32 length; + __u8 compression; + __le32 compressed_length; +} __packed; + +/* + * struct gud_state_req - display state + * @mode: display mode + * @format: pixel format gud_pixel_format_* + * @connector: connector index + * @properties: array of properties + * + * the entire state is transferred each time there's a change. + */ +struct gud_state_req { + struct gud_display_mode_req mode; + __u8 format; + __u8 connector; + struct gud_property_req properties[]; +} __packed; + +/* list of supported connector properties: */ + +/* margins in pixels to deal with overscan, range 0-100 */ +#define gud_property_tv_left_margin 1 +#define gud_property_tv_right_margin 2 +#define gud_property_tv_top_margin 3 +#define gud_property_tv_bottom_margin 4 +#define gud_property_tv_mode 5 +/* brightness in percent, range 0-100 */ +#define gud_property_tv_brightness 6 +/* contrast in percent, range 0-100 */ +#define gud_property_tv_contrast 7 +/* flicker reduction in percent, range 0-100 */ +#define gud_property_tv_flicker_reduction 8 +/* overscan in percent, range 0-100 */ +#define gud_property_tv_overscan 9 +/* saturation in percent, range 0-100 */ +#define gud_property_tv_saturation 10 +/* hue in percent, range 0-100 */ +#define gud_property_tv_hue 11 + +/* + * backlight brightness is in the range 0-100 inclusive. the value represents the human perceptual + * brightness and not a linear pwm value. 0 is minimum brightness which should not turn the + * backlight completely off. the dpms connector property should be used to control power which will + * trigger a gud_req_set_display_enable request. + * + * this does not map to a drm property, it is used with the backlight device. + */ +#define gud_property_backlight_brightness 12 + +/* list of supported properties that are not connector propeties: */ + +/* + * plane rotation. should return the supported bitmask on + * gud_req_get_properties. gud_rotation_0 is mandatory. + * + * note: this is not display rotation so 90/270 will need scaling to make it fit (unless squared). + */ +#define gud_property_rotation 50 + #define gud_rotation_0 bit(0) + #define gud_rotation_90 bit(1) + #define gud_rotation_180 bit(2) + #define gud_rotation_270 bit(3) + #define gud_rotation_reflect_x bit(4) + #define gud_rotation_reflect_y bit(5) + #define gud_rotation_mask (gud_rotation_0 | gud_rotation_90 | \ + gud_rotation_180 | gud_rotation_270 | \ + gud_rotation_reflect_x | gud_rotation_reflect_y) + +/* usb control requests: */ + +/* get status from the last get/set control request. value is u8. */ +#define gud_req_get_status 0x00 + /* status values: */ + #define gud_status_ok 0x00 + #define gud_status_busy 0x01 + #define gud_status_request_not_supported 0x02 + #define gud_status_protocol_error 0x03 + #define gud_status_invalid_parameter 0x04 + #define gud_status_error 0x05 + +/* get display descriptor as a &gud_display_descriptor_req */ +#define gud_req_get_descriptor 0x01 + +/* get supported pixel formats as a byte array of gud_pixel_format_* */ +#define gud_req_get_formats 0x40 + #define gud_formats_max_num 32 + /* r1 is a 1-bit monochrome transfer format presented to userspace as xrgb8888 */ + #define gud_pixel_format_r1 0x01 + #define gud_pixel_format_xrgb1111 0x20 + #define gud_pixel_format_rgb565 0x40 + #define gud_pixel_format_xrgb8888 0x80 + #define gud_pixel_format_argb8888 0x81 + +/* + * get supported properties that are not connector propeties as a &gud_property_req array. + * gud_property_req.val often contains the initial value for the property. + */ +#define gud_req_get_properties 0x41 + #define gud_properties_max_num 32 + +/* connector requests have the connector index passed in the wvalue field */ + +/* get connector descriptors as an array of &gud_connector_descriptor_req */ +#define gud_req_get_connectors 0x50 + #define gud_connectors_max_num 32 + +/* + * get properties supported by the connector as a &gud_property_req array. + * gud_property_req.val often contains the initial value for the property. + */ +#define gud_req_get_connector_properties 0x51 + #define gud_connector_properties_max_num 32 + +/* + * issued when there's a tv_mode property present. + * gets an array of the supported tv_mode names each entry of length + * gud_connector_tv_mode_name_len. names must be nul-terminated. + */ +#define gud_req_get_connector_tv_mode_values 0x52 + #define gud_connector_tv_mode_name_len 16 + #define gud_connector_tv_mode_max_num 16 + +/* when userspace checks connector status, this is issued first, not used for poll requests. */ +#define gud_req_set_connector_force_detect 0x53 + +/* + * get connector status. value is u8. + * + * userspace will get a hotplug uevent if one of the following is true: + * - connection status has changed since last + * - changed is set + */ +#define gud_req_get_connector_status 0x54 + #define gud_connector_status_disconnected 0x00 + #define gud_connector_status_connected 0x01 + #define gud_connector_status_unknown 0x02 + #define gud_connector_status_connected_mask 0x03 + #define gud_connector_status_changed bit(7) + +/* + * display modes can be fetched as either edid data or an array of &gud_display_mode_req. + * + * if gud_req_get_connector_modes returns zero, edid is used to create display modes. + * if both display modes and edid are returned, edid is just passed on to userspace + * in the edid connector property. + */ + +/* get &gud_display_mode_req array of supported display modes */ +#define gud_req_get_connector_modes 0x55 + #define gud_connector_max_num_modes 128 + +/* get extended display identification data */ +#define gud_req_get_connector_edid 0x56 + #define gud_connector_max_edid_len 2048 + +/* set buffer properties before bulk transfer as &gud_set_buffer_req */ +#define gud_req_set_buffer 0x60 + +/* check display configuration as &gud_state_req */ +#define gud_req_set_state_check 0x61 + +/* apply the previous state_check configuration */ +#define gud_req_set_state_commit 0x62 + +/* enable/disable the display controller, value is u8: 0/1 */ +#define gud_req_set_controller_enable 0x63 + +/* enable/disable display/output (dpms), value is u8: 0/1 */ +#define gud_req_set_display_enable 0x64 + +#endif
|
Graphics
|
40e1a70b4aedf2859a1829991b48ef0ebe650bf2
|
noralf tr nnes
|
drivers
|
gpu
|
drm, gud
|
drm/sun4i: add alpha property for sun8i ui layer
|
de2.0 and de3.0 ui layers supports plane-global alpha channel. add alpha property to the drm plane and connect it to the corresponding registers in mixer.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add alpha properties to ui/vi layers
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['sun4i ']
|
['h', 'c']
| 2
| 34
| 0
|
--- diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c +static void sun8i_ui_layer_update_alpha(struct sun8i_mixer *mixer, int channel, + int overlay, struct drm_plane *plane) +{ + u32 mask, val, ch_base; + + ch_base = sun8i_channel_base(mixer, channel); + + mask = sun8i_mixer_chan_ui_layer_attr_alpha_mode_mask | + sun8i_mixer_chan_ui_layer_attr_alpha_mask; + + val = sun8i_mixer_chan_ui_layer_attr_alpha(plane->state->alpha >> 8); + + val |= (plane->state->alpha == drm_blend_alpha_opaque) ? + sun8i_mixer_chan_ui_layer_attr_alpha_mode_pixel : + sun8i_mixer_chan_ui_layer_attr_alpha_mode_combined; + + regmap_update_bits(mixer->engine.regs, + sun8i_mixer_chan_ui_layer_attr(ch_base, overlay), + mask, val); +} + + sun8i_ui_layer_update_alpha(mixer, layer->channel, + layer->overlay, plane); + ret = drm_plane_create_alpha_property(&layer->plane); + if (ret) { + dev_err(drm->dev, "couldn't add alpha property "); + return err_ptr(ret); + } + diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.h b/drivers/gpu/drm/sun4i/sun8i_ui_layer.h --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.h +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.h +#define sun8i_mixer_chan_ui_layer_attr_alpha(x) ((x) << 24) + +#define sun8i_mixer_chan_ui_layer_attr_alpha_mode_pixel ((0) << 1) +#define sun8i_mixer_chan_ui_layer_attr_alpha_mode_layer ((1) << 1) +#define sun8i_mixer_chan_ui_layer_attr_alpha_mode_combined ((2) << 1)
|
Graphics
|
0ee29373f0317502dd6d6d2202db189e3bc48f4c
|
roman stratiienko jernej skrabec jernej skrabec siol net
|
drivers
|
gpu
|
drm, sun4i
|
drm/sun4i: add alpha property for sun8i and sun50i vi layer
|
de3.0 vi layers supports plane-global alpha channel. de2.0 fcc block have global_alpha register that can be used as alpha source for blender.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add alpha properties to ui/vi layers
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['sun4i ']
|
['h', 'c']
| 2
| 51
| 8
|
--- diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c +static void sun8i_vi_layer_update_alpha(struct sun8i_mixer *mixer, int channel, + int overlay, struct drm_plane *plane) +{ + u32 mask, val, ch_base; + + ch_base = sun8i_channel_base(mixer, channel); + + if (mixer->cfg->is_de3) { + mask = sun50i_mixer_chan_vi_layer_attr_alpha_mask | + sun50i_mixer_chan_vi_layer_attr_alpha_mode_mask; + val = sun50i_mixer_chan_vi_layer_attr_alpha + (plane->state->alpha >> 8); + + val |= (plane->state->alpha == drm_blend_alpha_opaque) ? + sun50i_mixer_chan_vi_layer_attr_alpha_mode_pixel : + sun50i_mixer_chan_vi_layer_attr_alpha_mode_combined; + + regmap_update_bits(mixer->engine.regs, + sun8i_mixer_chan_vi_layer_attr(ch_base, + overlay), + mask, val); + } else if (mixer->cfg->vi_num == 1) { + regmap_update_bits(mixer->engine.regs, + sun8i_mixer_fcc_global_alpha_reg, + sun8i_mixer_fcc_global_alpha_mask, + sun8i_mixer_fcc_global_alpha + (plane->state->alpha >> 8)); + } +} + - /* it seems that yuv formats use global alpha setting. */ - if (mixer->cfg->is_de3) - regmap_update_bits(mixer->engine.regs, - sun8i_mixer_chan_vi_layer_attr(ch_base, - overlay), - sun50i_mixer_chan_vi_layer_attr_alpha_mask, - sun50i_mixer_chan_vi_layer_attr_alpha(0xff)); - + sun8i_vi_layer_update_alpha(mixer, layer->channel, + layer->overlay, plane); + if (mixer->cfg->vi_num == 1 || mixer->cfg->is_de3) { + ret = drm_plane_create_alpha_property(&layer->plane); + if (ret) { + dev_err(drm->dev, "couldn't add alpha property "); + return err_ptr(ret); + } + } + diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.h b/drivers/gpu/drm/sun4i/sun8i_vi_layer.h --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.h +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.h +#define sun8i_mixer_fcc_global_alpha_reg \ + (0xaa000 + 0x90) + +#define sun8i_mixer_fcc_global_alpha(x) ((x) << 24) +#define sun8i_mixer_fcc_global_alpha_mask genmask(31, 24) + +#define sun50i_mixer_chan_vi_layer_attr_alpha_mode_mask genmask(2, 1) +#define sun50i_mixer_chan_vi_layer_attr_alpha_mode_pixel ((0) << 1) +#define sun50i_mixer_chan_vi_layer_attr_alpha_mode_layer ((1) << 1) +#define sun50i_mixer_chan_vi_layer_attr_alpha_mode_combined ((2) << 1) +
|
Graphics
|
c0f6f0c471a378a6da5ac99a086ba63e1a8570bb
|
roman stratiienko
|
drivers
|
gpu
|
drm, sun4i
|
drm/vc4: hdmi: move hdmi reset to bind
|
the hdmi reset got moved to a later point in the commit 9045e91a476b ("drm/vc4: hdmi: add reset callback").
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['c']
| 1
| 3
| 3
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c - if (vc4_hdmi->variant->reset) - vc4_hdmi->variant->reset(vc4_hdmi); - + if (vc4_hdmi->variant->reset) + vc4_hdmi->variant->reset(vc4_hdmi); +
|
Graphics
|
7155334f15f360f5c98391c5c7e12af4c13395c4
|
dom cobley
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: fix register offset with longer cec messages
|
the code prior to 311e305fdb4e ("drm/vc4: hdmi: implement a register layout abstraction") was relying on the fact that the register offset was incremented by 4 for each readl call. that worked since the register width is 4 bytes.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['c']
| 1
| 15
| 2
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c + struct drm_device *dev = vc4_hdmi->connector.dev; + + if (msg->len > 16) { + drm_err(dev, "attempting to read too much data (%d) ", msg->len); + return; + } + - u32 val = hdmi_read(hdmi_cec_rx_data_1 + i); + u32 val = hdmi_read(hdmi_cec_rx_data_1 + (i >> 2)); + struct drm_device *dev = vc4_hdmi->connector.dev; + if (msg->len > 16) { + drm_err(dev, "attempting to transmit too much data (%d) ", msg->len); + return -enomem; + } + - hdmi_write(hdmi_cec_tx_data_1 + i, + hdmi_write(hdmi_cec_tx_data_1 + (i >> 2),
|
Graphics
|
e9c9481f373eb7344f9e973eb28fc6e9d0f46485
|
dom cobley
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: fix up cec registers
|
the commit 311e305fdb4e ("drm/vc4: hdmi: implement a register layout abstraction") forgot one cec register, and made a copy and paste mistake for another one. fix those mistakes.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['h']
| 1
| 3
| 1
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h + hdmi_cec_cpu_set, + vc4_hdmi_reg(hdmi_cec_cpu_set, 0x0344), - vc4_hdmi_reg(hdmi_cec_cpu_mask_set, 0x034c), + vc4_hdmi_reg(hdmi_cec_cpu_mask_set, 0x0350),
|
Graphics
|
303085bc11bb7aebeeaaf09213f99fd7aa539a34
|
dom cobley hans verkuil hverkuil cisco xs all nl dave stevenson dave stevenson raspberrypi com hans verkuil hverkuil cisco xs all nl
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: restore cec physical address on reconnect
|
currently we call cec_phys_addr_invalidate on a hotplug deassert. that may be due to a tv power cycling, or an avr being switched on (and switching edid).
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['c']
| 1
| 18
| 6
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c + bool connected = false; - return connector_status_connected; - cec_phys_addr_invalidate(vc4_hdmi->cec_adap); - return connector_status_disconnected; + connected = true; + } else if (drm_probe_ddc(vc4_hdmi->ddc)) { + connected = true; + } else if (hdmi_read(hdmi_hotplug) & vc4_hdmi_hotplug_connected) { + connected = true; - if (drm_probe_ddc(vc4_hdmi->ddc)) - return connector_status_connected; + if (connected) { + if (connector->status != connector_status_connected) { + struct edid *edid = drm_get_edid(connector, vc4_hdmi->ddc); + + if (edid) { + cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid); + vc4_hdmi->encoder.hdmi_monitor = drm_detect_hdmi_monitor(edid); + kfree(edid); + } + } - if (hdmi_read(hdmi_hotplug) & vc4_hdmi_hotplug_connected) + } +
|
Graphics
|
b06eecb5158e5f3eb47b9d05aea8c259985cc5f7
|
dom cobley
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: compute the cec clock divider from the clock rate
|
the cec clock divider needs to output a frequency of 40khz from the hsm rate on the bcm2835. the driver used to have a fixed frequency for it, but that changed for the bcm2711 and we now need to compute it dynamically to maintain the proper rate.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['c']
| 1
| 3
| 1
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c + u16 clk_cnt; + clk_cnt = clk_get_rate(vc4_hdmi->hsm_clock) / cec_clock_freq; - (4091 << vc4_hdmi_cec_div_clk_cnt_shift); + (clk_cnt << vc4_hdmi_cec_div_clk_cnt_shift);
|
Graphics
|
f1ceb9d10043683b89e5e5e5848fb4e855295762
|
maxime ripard hans verkuil hverkuil cisco xs all nl dave stevenson dave stevenson raspberrypi com hans verkuil hverkuil cisco xs all nl
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: update the cec clock divider on hsm rate change
|
as part of the enable sequence we might change the hsm clock rate if the pixel rate is different than the one we were already dealing with.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['c']
| 1
| 29
| 10
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +#ifdef config_drm_vc4_hdmi_cec +static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) +{ + u16 clk_cnt; + u32 value; + + value = hdmi_read(hdmi_cec_cntrl_1); + value &= ~vc4_hdmi_cec_div_clk_cnt_mask; + + /* + * set the clock divider: the hsm_clock rate and this divider + * setting will give a 40 khz cec clock. + */ + clk_cnt = clk_get_rate(vc4_hdmi->hsm_clock) / cec_clock_freq; + value |= clk_cnt << vc4_hdmi_cec_div_clk_cnt_shift; + hdmi_write(hdmi_cec_cntrl_1, value); +} +#else +static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) {} +#endif + + vc4_hdmi_cec_update_clk_div(vc4_hdmi); + - u16 clk_cnt; + - value &= ~vc4_hdmi_cec_div_clk_cnt_mask; - /* - * set the logical address to unregistered and set the clock - * divider: the hsm_clock rate and this divider setting will - * give a 40 khz cec clock. - */ - clk_cnt = clk_get_rate(vc4_hdmi->hsm_clock) / cec_clock_freq; - value |= vc4_hdmi_cec_addr_mask | - (clk_cnt << vc4_hdmi_cec_div_clk_cnt_shift); + /* set the logical address to unregistered */ + value |= vc4_hdmi_cec_addr_mask; + + vc4_hdmi_cec_update_clk_div(vc4_hdmi); +
|
Graphics
|
a9dd0b9a5c3e11c79e6ff9c7fdf07c471732dcb6
|
maxime ripard
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: introduce a cec clock
|
while the bcm2835 had the cec clock derived from the hsm clock, the bcm2711 has a dedicated parent clock for it.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['h', 'c']
| 2
| 9
| 1
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c - clk_cnt = clk_get_rate(vc4_hdmi->hsm_clock) / cec_clock_freq; + clk_cnt = clk_get_rate(vc4_hdmi->cec_clock) / cec_clock_freq; + vc4_hdmi->cec_clock = vc4_hdmi->hsm_clock; + vc4_hdmi->cec_clock = devm_clk_get(dev, "cec"); + if (is_err(vc4_hdmi->cec_clock)) { + drm_error("failed to get cec clock "); + return ptr_err(vc4_hdmi->cec_clock); + } + diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h + struct clk *cec_clock;
|
Graphics
|
cd7f016c93b697dea79a884162cbf7311283fe12
|
maxime ripard
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: split the interrupt handlers
|
the bcm2711 has two different interrupt sources to transmit and receive cec messages, provided through an external interrupt chip shared between the two hdmi interrupt controllers.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['c']
| 1
| 65
| 21
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) +static irqreturn_t vc4_cec_irq_handler_rx_thread(int irq, void *priv) +{ + struct vc4_hdmi *vc4_hdmi = priv; + + if (vc4_hdmi->cec_rx_msg.len) + cec_received_msg(vc4_hdmi->cec_adap, + &vc4_hdmi->cec_rx_msg); + + return irq_handled; +} + +static irqreturn_t vc4_cec_irq_handler_tx_thread(int irq, void *priv) - if (vc4_hdmi->cec_irq_was_rx) { - if (vc4_hdmi->cec_rx_msg.len) - cec_received_msg(vc4_hdmi->cec_adap, - &vc4_hdmi->cec_rx_msg); - } else if (vc4_hdmi->cec_tx_ok) { + if (vc4_hdmi->cec_tx_ok) { +static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) +{ + struct vc4_hdmi *vc4_hdmi = priv; + irqreturn_t ret; + + if (vc4_hdmi->cec_irq_was_rx) + ret = vc4_cec_irq_handler_rx_thread(irq, priv); + else + ret = vc4_cec_irq_handler_tx_thread(irq, priv); + + return ret; +} + +static irqreturn_t vc4_cec_irq_handler_tx_bare(int irq, void *priv) +{ + struct vc4_hdmi *vc4_hdmi = priv; + u32 cntrl1; + + cntrl1 = hdmi_read(hdmi_cec_cntrl_1); + vc4_hdmi->cec_tx_ok = cntrl1 & vc4_hdmi_cec_tx_status_good; + cntrl1 &= ~vc4_hdmi_cec_start_xmit_begin; + hdmi_write(hdmi_cec_cntrl_1, cntrl1); + + return irq_wake_thread; +} + +static irqreturn_t vc4_cec_irq_handler_rx_bare(int irq, void *priv) +{ + struct vc4_hdmi *vc4_hdmi = priv; + u32 cntrl1; + + vc4_hdmi->cec_rx_msg.len = 0; + cntrl1 = hdmi_read(hdmi_cec_cntrl_1); + vc4_cec_read_msg(vc4_hdmi, cntrl1); + cntrl1 |= vc4_hdmi_cec_clear_receive_off; + hdmi_write(hdmi_cec_cntrl_1, cntrl1); + cntrl1 &= ~vc4_hdmi_cec_clear_receive_off; + + hdmi_write(hdmi_cec_cntrl_1, cntrl1); + + return irq_wake_thread; +} + - u32 cntrl1, cntrl5; + irqreturn_t ret; + u32 cntrl5; - vc4_hdmi->cec_rx_msg.len = 0; - cntrl1 = hdmi_read(hdmi_cec_cntrl_1); + - if (vc4_hdmi->cec_irq_was_rx) { - vc4_cec_read_msg(vc4_hdmi, cntrl1); - cntrl1 |= vc4_hdmi_cec_clear_receive_off; - hdmi_write(hdmi_cec_cntrl_1, cntrl1); - cntrl1 &= ~vc4_hdmi_cec_clear_receive_off; - } else { - vc4_hdmi->cec_tx_ok = cntrl1 & vc4_hdmi_cec_tx_status_good; - cntrl1 &= ~vc4_hdmi_cec_start_xmit_begin; - } - hdmi_write(hdmi_cec_cntrl_1, cntrl1); - hdmi_write(hdmi_cec_cpu_clear, vc4_hdmi_cpu_cec); + if (vc4_hdmi->cec_irq_was_rx) + ret = vc4_cec_irq_handler_rx_bare(irq, priv); + else + ret = vc4_cec_irq_handler_tx_bare(irq, priv); - return irq_wake_thread; + hdmi_write(hdmi_cec_cpu_clear, vc4_hdmi_cpu_cec); + return ret;
|
Graphics
|
0c38490a031071c0d81b400949f43ea6f4b0cd8f
|
maxime ripard
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: support bcm2711 cec interrupt setup
|
the hdmi controller found in the bcm2711 has an external interrupt controller for the cec and hotplug interrupt shared between the two instances.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['h', 'c']
| 2
| 39
| 10
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c - hdmi_write(hdmi_cec_cpu_mask_clear, vc4_hdmi_cpu_cec); + if (!vc4_hdmi->variant->external_irq_controller) + hdmi_write(hdmi_cec_cpu_mask_clear, vc4_hdmi_cpu_cec); - hdmi_write(hdmi_cec_cpu_mask_set, vc4_hdmi_cpu_cec); + if (!vc4_hdmi->variant->external_irq_controller) + hdmi_write(hdmi_cec_cpu_mask_set, vc4_hdmi_cpu_cec); - hdmi_write(hdmi_cec_cpu_mask_set, 0xffffffff); - - ret = devm_request_threaded_irq(&pdev->dev, platform_get_irq(pdev, 0), - vc4_cec_irq_handler, - vc4_cec_irq_handler_thread, 0, - "vc4 hdmi cec", vc4_hdmi); - if (ret) - goto err_delete_cec_adap; + if (vc4_hdmi->variant->external_irq_controller) { + ret = devm_request_threaded_irq(&pdev->dev, + platform_get_irq_byname(pdev, "cec-rx"), + vc4_cec_irq_handler_rx_bare, + vc4_cec_irq_handler_rx_thread, 0, + "vc4 hdmi cec rx", vc4_hdmi); + if (ret) + goto err_delete_cec_adap; + + ret = devm_request_threaded_irq(&pdev->dev, + platform_get_irq_byname(pdev, "cec-tx"), + vc4_cec_irq_handler_tx_bare, + vc4_cec_irq_handler_tx_thread, 0, + "vc4 hdmi cec tx", vc4_hdmi); + if (ret) + goto err_delete_cec_adap; + } else { + hdmi_write(hdmi_cec_cpu_mask_set, 0xffffffff); + + ret = devm_request_threaded_irq(&pdev->dev, platform_get_irq(pdev, 0), + vc4_cec_irq_handler, + vc4_cec_irq_handler_thread, 0, + "vc4 hdmi cec", vc4_hdmi); + if (ret) + goto err_delete_cec_adap; + } + .external_irq_controller = true, + .external_irq_controller = true, diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h + /* + * the bcm2711 cec/hotplug irq controller is shared between the + * two hdmi controllers, and we have a proper irqchip driver for + * it. + */ + bool external_irq_controller; +
|
Graphics
|
ad6380e9aaf459c22006c73fd3d4dd6f41e8f048
|
maxime ripard
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: remove cec_available flag
|
now that our hdmi controller supports cec for the bcm2711, let's remove that flag.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['h', 'c']
| 2
| 0
| 7
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c - if (!vc4_hdmi->variant->cec_available) - return 0; - - .cec_available = true, diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h - /* set to true when the cec support is available */ - bool cec_available; -
|
Graphics
|
f551863af919edd60f76a24126da3ac10294ace1
|
dom cobley hans verkuil hverkuil cisco xs all nl dave stevenson dave stevenson raspberrypi com hans verkuil hverkuil cisco xs all nl
|
drivers
|
gpu
|
drm, vc4
|
drm/vc4: hdmi: don't register the cec adapter if there's no interrupts
|
we introduced the bcm2711 support to the vc4 hdmi controller with 5.10, but this was lacking any of the interrupts of the cec controller so we have to deal with the backward compatibility.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add cec support for the bcm2711 (raspberry 4)
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['vc4 ', 'hdmi']
|
['c']
| 1
| 6
| 0
|
--- diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c + struct device *dev = &pdev->dev; + if (!of_find_property(dev->of_node, "interrupts", null)) { + dev_warn(dev, "'interrupts' dt property is missing, no cec "); + return 0; + } +
|
Graphics
|
4d03ed7ad731a2cf922fa37246fb7068a52f18ff
|
maxime ripard
|
drivers
|
gpu
|
drm, vc4
|
drm: bridge: add chipone icn6211 mipi-dsi to rgb bridge
|
icn6211 is mipi-dsi to rgb converter bridge from chipone.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
chipone icn6211
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['bridge ']
|
['kconfig', 'maintainers', 'c', 'makefile']
| 4
| 308
| 0
|
--- diff --git a/maintainers b/maintainers --- a/maintainers +++ b/maintainers +f: drivers/gpu/drm/bridge/chipone-icn6211.c diff --git a/drivers/gpu/drm/bridge/kconfig b/drivers/gpu/drm/bridge/kconfig --- a/drivers/gpu/drm/bridge/kconfig +++ b/drivers/gpu/drm/bridge/kconfig +config drm_chipone_icn6211 + tristate "chipone icn6211 mipi-dsi/rgb converter bridge" + depends on of + select drm_mipi_dsi + select drm_panel_bridge + help + icn6211 is mipi-dsi/rgb converter bridge from chipone. + + it has a flexible configuration of mipi dsi signal input + and produce rgb565, rgb666, rgb888 output format. + + if in doubt, say "n". + diff --git a/drivers/gpu/drm/bridge/makefile b/drivers/gpu/drm/bridge/makefile --- a/drivers/gpu/drm/bridge/makefile +++ b/drivers/gpu/drm/bridge/makefile +obj-$(config_drm_chipone_icn6211) += chipone-icn6211.o diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c --- /dev/null +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c +// spdx-license-identifier: gpl-2.0+ +/* + * copyright (c) 2020 amarula solutions(india) + * author: jagan teki <jagan@amarulasolutions.com> + */ + +#include <drm/drm_of.h> +#include <drm/drm_print.h> +#include <drm/drm_mipi_dsi.h> + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/regulator/consumer.h> + +#include <video/mipi_display.h> + +#define hactive_li 0x20 +#define vactive_li 0x21 +#define vactive_hactive_hi 0x22 +#define hfp_li 0x23 +#define hsync_li 0x24 +#define hbp_li 0x25 +#define hfp_hsw_hbp_hi 0x26 +#define vfp 0x27 +#define vsync 0x28 +#define vbp 0x29 + +struct chipone { + struct device *dev; + struct drm_bridge bridge; + struct drm_bridge *panel_bridge; + struct gpio_desc *enable_gpio; + struct regulator *vdd1; + struct regulator *vdd2; + struct regulator *vdd3; +}; + +static inline struct chipone *bridge_to_chipone(struct drm_bridge *bridge) +{ + return container_of(bridge, struct chipone, bridge); +} + +static struct drm_display_mode *bridge_to_mode(struct drm_bridge *bridge) +{ + return &bridge->encoder->crtc->state->adjusted_mode; +} + +static inline int chipone_dsi_write(struct chipone *icn, const void *seq, + size_t len) +{ + struct mipi_dsi_device *dsi = to_mipi_dsi_device(icn->dev); + + return mipi_dsi_generic_write(dsi, seq, len); +} + +#define icn6211_dsi(icn, seq...) \ + { \ + const u8 d[] = { seq }; \ + chipone_dsi_write(icn, d, array_size(d)); \ + } + +static void chipone_enable(struct drm_bridge *bridge) +{ + struct chipone *icn = bridge_to_chipone(bridge); + struct drm_display_mode *mode = bridge_to_mode(bridge); + + icn6211_dsi(icn, 0x7a, 0xc1); + + icn6211_dsi(icn, hactive_li, mode->hdisplay & 0xff); + + icn6211_dsi(icn, vactive_li, mode->vdisplay & 0xff); + + /** + * lsb nibble: 2nd nibble of hdisplay + * msb nibble: 2nd nibble of vdisplay + */ + icn6211_dsi(icn, vactive_hactive_hi, + ((mode->hdisplay >> 8) & 0xf) | + (((mode->vdisplay >> 8) & 0xf) << 4)); + + icn6211_dsi(icn, hfp_li, mode->hsync_start - mode->hdisplay); + + icn6211_dsi(icn, hsync_li, mode->hsync_end - mode->hsync_start); + + icn6211_dsi(icn, hbp_li, mode->htotal - mode->hsync_end); + + icn6211_dsi(icn, hfp_hsw_hbp_hi, 0x00); + + icn6211_dsi(icn, vfp, mode->vsync_start - mode->vdisplay); + + icn6211_dsi(icn, vsync, mode->vsync_end - mode->vsync_start); + + icn6211_dsi(icn, vbp, mode->vtotal - mode->vsync_end); + + /* dsi specific sequence */ + icn6211_dsi(icn, mipi_dcs_set_tear_off, 0x80); + icn6211_dsi(icn, mipi_dcs_set_address_mode, 0x28); + icn6211_dsi(icn, 0xb5, 0xa0); + icn6211_dsi(icn, 0x5c, 0xff); + icn6211_dsi(icn, mipi_dcs_set_column_address, 0x01); + icn6211_dsi(icn, mipi_dcs_get_power_save, 0x92); + icn6211_dsi(icn, 0x6b, 0x71); + icn6211_dsi(icn, 0x69, 0x2b); + icn6211_dsi(icn, mipi_dcs_enter_sleep_mode, 0x40); + icn6211_dsi(icn, mipi_dcs_exit_sleep_mode, 0x98); + + /* icn6211 specific sequence */ + icn6211_dsi(icn, 0xb6, 0x20); + icn6211_dsi(icn, 0x51, 0x20); + icn6211_dsi(icn, 0x09, 0x10); + + usleep_range(10000, 11000); +} + +static void chipone_pre_enable(struct drm_bridge *bridge) +{ + struct chipone *icn = bridge_to_chipone(bridge); + int ret; + + if (icn->vdd1) { + ret = regulator_enable(icn->vdd1); + if (ret) + drm_dev_error(icn->dev, + "failed to enable vdd1 regulator: %d ", ret); + } + + if (icn->vdd2) { + ret = regulator_enable(icn->vdd2); + if (ret) + drm_dev_error(icn->dev, + "failed to enable vdd2 regulator: %d ", ret); + } + + if (icn->vdd3) { + ret = regulator_enable(icn->vdd3); + if (ret) + drm_dev_error(icn->dev, + "failed to enable vdd3 regulator: %d ", ret); + } + + gpiod_set_value(icn->enable_gpio, 1); + + usleep_range(10000, 11000); +} + +static void chipone_post_disable(struct drm_bridge *bridge) +{ + struct chipone *icn = bridge_to_chipone(bridge); + + if (icn->vdd1) + regulator_disable(icn->vdd1); + + if (icn->vdd2) + regulator_disable(icn->vdd2); + + if (icn->vdd3) + regulator_disable(icn->vdd3); + + gpiod_set_value(icn->enable_gpio, 0); +} + +static int chipone_attach(struct drm_bridge *bridge, enum drm_bridge_attach_flags flags) +{ + struct chipone *icn = bridge_to_chipone(bridge); + + return drm_bridge_attach(bridge->encoder, icn->panel_bridge, bridge, flags); +} + +static const struct drm_bridge_funcs chipone_bridge_funcs = { + .attach = chipone_attach, + .post_disable = chipone_post_disable, + .pre_enable = chipone_pre_enable, + .enable = chipone_enable, +}; + +static int chipone_parse_dt(struct chipone *icn) +{ + struct device *dev = icn->dev; + struct drm_panel *panel; + int ret; + + icn->vdd1 = devm_regulator_get_optional(dev, "vdd1"); + if (is_err(icn->vdd1)) { + ret = ptr_err(icn->vdd1); + if (ret == -eprobe_defer) + return -eprobe_defer; + icn->vdd1 = null; + drm_dev_debug(dev, "failed to get vdd1 regulator: %d ", ret); + } + + icn->vdd2 = devm_regulator_get_optional(dev, "vdd2"); + if (is_err(icn->vdd2)) { + ret = ptr_err(icn->vdd2); + if (ret == -eprobe_defer) + return -eprobe_defer; + icn->vdd2 = null; + drm_dev_debug(dev, "failed to get vdd2 regulator: %d ", ret); + } + + icn->vdd3 = devm_regulator_get_optional(dev, "vdd3"); + if (is_err(icn->vdd3)) { + ret = ptr_err(icn->vdd3); + if (ret == -eprobe_defer) + return -eprobe_defer; + icn->vdd3 = null; + drm_dev_debug(dev, "failed to get vdd3 regulator: %d ", ret); + } + + icn->enable_gpio = devm_gpiod_get(dev, "enable", gpiod_out_low); + if (is_err(icn->enable_gpio)) { + drm_dev_error(dev, "failed to get enable gpio "); + return ptr_err(icn->enable_gpio); + } + + ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, null); + if (ret) + return ret; + + icn->panel_bridge = devm_drm_panel_bridge_add(dev, panel); + if (is_err(icn->panel_bridge)) + return ptr_err(icn->panel_bridge); + + return 0; +} + +static int chipone_probe(struct mipi_dsi_device *dsi) +{ + struct device *dev = &dsi->dev; + struct chipone *icn; + int ret; + + icn = devm_kzalloc(dev, sizeof(struct chipone), gfp_kernel); + if (!icn) + return -enomem; + + mipi_dsi_set_drvdata(dsi, icn); + icn->dev = dev; + + ret = chipone_parse_dt(icn); + if (ret) + return ret; + + icn->bridge.funcs = &chipone_bridge_funcs; + icn->bridge.type = drm_mode_connector_dpi; + icn->bridge.of_node = dev->of_node; + + drm_bridge_add(&icn->bridge); + + dsi->lanes = 4; + dsi->format = mipi_dsi_fmt_rgb888; + dsi->mode_flags = mipi_dsi_mode_video_sync_pulse; + + ret = mipi_dsi_attach(dsi); + if (ret < 0) { + drm_bridge_remove(&icn->bridge); + dev_err(dev, "failed to attach dsi "); + } + + return ret; +} + +static int chipone_remove(struct mipi_dsi_device *dsi) +{ + struct chipone *icn = mipi_dsi_get_drvdata(dsi); + + mipi_dsi_detach(dsi); + drm_bridge_remove(&icn->bridge); + + return 0; +} + +static const struct of_device_id chipone_of_match[] = { + { .compatible = "chipone,icn6211", }, + { /* sentinel */ } +}; +module_device_table(of, chipone_of_match); + +static struct mipi_dsi_driver chipone_driver = { + .probe = chipone_probe, + .remove = chipone_remove, + .driver = { + .name = "chipone-icn6211", + .owner = this_module, + .of_match_table = chipone_of_match, + }, +}; +module_mipi_dsi_driver(chipone_driver); + +module_author("jagan teki <jagan@amarulasolutions.com>"); +module_description("chipone icn6211 mipi-dsi to rgb converter bridge"); +module_license("gpl");
|
Graphics
|
ce517f18944e3f8d08484cfdee425277fc2c4df6
|
jagan teki
|
drivers
|
gpu
|
bridge, drm
|
drm/bridge: introduce lt8912b dsi to hdmi bridge
|
lontium lt8912b is a dsi to hdmi bridge.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
lontium lt8912b
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['bridge ']
|
['kconfig', 'maintainers', 'c', 'makefile']
| 4
| 781
| 0
|
--- diff --git a/maintainers b/maintainers --- a/maintainers +++ b/maintainers +f: drivers/gpu/drm/bridge/lontium-lt8912b.c diff --git a/drivers/gpu/drm/bridge/kconfig b/drivers/gpu/drm/bridge/kconfig --- a/drivers/gpu/drm/bridge/kconfig +++ b/drivers/gpu/drm/bridge/kconfig +config drm_lontium_lt8912b + tristate "lontium lt8912b dsi/hdmi bridge" + depends on of + select drm_panel_bridge + select drm_kms_helper + select regmap_i2c + help + driver for lontium lt8912b dsi to hdmi bridge + chip driver. + please say y if you have such hardware. + + say m here if you want to support this hardware as a module. + the module will be named "lontium-lt8912b". + diff --git a/drivers/gpu/drm/bridge/makefile b/drivers/gpu/drm/bridge/makefile --- a/drivers/gpu/drm/bridge/makefile +++ b/drivers/gpu/drm/bridge/makefile +obj-$(config_drm_lontium_lt8912b) += lontium-lt8912b.o diff --git a/drivers/gpu/drm/bridge/lontium-lt8912b.c b/drivers/gpu/drm/bridge/lontium-lt8912b.c --- /dev/null +++ b/drivers/gpu/drm/bridge/lontium-lt8912b.c +// spdx-license-identifier: gpl-2.0 +/* + * copyright (c) 2018, the linux foundation. all rights reserved. + */ + +#include <linux/device.h> +#include <linux/delay.h> +#include <linux/i2c.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> +#include <linux/regmap.h> + +#include <drm/drm_probe_helper.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> + +#include <video/videomode.h> + +#define i2c_main 0 +#define i2c_addr_main 0x48 + +#define i2c_cec_dsi 1 +#define i2c_addr_cec_dsi 0x49 + +#define i2c_max_idx 2 + +struct lt8912 { + struct device *dev; + struct drm_bridge bridge; + struct drm_connector connector; + + struct i2c_client *i2c_client[i2c_max_idx]; + struct regmap *regmap[i2c_max_idx]; + + struct device_node *host_node; + struct drm_bridge *hdmi_port; + + struct mipi_dsi_device *dsi; + + struct gpio_desc *gp_reset; + + struct videomode mode; + + u8 data_lanes; + bool is_power_on; + bool is_attached; +}; + +static int lt8912_write_init_config(struct lt8912 *lt) +{ + const struct reg_sequence seq[] = { + /* digital clock en*/ + {0x08, 0xff}, + {0x09, 0xff}, + {0x0a, 0xff}, + {0x0b, 0x7c}, + {0x0c, 0xff}, + {0x42, 0x04}, + + /*tx analog*/ + {0x31, 0xb1}, + {0x32, 0xb1}, + {0x33, 0x0e}, + {0x37, 0x00}, + {0x38, 0x22}, + {0x60, 0x82}, + + /*cbus analog*/ + {0x39, 0x45}, + {0x3a, 0x00}, + {0x3b, 0x00}, + + /*hdmi pll analog*/ + {0x44, 0x31}, + {0x55, 0x44}, + {0x57, 0x01}, + {0x5a, 0x02}, + + /*mipi analog*/ + {0x3e, 0xd6}, + {0x3f, 0xd4}, + {0x41, 0x3c}, + {0xb2, 0x00}, + }; + + return regmap_multi_reg_write(lt->regmap[i2c_main], seq, array_size(seq)); +} + +static int lt8912_write_mipi_basic_config(struct lt8912 *lt) +{ + const struct reg_sequence seq[] = { + {0x12, 0x04}, + {0x14, 0x00}, + {0x15, 0x00}, + {0x1a, 0x03}, + {0x1b, 0x03}, + }; + + return regmap_multi_reg_write(lt->regmap[i2c_cec_dsi], seq, array_size(seq)); +}; + +static int lt8912_write_dds_config(struct lt8912 *lt) +{ + const struct reg_sequence seq[] = { + {0x4e, 0xff}, + {0x4f, 0x56}, + {0x50, 0x69}, + {0x51, 0x80}, + {0x1f, 0x5e}, + {0x20, 0x01}, + {0x21, 0x2c}, + {0x22, 0x01}, + {0x23, 0xfa}, + {0x24, 0x00}, + {0x25, 0xc8}, + {0x26, 0x00}, + {0x27, 0x5e}, + {0x28, 0x01}, + {0x29, 0x2c}, + {0x2a, 0x01}, + {0x2b, 0xfa}, + {0x2c, 0x00}, + {0x2d, 0xc8}, + {0x2e, 0x00}, + {0x42, 0x64}, + {0x43, 0x00}, + {0x44, 0x04}, + {0x45, 0x00}, + {0x46, 0x59}, + {0x47, 0x00}, + {0x48, 0xf2}, + {0x49, 0x06}, + {0x4a, 0x00}, + {0x4b, 0x72}, + {0x4c, 0x45}, + {0x4d, 0x00}, + {0x52, 0x08}, + {0x53, 0x00}, + {0x54, 0xb2}, + {0x55, 0x00}, + {0x56, 0xe4}, + {0x57, 0x0d}, + {0x58, 0x00}, + {0x59, 0xe4}, + {0x5a, 0x8a}, + {0x5b, 0x00}, + {0x5c, 0x34}, + {0x1e, 0x4f}, + {0x51, 0x00}, + }; + + return regmap_multi_reg_write(lt->regmap[i2c_cec_dsi], seq, array_size(seq)); +} + +static int lt8912_write_rxlogicres_config(struct lt8912 *lt) +{ + int ret; + + ret = regmap_write(lt->regmap[i2c_main], 0x03, 0x7f); + usleep_range(10000, 20000); + ret |= regmap_write(lt->regmap[i2c_main], 0x03, 0xff); + + return ret; +}; + +static int lt8912_write_lvds_config(struct lt8912 *lt) +{ + const struct reg_sequence seq[] = { + {0x44, 0x30}, + {0x51, 0x05}, + {0x50, 0x24}, + {0x51, 0x2d}, + {0x52, 0x04}, + {0x69, 0x0e}, + {0x69, 0x8e}, + {0x6a, 0x00}, + {0x6c, 0xb8}, + {0x6b, 0x51}, + {0x04, 0xfb}, + {0x04, 0xff}, + {0x7f, 0x00}, + {0xa8, 0x13}, + {0x02, 0xf7}, + {0x02, 0xff}, + {0x03, 0xcf}, + {0x03, 0xff}, + }; + + return regmap_multi_reg_write(lt->regmap[i2c_cec_dsi], seq, array_size(seq)); +}; + +static inline struct lt8912 *bridge_to_lt8912(struct drm_bridge *b) +{ + return container_of(b, struct lt8912, bridge); +} + +static inline struct lt8912 *connector_to_lt8912(struct drm_connector *c) +{ + return container_of(c, struct lt8912, connector); +} + +static const struct regmap_config lt8912_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = 0xff, +}; + +static int lt8912_init_i2c(struct lt8912 *lt, struct i2c_client *client) +{ + unsigned int i; + /* + * at this time we only initialize 2 chips, but the lt8912 provides + * a third interface for the audio over hdmi configuration. + */ + struct i2c_board_info info[] = { + { i2c_board_info("lt8912p0", i2c_addr_main), }, + { i2c_board_info("lt8912p1", i2c_addr_cec_dsi), }, + }; + + if (!lt) + return -enodev; + + for (i = 0; i < array_size(info); i++) { + if (i > 0) { + lt->i2c_client[i] = i2c_new_dummy_device(client->adapter, + info[i].addr); + if (is_err(lt->i2c_client[i])) + return ptr_err(lt->i2c_client[i]); + } + + lt->regmap[i] = devm_regmap_init_i2c(lt->i2c_client[i], + <8912_regmap_config); + if (is_err(lt->regmap[i])) + return ptr_err(lt->regmap[i]); + } + return 0; +} + +static int lt8912_free_i2c(struct lt8912 *lt) +{ + unsigned int i; + + for (i = 1; i < i2c_max_idx; i++) + i2c_unregister_device(lt->i2c_client[i]); + + return 0; +} + +static int lt8912_hard_power_on(struct lt8912 *lt) +{ + gpiod_set_value_cansleep(lt->gp_reset, 0); + msleep(20); + + return 0; +} + +static void lt8912_hard_power_off(struct lt8912 *lt) +{ + gpiod_set_value_cansleep(lt->gp_reset, 1); + msleep(20); + lt->is_power_on = false; +} + +static int lt8912_video_setup(struct lt8912 *lt) +{ + u32 hactive, h_total, hpw, hfp, hbp; + u32 vactive, v_total, vpw, vfp, vbp; + u8 settle = 0x08; + int ret; + + if (!lt) + return -einval; + + hactive = lt->mode.hactive; + hfp = lt->mode.hfront_porch; + hpw = lt->mode.hsync_len; + hbp = lt->mode.hback_porch; + h_total = hactive + hfp + hpw + hbp; + + vactive = lt->mode.vactive; + vfp = lt->mode.vfront_porch; + vpw = lt->mode.vsync_len; + vbp = lt->mode.vback_porch; + v_total = vactive + vfp + vpw + vbp; + + if (vactive <= 600) + settle = 0x04; + else if (vactive == 1080) + settle = 0x0a; + + ret = regmap_write(lt->regmap[i2c_cec_dsi], 0x10, 0x01); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x11, settle); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x18, hpw); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x19, vpw); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x1c, hactive & 0xff); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x1d, hactive >> 8); + + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x2f, 0x0c); + + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x34, h_total & 0xff); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x35, h_total >> 8); + + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x36, v_total & 0xff); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x37, v_total >> 8); + + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x38, vbp & 0xff); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x39, vbp >> 8); + + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x3a, vfp & 0xff); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x3b, vfp >> 8); + + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x3c, hbp & 0xff); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x3d, hbp >> 8); + + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x3e, hfp & 0xff); + ret |= regmap_write(lt->regmap[i2c_cec_dsi], 0x3f, hfp >> 8); + + return ret; +} + +static int lt8912_soft_power_on(struct lt8912 *lt) +{ + if (!lt->is_power_on) { + u32 lanes = lt->data_lanes; + + lt8912_write_init_config(lt); + regmap_write(lt->regmap[i2c_cec_dsi], 0x13, lanes & 3); + + lt8912_write_mipi_basic_config(lt); + + lt->is_power_on = true; + } + + return 0; +} + +static int lt8912_video_on(struct lt8912 *lt) +{ + int ret; + + ret = lt8912_video_setup(lt); + if (ret < 0) + goto end; + + ret = lt8912_write_dds_config(lt); + if (ret < 0) + goto end; + + ret = lt8912_write_rxlogicres_config(lt); + if (ret < 0) + goto end; + + ret = lt8912_write_lvds_config(lt); + if (ret < 0) + goto end; + +end: + return ret; +} + +static enum drm_connector_status lt8912_check_cable_status(struct lt8912 *lt) +{ + int ret; + unsigned int reg_val; + + ret = regmap_read(lt->regmap[i2c_main], 0xc1, ®_val); + if (ret) + return connector_status_unknown; + + if (reg_val & bit(7)) + return connector_status_connected; + + return connector_status_disconnected; +} + +static enum drm_connector_status +lt8912_connector_detect(struct drm_connector *connector, bool force) +{ + struct lt8912 *lt = connector_to_lt8912(connector); + + if (lt->hdmi_port->ops & drm_bridge_op_detect) + return drm_bridge_detect(lt->hdmi_port); + + return lt8912_check_cable_status(lt); +} + +static const struct drm_connector_funcs lt8912_connector_funcs = { + .detect = lt8912_connector_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static enum drm_mode_status +lt8912_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) +{ + if (mode->clock > 150000) + return mode_clock_high; + + if (mode->hdisplay > 1920) + return mode_bad_hvalue; + + if (mode->vdisplay > 1080) + return mode_bad_vvalue; + + return mode_ok; +} + +static int lt8912_connector_get_modes(struct drm_connector *connector) +{ + struct edid *edid; + int ret = -1; + int num = 0; + struct lt8912 *lt = connector_to_lt8912(connector); + u32 bus_format = media_bus_fmt_rgb888_1x24; + + edid = drm_bridge_get_edid(lt->hdmi_port, connector); + if (edid) { + drm_connector_update_edid_property(connector, edid); + num = drm_add_edid_modes(connector, edid); + } else { + return ret; + } + + ret = drm_display_info_set_bus_formats(&connector->display_info, + &bus_format, 1); + if (ret) + num = ret; + + kfree(edid); + return num; +} + +static const struct drm_connector_helper_funcs lt8912_connector_helper_funcs = { + .get_modes = lt8912_connector_get_modes, + .mode_valid = lt8912_connector_mode_valid, +}; + +static void lt8912_bridge_mode_set(struct drm_bridge *bridge, + const struct drm_display_mode *mode, + const struct drm_display_mode *adj) +{ + struct lt8912 *lt = bridge_to_lt8912(bridge); + + drm_display_mode_to_videomode(adj, <->mode); +} + +static void lt8912_bridge_enable(struct drm_bridge *bridge) +{ + struct lt8912 *lt = bridge_to_lt8912(bridge); + + lt8912_video_on(lt); +} + +static int lt8912_attach_dsi(struct lt8912 *lt) +{ + struct device *dev = lt->dev; + struct mipi_dsi_host *host; + struct mipi_dsi_device *dsi; + int ret = -1; + const struct mipi_dsi_device_info info = { .type = "lt8912", + .channel = 0, + .node = null, + }; + + host = of_find_mipi_dsi_host_by_node(lt->host_node); + if (!host) { + dev_err(dev, "failed to find dsi host "); + return -eprobe_defer; + } + + dsi = mipi_dsi_device_register_full(host, &info); + if (is_err(dsi)) { + ret = ptr_err(dsi); + dev_err(dev, "failed to create dsi device (%d) ", ret); + goto err_dsi_device; + } + + lt->dsi = dsi; + + dsi->lanes = lt->data_lanes; + dsi->format = mipi_dsi_fmt_rgb888; + + dsi->mode_flags = mipi_dsi_mode_video | + mipi_dsi_mode_video_burst | + mipi_dsi_mode_lpm | + mipi_dsi_mode_eot_packet; + + ret = mipi_dsi_attach(dsi); + if (ret < 0) { + dev_err(dev, "failed to attach dsi to host "); + goto err_dsi_attach; + } + + return 0; + +err_dsi_attach: + mipi_dsi_device_unregister(dsi); +err_dsi_device: + return ret; +} + +static void lt8912_detach_dsi(struct lt8912 *lt) +{ + mipi_dsi_detach(lt->dsi); + mipi_dsi_device_unregister(lt->dsi); +} + +static int lt8912_bridge_connector_init(struct drm_bridge *bridge) +{ + int ret; + struct lt8912 *lt = bridge_to_lt8912(bridge); + struct drm_connector *connector = <->connector; + + connector->polled = drm_connector_poll_connect | + drm_connector_poll_disconnect; + + ret = drm_connector_init(bridge->dev, connector, + <8912_connector_funcs, + lt->hdmi_port->type); + if (ret) + goto exit; + + drm_connector_helper_add(connector, <8912_connector_helper_funcs); + + connector->dpms = drm_mode_dpms_off; + drm_connector_attach_encoder(connector, bridge->encoder); + +exit: + return ret; +} + +static int lt8912_bridge_attach(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) +{ + struct lt8912 *lt = bridge_to_lt8912(bridge); + int ret; + + if (!(flags & drm_bridge_attach_no_connector)) { + ret = lt8912_bridge_connector_init(bridge); + if (ret) { + dev_err(lt->dev, "failed to init bridge ! (%d) ", ret); + return ret; + } + } + + ret = lt8912_hard_power_on(lt); + if (ret) + return ret; + + ret = lt8912_soft_power_on(lt); + if (ret) + goto error; + + ret = lt8912_attach_dsi(lt); + if (ret) + goto error; + + lt->is_attached = true; + + return 0; + +error: + lt8912_hard_power_off(lt); + return ret; +} + +static void lt8912_bridge_detach(struct drm_bridge *bridge) +{ + struct lt8912 *lt = bridge_to_lt8912(bridge); + + if (lt->is_attached) { + lt8912_detach_dsi(lt); + lt8912_hard_power_off(lt); + drm_connector_unregister(<->connector); + drm_connector_cleanup(<->connector); + } +} + +static enum drm_connector_status +lt8912_bridge_detect(struct drm_bridge *bridge) +{ + struct lt8912 *lt = bridge_to_lt8912(bridge); + + if (lt->hdmi_port->ops & drm_bridge_op_detect) + return drm_bridge_detect(lt->hdmi_port); + + return lt8912_check_cable_status(lt); +} + +static struct edid *lt8912_bridge_get_edid(struct drm_bridge *bridge, + struct drm_connector *connector) +{ + struct lt8912 *lt = bridge_to_lt8912(bridge); + + /* + * edid must be read through the ddc bus but it must be + * given to the hdmi connector node. + */ + if (lt->hdmi_port->ops & drm_bridge_op_edid) + return drm_bridge_get_edid(lt->hdmi_port, connector); + + dev_warn(lt->dev, "the connected bridge does not supports drm_bridge_op_edid "); + return null; +} + +static const struct drm_bridge_funcs lt8912_bridge_funcs = { + .attach = lt8912_bridge_attach, + .detach = lt8912_bridge_detach, + .mode_set = lt8912_bridge_mode_set, + .enable = lt8912_bridge_enable, + .detect = lt8912_bridge_detect, + .get_edid = lt8912_bridge_get_edid, +}; + +static int lt8912_parse_dt(struct lt8912 *lt) +{ + struct gpio_desc *gp_reset; + struct device *dev = lt->dev; + int ret = 0; + struct device_node *port_node; + struct device_node *endpoint; + + gp_reset = devm_gpiod_get_optional(dev, "reset", gpiod_out_high); + if (is_err(gp_reset)) { + ret = ptr_err(gp_reset); + if (ret != -eprobe_defer) + dev_err(dev, "failed to get reset gpio: %d ", ret); + return ret; + } + lt->gp_reset = gp_reset; + + endpoint = of_graph_get_endpoint_by_regs(dev->of_node, 0, -1); + if (is_err(endpoint)) { + ret = ptr_err(endpoint); + goto end; + } + + lt->data_lanes = of_property_count_u32_elems(endpoint, "data-lanes"); + of_node_put(endpoint); + + lt->host_node = of_graph_get_remote_node(dev->of_node, 0, -1); + if (!lt->host_node) { + dev_err(lt->dev, "%s: failed to get remote port ", __func__); + ret = -enodev; + goto end; + } + + port_node = of_graph_get_remote_node(dev->of_node, 1, -1); + if (!port_node) { + dev_err(lt->dev, "%s: failed to get connector port ", __func__); + ret = -enodev; + goto err_free_host_node; + } + + lt->hdmi_port = of_drm_find_bridge(port_node); + if (is_err(lt->hdmi_port)) { + dev_err(lt->dev, "%s: failed to get hdmi port ", __func__); + ret = ptr_err(lt->hdmi_port); + of_node_put(lt->host_node); + goto end; + } + + if (!of_device_is_compatible(port_node, "hdmi-connector")) { + dev_err(lt->dev, "%s: failed to get hdmi port ", __func__); + ret = -einval; + } + + of_node_put(port_node); + +end: + return ret; + +err_free_host_node: + of_node_put(lt->host_node); + return ret; +} + +static int lt8912_put_dt(struct lt8912 *lt) +{ + of_node_put(lt->host_node); + return 0; +} + +static int lt8912_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + static struct lt8912 *lt; + int ret = 0; + struct device *dev = &client->dev; + + lt = devm_kzalloc(dev, sizeof(struct lt8912), gfp_kernel); + if (!lt) + return -enomem; + + lt->dev = dev; + lt->i2c_client[0] = client; + + ret = lt8912_parse_dt(lt); + if (ret) + goto err_dt_parse; + + ret = lt8912_init_i2c(lt, client); + if (ret) + goto err_i2c; + + i2c_set_clientdata(client, lt); + + lt->bridge.funcs = <8912_bridge_funcs; + lt->bridge.of_node = dev->of_node; + lt->bridge.ops = (drm_bridge_op_edid | + drm_bridge_op_detect); + + drm_bridge_add(<->bridge); + + return 0; + +err_i2c: + lt8912_put_dt(lt); +err_dt_parse: + return ret; +} + +static int lt8912_remove(struct i2c_client *client) +{ + struct lt8912 *lt = i2c_get_clientdata(client); + + lt8912_bridge_detach(<->bridge); + drm_bridge_remove(<->bridge); + lt8912_free_i2c(lt); + lt8912_put_dt(lt); + return 0; +} + +static const struct of_device_id lt8912_dt_match[] = { + {.compatible = "lontium,lt8912b"}, + {} +}; +module_device_table(of, lt8912_dt_match); + +static const struct i2c_device_id lt8912_id[] = { + {"lt8912", 0}, + {}, +}; +module_device_table(i2c, lt8912_id); + +static struct i2c_driver lt8912_i2c_driver = { + .driver = { + .name = "lt8912", + .of_match_table = lt8912_dt_match, + .owner = this_module, + }, + .probe = lt8912_probe, + .remove = lt8912_remove, + .id_table = lt8912_id, +}; +module_i2c_driver(lt8912_i2c_driver); + +module_author("adrien grassein <adrien.grassein@gmail.com>"); +module_description("lt8912 drm driver"); +module_license("gpl v2");
|
Graphics
|
30e2ae943c260036ea494b601343f6ed5ce7bc60
|
adrien grassein robert foss robert foss linaro org
|
drivers
|
gpu
|
bridge, drm
|
drm/ttm: add debugfs directory v2
|
as far as i can tell the buffer_count was never used by an userspace application.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add debugfs directory
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['ttm ']
|
['h', 'c']
| 3
| 11
| 47
|
--- diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c -static void ttm_bo_global_kobj_release(struct kobject *kobj); - -static struct attribute ttm_bo_count = { - .name = "bo_count", - .mode = s_irugo -}; - -static ssize_t ttm_bo_global_show(struct kobject *kobj, - struct attribute *attr, - char *buffer) -{ - struct ttm_bo_global *glob = - container_of(kobj, struct ttm_bo_global, kobj); - - return snprintf(buffer, page_size, "%d ", - atomic_read(&glob->bo_count)); -} - -static struct attribute *ttm_bo_global_attrs[] = { - &ttm_bo_count, - null -}; - -static const struct sysfs_ops ttm_bo_global_ops = { - .show = &ttm_bo_global_show -}; - -static struct kobj_type ttm_bo_glob_kobj_type = { - .release = &ttm_bo_global_kobj_release, - .sysfs_ops = &ttm_bo_global_ops, - .default_attrs = ttm_bo_global_attrs -}; - -static void ttm_bo_global_kobj_release(struct kobject *kobj) -{ - struct ttm_bo_global *glob = - container_of(kobj, struct ttm_bo_global, kobj); - - __free_page(glob->dummy_read_page); -} - + __free_page(glob->dummy_read_page); - ret = kobject_init_and_add( - &glob->kobj, &ttm_bo_glob_kobj_type, ttm_get_kobj(), "buffer_objects"); - if (unlikely(ret != 0)) - kobject_put(&glob->kobj); + debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root, + &glob->bo_count); diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c --- a/drivers/gpu/drm/ttm/ttm_module.c +++ b/drivers/gpu/drm/ttm/ttm_module.c +#include <linux/debugfs.h> +struct dentry *ttm_debugfs_root; + ttm_debugfs_root = debugfs_create_dir("ttm", null); + debugfs_remove(ttm_debugfs_root); diff --git a/drivers/gpu/drm/ttm/ttm_module.h b/drivers/gpu/drm/ttm/ttm_module.h --- a/drivers/gpu/drm/ttm/ttm_module.h +++ b/drivers/gpu/drm/ttm/ttm_module.h -#include <linux/kernel.h> +#define ttm_pfx "[ttm] " + +struct dentry; -#define ttm_pfx "[ttm] " +extern struct dentry *ttm_debugfs_root;
|
Graphics
|
3763d635deaa755c7849074d144c74086565591e
|
christian k nig
|
drivers
|
gpu
|
drm, ttm
|
drm/ttm: add debugfs entry to test pool shrinker v2
|
useful for testing.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add debugfs directory
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['ttm ']
|
['c']
| 1
| 35
| 18
|
--- diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c +#include <linux/sched/mm.h> +/* as long as pages are available make sure to release at least one */ +static unsigned long ttm_pool_shrinker_scan(struct shrinker *shrink, + struct shrink_control *sc) +{ + unsigned long num_freed = 0; + + do + num_freed += ttm_pool_shrink(); + while (!num_freed && atomic_long_read(&allocated_pages)); + + return num_freed; +} + +/* return the number of pages available or shrink_empty if we have none */ +static unsigned long ttm_pool_shrinker_count(struct shrinker *shrink, + struct shrink_control *sc) +{ + unsigned long num_pages = atomic_long_read(&allocated_pages); + + return num_pages ? num_pages : shrink_empty; +} + -#endif - -/* as long as pages are available make sure to release at least one */ -static unsigned long ttm_pool_shrinker_scan(struct shrinker *shrink, - struct shrink_control *sc) +/* test the shrinker functions and dump the result */ +static int ttm_pool_debugfs_shrink_show(struct seq_file *m, void *data) - unsigned long num_freed = 0; + struct shrink_control sc = { .gfp_mask = gfp_nofs }; - do - num_freed += ttm_pool_shrink(); - while (!num_freed && atomic_long_read(&allocated_pages)); + fs_reclaim_acquire(gfp_kernel); + seq_printf(m, "%lu/%lu ", ttm_pool_shrinker_count(&mm_shrinker, &sc), + ttm_pool_shrinker_scan(&mm_shrinker, &sc)); + fs_reclaim_release(gfp_kernel); - return num_freed; + return 0; +define_show_attribute(ttm_pool_debugfs_shrink); -/* return the number of pages available or shrink_empty if we have none */ -static unsigned long ttm_pool_shrinker_count(struct shrinker *shrink, - struct shrink_control *sc) -{ - unsigned long num_pages = atomic_long_read(&allocated_pages); - - return num_pages ? num_pages : shrink_empty; -} +#endif + debugfs_create_file("page_pool_shrink", 0400, ttm_debugfs_root, null, + &ttm_pool_debugfs_shrink_fops);
|
Graphics
|
568517686f50a13f0995d341222405c5ad50d955
|
christian k nig
|
drivers
|
gpu
|
drm, ttm
|
drm/ttm: add a debugfs file for the global page pools
|
instead of printing this on the per device pool.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add debugfs directory
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['ttm ']
|
['c']
| 1
| 50
| 20
|
--- diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c +#include "ttm_module.h" + +/* print a nice header for the order */ +static void ttm_pool_debugfs_header(struct seq_file *m) +{ + unsigned int i; + + seq_puts(m, " "); + for (i = 0; i < max_order; ++i) + seq_printf(m, " ---%2u---", i); + seq_puts(m, " "); +} + +/* dump the total amount of allocated pages */ +static void ttm_pool_debugfs_footer(struct seq_file *m) +{ + seq_printf(m, " total : %8lu of %8lu ", + atomic_long_read(&allocated_pages), page_pool_size); +} + +/* dump the information for the global pools */ +static int ttm_pool_debugfs_globals_show(struct seq_file *m, void *data) +{ + ttm_pool_debugfs_header(m); + + spin_lock(&shrinker_lock); + seq_puts(m, "wc :"); + ttm_pool_debugfs_orders(global_write_combined, m); + seq_puts(m, "uc :"); + ttm_pool_debugfs_orders(global_uncached, m); + seq_puts(m, "wc 32 :"); + ttm_pool_debugfs_orders(global_dma32_write_combined, m); + seq_puts(m, "uc 32 :"); + ttm_pool_debugfs_orders(global_dma32_uncached, m); + spin_unlock(&shrinker_lock); + + ttm_pool_debugfs_footer(m); + + return 0; +} +define_show_attribute(ttm_pool_debugfs_globals); + - spin_lock(&shrinker_lock); - - seq_puts(m, " "); - for (i = 0; i < max_order; ++i) - seq_printf(m, " ---%2u---", i); - seq_puts(m, " "); - - seq_puts(m, "wc :"); - ttm_pool_debugfs_orders(global_write_combined, m); - seq_puts(m, "uc :"); - ttm_pool_debugfs_orders(global_uncached, m); - - seq_puts(m, "wc 32 :"); - ttm_pool_debugfs_orders(global_dma32_write_combined, m); - seq_puts(m, "uc 32 :"); - ttm_pool_debugfs_orders(global_dma32_uncached, m); + ttm_pool_debugfs_header(m); + spin_lock(&shrinker_lock); - - seq_printf(m, " total : %8lu of %8lu ", - atomic_long_read(&allocated_pages), page_pool_size); - + ttm_pool_debugfs_footer(m); +#ifdef config_debug_fs + debugfs_create_file("page_pool", 0444, ttm_debugfs_root, null, + &ttm_pool_debugfs_globals_fops); +#endif +
|
Graphics
|
ba051901d10ff6d6636f2fbe3fe01fb2b5eb48ce
|
christian k nig daniel vetter daniel vetter ffwll ch
|
drivers
|
gpu
|
drm, ttm
|
drm/ttm: drop sysfs directory
|
not used any more.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
remove sysfs directory
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['ttm ']
|
['h', 'c']
| 2
| 0
| 52
|
--- diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c --- a/drivers/gpu/drm/ttm/ttm_module.c +++ b/drivers/gpu/drm/ttm/ttm_module.c -static declare_wait_queue_head(exit_q); -static atomic_t device_released; -static struct device_type ttm_drm_class_type = { - .name = "ttm", - /** - * add pm ops here. - */ -}; - -static void ttm_drm_class_device_release(struct device *dev) -{ - atomic_set(&device_released, 1); - wake_up_all(&exit_q); -} - -static struct device ttm_drm_class_device = { - .type = &ttm_drm_class_type, - .release = &ttm_drm_class_device_release -}; - -struct kobject *ttm_get_kobj(void) -{ - struct kobject *kobj = &ttm_drm_class_device.kobj; - bug_on(kobj == null); - return kobj; -} - - int ret; - - ret = dev_set_name(&ttm_drm_class_device, "ttm"); - if (unlikely(ret != 0)) - return ret; - - atomic_set(&device_released, 0); - ret = drm_class_device_register(&ttm_drm_class_device); - if (unlikely(ret != 0)) - goto out_no_dev_reg; - -out_no_dev_reg: - atomic_set(&device_released, 1); - wake_up_all(&exit_q); - return ret; - drm_class_device_unregister(&ttm_drm_class_device); - - /** - * refuse to unload until the ttm device is released. - * not sure this is 100% needed. - */ - - wait_event(exit_q, atomic_read(&device_released) == 1); diff --git a/drivers/gpu/drm/ttm/ttm_module.h b/drivers/gpu/drm/ttm/ttm_module.h --- a/drivers/gpu/drm/ttm/ttm_module.h +++ b/drivers/gpu/drm/ttm/ttm_module.h -struct kobject; -extern struct kobject *ttm_get_kobj(void);
|
Graphics
|
ed89fff973828d3f36f4577d8ea8d5a48794fca5
|
christian k nig daniel vetter daniel vetter ffwll ch
|
drivers
|
gpu
|
drm, ttm
|
drm/msm/disp/dpu1: add support for display for sc7280 target
|
add required display hw catalog changes for sc7280 target.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add display support for sc7280 target
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['msm ']
|
['h', 'c']
| 5
| 171
| 18
|
--- diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +#define ctl_sc7280_mask \ + (bit(dpu_ctl_active_cfg) | bit(dpu_ctl_fetch_active)) + +#define intf_sc7280_mask intf_sc7180_mask | bit(dpu_data_hctl_en) + +static const struct dpu_caps sc7280_dpu_caps = { + .max_mixer_width = default_dpu_output_line_width, + .max_mixer_blendstages = 0x7, + .qseed_type = dpu_sspp_scaler_qseed4, + .smart_dma_rev = dpu_sspp_smart_dma_v2, + .ubwc_version = dpu_hw_ubwc_ver_30, + .has_dim_layer = true, + .has_idle_pc = true, + .max_linewidth = 2400, + .pixel_ram_size = default_pixel_ram_size, +}; + +static const struct dpu_mdp_cfg sc7280_mdp[] = { + { + .name = "top_0", .id = mdp_top, + .base = 0x0, .len = 0x2014, + .highest_bank_bit = 0x1, + .clk_ctrls[dpu_clk_ctrl_vig0] = { + .reg_off = 0x2ac, .bit_off = 0}, + .clk_ctrls[dpu_clk_ctrl_dma0] = { + .reg_off = 0x2ac, .bit_off = 8}, + .clk_ctrls[dpu_clk_ctrl_cursor0] = { + .reg_off = 0x2b4, .bit_off = 8}, + .clk_ctrls[dpu_clk_ctrl_cursor1] = { + .reg_off = 0x2c4, .bit_off = 8}, + }, +}; + +static const struct dpu_ctl_cfg sc7280_ctl[] = { + { + .name = "ctl_0", .id = ctl_0, + .base = 0x15000, .len = 0x1e8, + .features = ctl_sc7280_mask + }, + { + .name = "ctl_1", .id = ctl_1, + .base = 0x16000, .len = 0x1e8, + .features = ctl_sc7280_mask + }, + { + .name = "ctl_2", .id = ctl_2, + .base = 0x17000, .len = 0x1e8, + .features = ctl_sc7280_mask + }, + { + .name = "ctl_3", .id = ctl_3, + .base = 0x18000, .len = 0x1e8, + .features = ctl_sc7280_mask + }, +}; + +static const struct dpu_sspp_cfg sc7280_sspp[] = { + sspp_blk("sspp_0", sspp_vig0, 0x4000, vig_sc7180_mask, + sc7180_vig_sblk_0, 0, sspp_type_vig, dpu_clk_ctrl_vig0), + sspp_blk("sspp_8", sspp_dma0, 0x24000, dma_sdm845_mask, + sdm845_dma_sblk_0, 1, sspp_type_dma, dpu_clk_ctrl_dma0), + sspp_blk("sspp_9", sspp_dma1, 0x26000, dma_cursor_sdm845_mask, + sdm845_dma_sblk_1, 5, sspp_type_dma, dpu_clk_ctrl_cursor0), + sspp_blk("sspp_10", sspp_dma2, 0x28000, dma_cursor_sdm845_mask, + sdm845_dma_sblk_2, 9, sspp_type_dma, dpu_clk_ctrl_cursor1), +}; + +static const struct dpu_lm_cfg sc7280_lm[] = { + lm_blk("lm_0", lm_0, 0x44000, mixer_sc7180_mask, + &sc7180_lm_sblk, pingpong_0, 0, 0), + lm_blk("lm_2", lm_2, 0x46000, mixer_sc7180_mask, + &sc7180_lm_sblk, pingpong_2, lm_3, 0), + lm_blk("lm_3", lm_3, 0x47000, mixer_sc7180_mask, + &sc7180_lm_sblk, pingpong_3, lm_2, 0), +}; + -#define pp_blk_te(_name, _id, _base, _merge_3d) \ +static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = { + .dither = {.id = dpu_pingpong_dither, .base = 0xe0, + .len = 0x20, .version = 0x20000}, +}; + +#define pp_blk_te(_name, _id, _base, _merge_3d, _sblk) \ - .sblk = &sdm845_pp_sblk_te \ + .sblk = &_sblk \ -#define pp_blk(_name, _id, _base, _merge_3d) \ +#define pp_blk(_name, _id, _base, _merge_3d, _sblk) \ - .sblk = &sdm845_pp_sblk \ + .sblk = &_sblk \ - pp_blk_te("pingpong_0", pingpong_0, 0x70000, 0), - pp_blk_te("pingpong_1", pingpong_1, 0x70800, 0), - pp_blk("pingpong_2", pingpong_2, 0x71000, 0), - pp_blk("pingpong_3", pingpong_3, 0x71800, 0), + pp_blk_te("pingpong_0", pingpong_0, 0x70000, 0, sdm845_pp_sblk_te), + pp_blk_te("pingpong_1", pingpong_1, 0x70800, 0, sdm845_pp_sblk_te), + pp_blk("pingpong_2", pingpong_2, 0x71000, 0, sdm845_pp_sblk), + pp_blk("pingpong_3", pingpong_3, 0x71800, 0, sdm845_pp_sblk), - pp_blk_te("pingpong_0", pingpong_0, 0x70000, 0), - pp_blk_te("pingpong_1", pingpong_1, 0x70800, 0), + pp_blk_te("pingpong_0", pingpong_0, 0x70000, 0, sdm845_pp_sblk_te), + pp_blk_te("pingpong_1", pingpong_1, 0x70800, 0, sdm845_pp_sblk_te), - pp_blk_te("pingpong_0", pingpong_0, 0x70000, merge_3d_0), - pp_blk_te("pingpong_1", pingpong_1, 0x70800, merge_3d_0), - pp_blk("pingpong_2", pingpong_2, 0x71000, merge_3d_1), - pp_blk("pingpong_3", pingpong_3, 0x71800, merge_3d_1), - pp_blk("pingpong_4", pingpong_4, 0x72000, merge_3d_2), - pp_blk("pingpong_5", pingpong_5, 0x72800, merge_3d_2), + pp_blk_te("pingpong_0", pingpong_0, 0x70000, merge_3d_0, sdm845_pp_sblk_te), + pp_blk_te("pingpong_1", pingpong_1, 0x70800, merge_3d_0, sdm845_pp_sblk_te), + pp_blk("pingpong_2", pingpong_2, 0x71000, merge_3d_1, sdm845_pp_sblk), + pp_blk("pingpong_3", pingpong_3, 0x71800, merge_3d_1, sdm845_pp_sblk), + pp_blk("pingpong_4", pingpong_4, 0x72000, merge_3d_2, sdm845_pp_sblk), + pp_blk("pingpong_5", pingpong_5, 0x72800, merge_3d_2, sdm845_pp_sblk), +static const struct dpu_pingpong_cfg sc7280_pp[] = { + pp_blk("pingpong_0", pingpong_0, 0x59000, 0, sc7280_pp_sblk), + pp_blk("pingpong_1", pingpong_1, 0x6a000, 0, sc7280_pp_sblk), + pp_blk("pingpong_2", pingpong_2, 0x6b000, 0, sc7280_pp_sblk), + pp_blk("pingpong_3", pingpong_3, 0x6c000, 0, sc7280_pp_sblk), +}; +static const struct dpu_intf_cfg sc7280_intf[] = { + intf_blk("intf_0", intf_0, 0x34000, intf_dp, 0, 24, intf_sc7280_mask), + intf_blk("intf_1", intf_1, 0x35000, intf_dsi, 0, 24, intf_sc7280_mask), + intf_blk("intf_5", intf_5, 0x39000, intf_edp, 0, 24, intf_sc7280_mask), +}; + +static const struct dpu_perf_cfg sc7280_perf_data = { + .max_bw_low = 4700000, + .max_bw_high = 8800000, + .min_core_ib = 2500000, + .min_llcc_ib = 0, + .min_dram_ib = 1600000, + .min_prefill_lines = 24, + .danger_lut_tbl = {0xffff, 0xffff, 0x0}, + .qos_lut_tbl = { + {.nentry = array_size(sc7180_qos_macrotile), + .entries = sc7180_qos_macrotile + }, + {.nentry = array_size(sc7180_qos_macrotile), + .entries = sc7180_qos_macrotile + }, + {.nentry = array_size(sc7180_qos_nrt), + .entries = sc7180_qos_nrt + }, + }, + .cdp_cfg = { + {.rd_enable = 1, .wr_enable = 1}, + {.rd_enable = 1, .wr_enable = 0} + }, + .clk_inefficiency_factor = 105, + .bw_inefficiency_factor = 120, +}; + +static void sc7280_cfg_init(struct dpu_mdss_cfg *dpu_cfg) +{ + *dpu_cfg = (struct dpu_mdss_cfg){ + .caps = &sc7280_dpu_caps, + .mdp_count = array_size(sc7280_mdp), + .mdp = sc7280_mdp, + .ctl_count = array_size(sc7280_ctl), + .ctl = sc7280_ctl, + .sspp_count = array_size(sc7280_sspp), + .sspp = sc7280_sspp, + .mixer_count = array_size(sc7280_lm), + .mixer = sc7280_lm, + .pingpong_count = array_size(sc7280_pp), + .pingpong = sc7280_pp, + .intf_count = array_size(sc7280_intf), + .intf = sc7280_intf, + .vbif_count = array_size(sdm845_vbif), + .vbif = sdm845_vbif, + .perf = sc7280_perf_data, + .mdss_irqs = 0x1c07, + }; +} + + { .hw_rev = dpu_hw_ver_720, .cfg_init = sc7280_cfg_init}, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h - +#define dpu_hw_ver_720 dpu_hw_ver(7, 2, 0) /* sc7280 */ - +#define is_sc7280_target(rev) is_dpu_major_minor_same((rev), dpu_hw_ver_720) + dpu_ctl_fetch_active, + * @dpu_data_hctl_en allows data to be transferred at different rate + than video timing + dpu_data_hctl_en, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c + { .compatible = "qcom,sc7280-dpu", }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c + case dpu_hw_ver_720: + writel_relaxed(0x101e, dpu_mdss->mmio + ubwc_static); + break; diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c + { .compatible = "qcom,sc7280-mdss", .data = (void *)kms_dpu },
|
Graphics
|
591e34a091d17df7afa3b455a7cfacf946a464d4
|
krishna manikandan
|
drivers
|
gpu
|
disp, dpu1, drm, msm
|
drm/msm/disp/dpu1: add intf offsets for sc7280 target
|
interface block offsets are different for sc7280 family when compared to existing targets. these offset values are used to access the interface irq registers. this change adds proper interface offsets for sc7280 target.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add display support for sc7280 target
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['msm ']
|
['c']
| 1
| 19
| 1
|
--- diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c +#define mdp_intf_0_off_rev_7xxx 0x34000 +#define mdp_intf_1_off_rev_7xxx 0x35000 +#define mdp_intf_5_off_rev_7xxx 0x39000 - } + }, + { + mdp_intf_0_off_rev_7xxx+intf_intr_clear, + mdp_intf_0_off_rev_7xxx+intf_intr_en, + mdp_intf_0_off_rev_7xxx+intf_intr_status + }, + { + mdp_intf_1_off_rev_7xxx+intf_intr_clear, + mdp_intf_1_off_rev_7xxx+intf_intr_en, + mdp_intf_1_off_rev_7xxx+intf_intr_status + }, + { + mdp_intf_5_off_rev_7xxx+intf_intr_clear, + mdp_intf_5_off_rev_7xxx+intf_intr_en, + mdp_intf_5_off_rev_7xxx+intf_intr_status + },
|
Graphics
|
ed6154a136e40816301dc8228c46ea30f0f7bc76
|
krishna manikandan
|
drivers
|
gpu
|
disp, dpu1, drm, msm
|
drm/msm/disp/dpu1: add support to program fetch active in ctl path
|
a new register called ctl_fetch_active is introduced in sc7280 family which is used to inform the hw about the pipes which are active in the current ctl path. this change adds support to program this register based on the active pipes in the current composition.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add display support for sc7280 target
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['msm ']
|
['h', 'c']
| 3
| 36
| 1
|
--- diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c + declare_bitmap(fetch_active, sspp_max); + memset(fetch_active, 0, sizeof(fetch_active)); - + set_bit(dpu_plane_pipe(plane), fetch_active); + if (ctl->ops.set_active_pipes) + ctl->ops.set_active_pipes(ctl, fetch_active); + diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +#define ctl_fetch_pipe_active 0x0fc +#define ctl_invalid_bit 0xffff + +static const u32 fetch_tbl[sspp_max] = {ctl_invalid_bit, 16, 17, 18, 19, + ctl_invalid_bit, ctl_invalid_bit, ctl_invalid_bit, ctl_invalid_bit, 0, + 1, 2, 3, ctl_invalid_bit, ctl_invalid_bit}; + + dpu_reg_write(c, ctl_fetch_pipe_active, 0); +static void dpu_hw_ctl_set_fetch_pipe_active(struct dpu_hw_ctl *ctx, + unsigned long *fetch_active) +{ + int i; + u32 val = 0; + + if (fetch_active) { + for (i = 0; i < sspp_max; i++) { + if (test_bit(i, fetch_active) && + fetch_tbl[i] != ctl_invalid_bit) + val |= bit(fetch_tbl[i]); + } + } + + dpu_reg_write(&ctx->hw, ctl_fetch_pipe_active, val); +} + + if (cap & bit(dpu_ctl_fetch_active)) + ops->set_active_pipes = dpu_hw_ctl_set_fetch_pipe_active; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h + + void (*set_active_pipes)(struct dpu_hw_ctl *ctx, + unsigned long *fetch_active);
|
Graphics
|
b3652e87c03c70d8e6e04a17afa475f6855169d1
|
krishna manikandan
|
drivers
|
gpu
|
disp, dpu1, drm, msm
|
drm/msm/disp/dpu1: enable data_hctl_en for sc7280 target
|
the reset value of intf_config2 register is changed for sc7280 family. changes are added to program this register correctly based on the target.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add display support for sc7280 target
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['msm ']
|
['c']
| 1
| 10
| 1
|
--- diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +#define intf_config2 0x060 +#define intf_display_data_hctl 0x064 - u32 intf_cfg; + u32 intf_cfg, intf_cfg2 = 0, display_data_hctl = 0; + if (ctx->cap->features & bit(dpu_data_hctl_en)) { + intf_cfg2 |= bit(4); + display_data_hctl = display_hctl; + dpu_reg_write(c, intf_config2, intf_cfg2); + dpu_reg_write(c, intf_display_data_hctl, display_data_hctl); + } +
|
Graphics
|
7e6ee55320f09cef73163ac6a2ffaca2aa17334f
|
krishna manikandan
|
drivers
|
gpu
|
disp, dpu1, drm, msm
|
drm/msm: add $debugfs/gem stats on resident objects
|
currently nearly everything, other than newly allocated objects which are not yet backed by pages, is pinned and resident in ram. but it will be nice to have some stats on what is unpinned once that is supported.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add $debugfs/gem stats on resident objects
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['msm ']
|
['h', 'c']
| 2
| 9
| 2
|
--- diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c + if (msm_obj->pages) { + stats->resident.count++; + stats->resident.size += obj->size; + } + + seq_printf(m, "resident: %4d objects, %9zu bytes ", + stats.resident.count, stats.resident.size); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h -#ifdef config_debug_fs +#ifdef config_debug_fs - } all, active, purgeable, purged; + } all, active, resident, purgeable, purged;
|
Graphics
|
f48f356330f7124671b28ddc93a28c492ef05b9f
|
rob clark
|
drivers
|
gpu
|
drm, msm
|
drm/msm: add param for userspace to query suspend count
|
performance counts, and always_on counters used for capturing gpu timestamps, lose their state across suspend/resume cycles. userspace tooling for performance monitoring needs to be aware of this. for example, after a suspend userspace needs to recalibrate it's offset between cpu and gpu time.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add param for userspace to query suspend count
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['msm ']
|
['h', 'c']
| 5
| 9
| 0
|
--- diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c + case msm_param_suspends: + *value = gpu->suspend_count; + return 0; diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c + * - 1.7.0 - add msm_param_suspends to access suspend count diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c + gpu->suspend_count++; + diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h + uint32_t suspend_count; + diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h +#define msm_param_suspends 0x0a
|
Graphics
|
3ab1c5cc3939b3322ebd27a44b8ee6a16eccc9f5
|
rob clark jordan crouse jordan cosmicpenguin net
|
drivers
|
gpu
|
adreno, drm, msm
|
drm/msm: improved debugfs gem stats
|
the last patch lost the breakdown of active vs inactive gem objects in $debugfs/gem. but we can add some better stats to summarize not just active vs inactive, but also purgable/purged to make up for that.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
improved debugfs gem stats
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['msm ']
|
['h', 'c']
| 3
| 36
| 9
|
--- diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c + struct msm_gem_stats stats = {}; - msm_gem_describe(fb->obj[i], m); + msm_gem_describe(fb->obj[i], m, &stats); diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c -void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m) +void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, + struct msm_gem_stats *stats) + stats->all.count++; + stats->all.size += obj->size; + + if (is_active(msm_obj)) { + stats->active.count++; + stats->active.size += obj->size; + } + + stats->purged.count++; + stats->purged.size += obj->size; + stats->purgable.count++; + stats->purgable.size += obj->size; + struct msm_gem_stats stats = {}; - int count = 0; - size_t size = 0; - msm_gem_describe(obj, m); - count++; - size += obj->size; + msm_gem_describe(obj, m, &stats); - seq_printf(m, "total %d objects, %zu bytes ", count, size); + seq_printf(m, "total: %4d objects, %9zu bytes ", + stats.all.count, stats.all.size); + seq_printf(m, "active: %4d objects, %9zu bytes ", + stats.active.count, stats.active.size); + seq_printf(m, "purgable: %4d objects, %9zu bytes ", + stats.purgable.count, stats.purgable.size); + seq_printf(m, "purged: %4d objects, %9zu bytes ", + stats.purged.count, stats.purged.size); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h -void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m); + +struct msm_gem_stats { + struct { + unsigned count; + size_t size; + } all, active, purgable, purged; +}; + +void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, + struct msm_gem_stats *stats);
|
Graphics
|
528107c8e664a933b397a825f6e76c6d7dfa383b
|
rob clark douglas anderson dianders chromium org douglas anderson dianders chromium org
|
drivers
|
gpu
|
drm, msm
|
drm/msm: support evicting gem objects to swap
|
now that tracking is wired up for potentially evictable gem objects, wire up shrinker and the remaining gem bits for unpinning backing pages of inactive objects.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
support evicting gem objects to swap
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['msm ']
|
['h', 'c']
| 3
| 75
| 1
|
--- diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c +/** + * unpin the backing pages and make them available to be swapped out. + */ +void msm_gem_evict(struct drm_gem_object *obj) +{ + struct drm_device *dev = obj->dev; + struct msm_gem_object *msm_obj = to_msm_bo(obj); + + gem_warn_on(!msm_gem_is_locked(obj)); + gem_warn_on(is_unevictable(msm_obj)); + gem_warn_on(!msm_obj->evictable); + gem_warn_on(msm_obj->active_count); + + /* get rid of any iommu mapping(s): */ + put_iova_spaces(obj, false); + + drm_vma_node_unmap(&obj->vma_node, dev->anon_inode->i_mapping); + + put_pages(obj); + + update_inactive(msm_obj); +} + diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c +/* default disabled for now until it has some more testing on the different + * iommu combinations that can be paired with the driver: + */ +bool enable_eviction = false; +module_parm_desc(enable_eviction, "enable swappable gem buffers"); +module_param(enable_eviction, bool, 0600); + +static bool can_swap(void) +{ + return enable_eviction && get_nr_swap_pages() > 0; +} + - return priv->shrinkable_count; + unsigned count = priv->shrinkable_count; + + if (can_swap()) + count += priv->evictable_count; + + return count; +static bool +evict(struct msm_gem_object *msm_obj) +{ + if (is_unevictable(msm_obj)) + return false; + + msm_gem_evict(&msm_obj->base); + + return true; +} + + if (can_swap() && freed < sc->nr_to_scan) { + int evicted = scan(priv, sc->nr_to_scan - freed, + &priv->inactive_willneed, evict); + + if (evicted > 0) + trace_msm_gem_evict(evicted << page_shift); + + freed += evicted; + } + diff --git a/drivers/gpu/drm/msm/msm_gpu_trace.h b/drivers/gpu/drm/msm/msm_gpu_trace.h --- a/drivers/gpu/drm/msm/msm_gpu_trace.h +++ b/drivers/gpu/drm/msm/msm_gpu_trace.h +trace_event(msm_gem_evict, + tp_proto(u32 bytes), + tp_args(bytes), + tp_struct__entry( + __field(u32, bytes) + ), + tp_fast_assign( + __entry->bytes = bytes; + ), + tp_printk("evicting %u bytes", __entry->bytes) +); + +
|
Graphics
|
63f17ef834284d9a1fa72b548a86fee1ccd01a45
|
rob clark
|
drivers
|
gpu
|
drm, msm
|
drm/gma500: remove medfield support
|
medfield is an outdated mobile platform with apparently no users left. remove it from gma500.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
remove medfield support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['gma500 ']
|
['h', 'kconfig', 'c', 'makefile']
| 23
| 2
| 5,835
|
--- diff --git a/drivers/gpu/drm/gma500/kconfig b/drivers/gpu/drm/gma500/kconfig --- a/drivers/gpu/drm/gma500/kconfig +++ b/drivers/gpu/drm/gma500/kconfig - -config drm_medfield - bool "intel medfield support (experimental)" - depends on drm_gma500 && x86_intel_mid - help - say yes to include support for the intel medfield platform. - diff --git a/drivers/gpu/drm/gma500/makefile b/drivers/gpu/drm/gma500/makefile --- a/drivers/gpu/drm/gma500/makefile +++ b/drivers/gpu/drm/gma500/makefile -gma500_gfx-$(config_drm_medfield) += mdfld_device.o \ - mdfld_output.o \ - mdfld_intel_display.o \ - mdfld_dsi_output.o \ - mdfld_dsi_dpi.o \ - mdfld_dsi_pkg_sender.o \ - mdfld_tpo_vid.o \ - mdfld_tmd_vid.o \ - tc35876x-dsi-lvds.o - diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c - * - * fixme: - * we should probably make this generic and share it with medfield - struct mdfld_hdmi_i2c *i2c_bus; diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c --- a/drivers/gpu/drm/gma500/mdfld_device.c +++ /dev/null -// spdx-license-identifier: gpl-2.0-only -/************************************************************************** - * copyright (c) 2011, intel corporation. - * all rights reserved. - * - **************************************************************************/ - -#include <linux/delay.h> -#include <linux/gpio/machine.h> - -#include <asm/intel_scu_ipc.h> - -#include "mdfld_dsi_output.h" -#include "mdfld_output.h" -#include "mid_bios.h" -#include "psb_drv.h" -#include "tc35876x-dsi-lvds.h" - -#ifdef config_backlight_class_device - -#define mrst_blc_max_pwm_reg_freq 0xffff -#define blc_pwm_precision_factor 100 /* 10000000 */ -#define blc_pwm_freq_calc_constant 32 -#define mhz 1000000 -#define brightness_min_level 1 -#define brightness_max_level 100 -#define brightness_mask 0xff -#define blc_polarity_normal 0 -#define blc_polarity_inverse 1 -#define blc_adjustment_max 100 - -#define mdfld_blc_pwm_precision_factor 10 -#define mdfld_blc_max_pwm_reg_freq 0xfffe -#define mdfld_blc_min_pwm_reg_freq 0x2 - -#define mdfld_backlight_pwm_polarity_bit_clear (0xfffe) -#define mdfld_backlight_pwm_ctl_shift (16) - -static struct backlight_device *mdfld_backlight_device; - -int mdfld_set_brightness(struct backlight_device *bd) -{ - struct drm_device *dev = - (struct drm_device *)bl_get_data(mdfld_backlight_device); - struct drm_psb_private *dev_priv = dev->dev_private; - int level = bd->props.brightness; - - drm_debug_driver("backlight level set to %d ", level); - - /* perform value bounds checking */ - if (level < brightness_min_level) - level = brightness_min_level; - - if (gma_power_begin(dev, false)) { - u32 adjusted_level = 0; - - /* - * adjust the backlight level with the percent in - * dev_priv->blc_adj2 - */ - adjusted_level = level * dev_priv->blc_adj2; - adjusted_level = adjusted_level / blc_adjustment_max; - dev_priv->brightness_adjusted = adjusted_level; - - if (mdfld_get_panel_type(dev, 0) == tc35876x) { - if (dev_priv->dpi_panel_on[0] || - dev_priv->dpi_panel_on[2]) - tc35876x_brightness_control(dev, - dev_priv->brightness_adjusted); - } else { - if (dev_priv->dpi_panel_on[0]) - mdfld_dsi_brightness_control(dev, 0, - dev_priv->brightness_adjusted); - } - - if (dev_priv->dpi_panel_on[2]) - mdfld_dsi_brightness_control(dev, 2, - dev_priv->brightness_adjusted); - gma_power_end(dev); - } - - /* cache the brightness for later use */ - dev_priv->brightness = level; - return 0; -} - -static int mdfld_get_brightness(struct backlight_device *bd) -{ - struct drm_device *dev = - (struct drm_device *)bl_get_data(mdfld_backlight_device); - struct drm_psb_private *dev_priv = dev->dev_private; - - drm_debug_driver("brightness = 0x%x ", dev_priv->brightness); - - /* return locally cached var instead of hw read (due to dpst etc.) */ - return dev_priv->brightness; -} - -static const struct backlight_ops mdfld_ops = { - .get_brightness = mdfld_get_brightness, - .update_status = mdfld_set_brightness, -}; - -static int device_backlight_init(struct drm_device *dev) -{ - struct drm_psb_private *dev_priv = (struct drm_psb_private *) - dev->dev_private; - - dev_priv->blc_adj1 = blc_adjustment_max; - dev_priv->blc_adj2 = blc_adjustment_max; - - return 0; -} - -static int mdfld_backlight_init(struct drm_device *dev) -{ - struct backlight_properties props; - int ret = 0; - - memset(&props, 0, sizeof(struct backlight_properties)); - props.max_brightness = brightness_max_level; - props.type = backlight_platform; - mdfld_backlight_device = backlight_device_register("mdfld-bl", - null, (void *)dev, &mdfld_ops, &props); - - if (is_err(mdfld_backlight_device)) - return ptr_err(mdfld_backlight_device); - - ret = device_backlight_init(dev); - if (ret) - return ret; - - mdfld_backlight_device->props.brightness = brightness_max_level; - mdfld_backlight_device->props.max_brightness = brightness_max_level; - backlight_update_status(mdfld_backlight_device); - return 0; -} -#endif - -struct backlight_device *mdfld_get_backlight_device(void) -{ -#ifdef config_backlight_class_device - return mdfld_backlight_device; -#else - return null; -#endif -} - -/* - * mdfld_save_display_registers - * - * description: we are going to suspend so save current display - * register state. - * - * notes: fixme_jliu7 need to add the support for dpi mipi & hdmi audio - */ -static int mdfld_save_display_registers(struct drm_device *dev, int pipenum) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - struct medfield_state *regs = &dev_priv->regs.mdfld; - struct psb_pipe *pipe = &dev_priv->regs.pipe[pipenum]; - const struct psb_offset *map = &dev_priv->regmap[pipenum]; - int i; - u32 *mipi_val; - - /* register */ - u32 mipi_reg = mipi; - - switch (pipenum) { - case 0: - mipi_val = ®s->savemipi; - break; - case 1: - mipi_val = ®s->savemipi; - break; - case 2: - /* register */ - mipi_reg = mipi_c; - /* pointer to values */ - mipi_val = ®s->savemipi_c; - break; - default: - drm_error("%s, invalid pipe number. ", __func__); - return -einval; - } - - /* pipe & plane a info */ - pipe->dpll = psb_rvdc32(map->dpll); - pipe->fp0 = psb_rvdc32(map->fp0); - pipe->conf = psb_rvdc32(map->conf); - pipe->htotal = psb_rvdc32(map->htotal); - pipe->hblank = psb_rvdc32(map->hblank); - pipe->hsync = psb_rvdc32(map->hsync); - pipe->vtotal = psb_rvdc32(map->vtotal); - pipe->vblank = psb_rvdc32(map->vblank); - pipe->vsync = psb_rvdc32(map->vsync); - pipe->src = psb_rvdc32(map->src); - pipe->stride = psb_rvdc32(map->stride); - pipe->linoff = psb_rvdc32(map->linoff); - pipe->tileoff = psb_rvdc32(map->tileoff); - pipe->size = psb_rvdc32(map->size); - pipe->pos = psb_rvdc32(map->pos); - pipe->surf = psb_rvdc32(map->surf); - pipe->cntr = psb_rvdc32(map->cntr); - pipe->status = psb_rvdc32(map->status); - - /*save palette (gamma) */ - for (i = 0; i < 256; i++) - pipe->palette[i] = psb_rvdc32(map->palette + (i << 2)); - - if (pipenum == 1) { - regs->savepfit_control = psb_rvdc32(pfit_control); - regs->savepfit_pgm_ratios = psb_rvdc32(pfit_pgm_ratios); - - regs->savehdmiphymiscctl = psb_rvdc32(hdmiphymiscctl); - regs->savehdmib_control = psb_rvdc32(hdmib_control); - return 0; - } - - *mipi_val = psb_rvdc32(mipi_reg); - return 0; -} - -/* - * mdfld_restore_display_registers - * - * description: we are going to resume so restore display register state. - * - * notes: fixme_jliu7 need to add the support for dpi mipi & hdmi audio - */ -static int mdfld_restore_display_registers(struct drm_device *dev, int pipenum) -{ - /* to get panel out of ulps mode. */ - u32 temp = 0; - u32 device_ready_reg = device_ready_reg; - struct drm_psb_private *dev_priv = dev->dev_private; - struct mdfld_dsi_config *dsi_config = null; - struct medfield_state *regs = &dev_priv->regs.mdfld; - struct psb_pipe *pipe = &dev_priv->regs.pipe[pipenum]; - const struct psb_offset *map = &dev_priv->regmap[pipenum]; - u32 i; - u32 dpll; - u32 timeout = 0; - - /* register */ - u32 mipi_reg = mipi; - - /* values */ - u32 dpll_val = pipe->dpll; - u32 mipi_val = regs->savemipi; - - switch (pipenum) { - case 0: - dpll_val &= ~dpll_vco_enable; - dsi_config = dev_priv->dsi_configs[0]; - break; - case 1: - dpll_val &= ~dpll_vco_enable; - break; - case 2: - mipi_reg = mipi_c; - mipi_val = regs->savemipi_c; - dsi_config = dev_priv->dsi_configs[1]; - break; - default: - drm_error("%s, invalid pipe number. ", __func__); - return -einval; - } - - /*make sure vga plane is off. it initializes to on after reset!*/ - psb_wvdc32(0x80000000, vgacntrl); - - if (pipenum == 1) { - psb_wvdc32(dpll_val & ~dpll_vco_enable, map->dpll); - psb_rvdc32(map->dpll); - - psb_wvdc32(pipe->fp0, map->fp0); - } else { - - dpll = psb_rvdc32(map->dpll); - - if (!(dpll & dpll_vco_enable)) { - - /* when ungating power of dpll, needs to wait 0.5us - before enable the vco */ - if (dpll & mdfld_pwr_gate_en) { - dpll &= ~mdfld_pwr_gate_en; - psb_wvdc32(dpll, map->dpll); - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(500); - } - - psb_wvdc32(pipe->fp0, map->fp0); - psb_wvdc32(dpll_val, map->dpll); - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(500); - - dpll_val |= dpll_vco_enable; - psb_wvdc32(dpll_val, map->dpll); - psb_rvdc32(map->dpll); - - /* wait for dsi pll to lock */ - while (timeout < 20000 && - !(psb_rvdc32(map->conf) & pipeconf_dsipll_lock)) { - udelay(150); - timeout++; - } - - if (timeout == 20000) { - drm_error("%s, can't lock dsipll. ", - __func__); - return -einval; - } - } - } - /* restore mode */ - psb_wvdc32(pipe->htotal, map->htotal); - psb_wvdc32(pipe->hblank, map->hblank); - psb_wvdc32(pipe->hsync, map->hsync); - psb_wvdc32(pipe->vtotal, map->vtotal); - psb_wvdc32(pipe->vblank, map->vblank); - psb_wvdc32(pipe->vsync, map->vsync); - psb_wvdc32(pipe->src, map->src); - psb_wvdc32(pipe->status, map->status); - - /*set up the plane*/ - psb_wvdc32(pipe->stride, map->stride); - psb_wvdc32(pipe->linoff, map->linoff); - psb_wvdc32(pipe->tileoff, map->tileoff); - psb_wvdc32(pipe->size, map->size); - psb_wvdc32(pipe->pos, map->pos); - psb_wvdc32(pipe->surf, map->surf); - - if (pipenum == 1) { - /* restore palette (gamma) */ - /* udelay(50000); */ - for (i = 0; i < 256; i++) - psb_wvdc32(pipe->palette[i], map->palette + (i << 2)); - - psb_wvdc32(regs->savepfit_control, pfit_control); - psb_wvdc32(regs->savepfit_pgm_ratios, pfit_pgm_ratios); - - /*todo: resume hdmi port */ - - /*todo: resume pipe*/ - - /*enable the plane*/ - psb_wvdc32(pipe->cntr & ~display_plane_enable, map->cntr); - - return 0; - } - - /*set up pipe related registers*/ - psb_wvdc32(mipi_val, mipi_reg); - - /*setup mipi adapter + mipi ip registers*/ - if (dsi_config) - mdfld_dsi_controller_init(dsi_config, pipenum); - - if (in_atomic() || in_interrupt()) - mdelay(20); - else - msleep(20); - - /*enable the plane*/ - psb_wvdc32(pipe->cntr, map->cntr); - - if (in_atomic() || in_interrupt()) - mdelay(20); - else - msleep(20); - - /* lp hold release */ - temp = reg_read(mipi_reg); - temp |= lp_output_hold_release; - reg_write(mipi_reg, temp); - mdelay(1); - - - /* set dsi host to exit from utra low power state */ - temp = reg_read(device_ready_reg); - temp &= ~ulps_mask; - temp |= 0x3; - temp |= exit_ulps_dev_ready; - reg_write(device_ready_reg, temp); - mdelay(1); - - temp = reg_read(device_ready_reg); - temp &= ~ulps_mask; - temp |= exiting_ulps; - reg_write(device_ready_reg, temp); - mdelay(1); - - /*enable the pipe*/ - psb_wvdc32(pipe->conf, map->conf); - - /* restore palette (gamma) */ - /* udelay(50000); */ - for (i = 0; i < 256; i++) - psb_wvdc32(pipe->palette[i], map->palette + (i << 2)); - - return 0; -} - -static int mdfld_save_registers(struct drm_device *dev) -{ - /* mdfld_save_cursor_overlay_registers(dev); */ - mdfld_save_display_registers(dev, 0); - mdfld_save_display_registers(dev, 2); - mdfld_disable_crtc(dev, 0); - mdfld_disable_crtc(dev, 2); - - return 0; -} - -static int mdfld_restore_registers(struct drm_device *dev) -{ - mdfld_restore_display_registers(dev, 2); - mdfld_restore_display_registers(dev, 0); - /* mdfld_restore_cursor_overlay_registers(dev); */ - - return 0; -} - -static int mdfld_power_down(struct drm_device *dev) -{ - /* fixme */ - return 0; -} - -static int mdfld_power_up(struct drm_device *dev) -{ - /* fixme */ - return 0; -} - -/* medfield */ -static const struct psb_offset mdfld_regmap[3] = { - { - .fp0 = mrst_fpa0, - .fp1 = mrst_fpa1, - .cntr = dspacntr, - .conf = pipeaconf, - .src = pipeasrc, - .dpll = mrst_dpll_a, - .htotal = htotal_a, - .hblank = hblank_a, - .hsync = hsync_a, - .vtotal = vtotal_a, - .vblank = vblank_a, - .vsync = vsync_a, - .stride = dspastride, - .size = dspasize, - .pos = dspapos, - .surf = dspasurf, - .addr = mrst_dspabase, - .status = pipeastat, - .linoff = dspalinoff, - .tileoff = dspatileoff, - .palette = palette_a, - }, - { - .fp0 = mdfld_dpll_div0, - .cntr = dspbcntr, - .conf = pipebconf, - .src = pipebsrc, - .dpll = mdfld_dpll_b, - .htotal = htotal_b, - .hblank = hblank_b, - .hsync = hsync_b, - .vtotal = vtotal_b, - .vblank = vblank_b, - .vsync = vsync_b, - .stride = dspbstride, - .size = dspbsize, - .pos = dspbpos, - .surf = dspbsurf, - .addr = mrst_dspbbase, - .status = pipebstat, - .linoff = dspblinoff, - .tileoff = dspbtileoff, - .palette = palette_b, - }, - { - .fp0 = mrst_fpa0, /* this is what the old code did ?? */ - .cntr = dspccntr, - .conf = pipecconf, - .src = pipecsrc, - /* no dpll_c */ - .dpll = mrst_dpll_a, - .htotal = htotal_c, - .hblank = hblank_c, - .hsync = hsync_c, - .vtotal = vtotal_c, - .vblank = vblank_c, - .vsync = vsync_c, - .stride = dspcstride, - .size = dspbsize, - .pos = dspcpos, - .surf = dspcsurf, - .addr = mdfld_dspcbase, - .status = pipecstat, - .linoff = dspclinoff, - .tileoff = dspctileoff, - .palette = palette_c, - }, -}; - -/* - * the gpio lines for resetting dsi pipe 0 and 2 are available in the - * pci device 0000:00:0c.0 on the medfield. - */ -static struct gpiod_lookup_table mdfld_dsi_pipe_gpio_table = { - .table = { - gpio_lookup("0000:00:0c.0", 128, "dsi-pipe0-reset", - gpio_active_high), - gpio_lookup("0000:00:0c.0", 34, "dsi-pipe2-reset", - gpio_active_high), - { }, - }, -}; - -static int mdfld_chip_setup(struct drm_device *dev) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - struct pci_dev *pdev = to_pci_dev(dev->dev); - - if (pci_enable_msi(pdev)) - dev_warn(dev->dev, "enabling msi failed! "); - dev_priv->regmap = mdfld_regmap; - - /* associate the gpio lines with the drm device */ - mdfld_dsi_pipe_gpio_table.dev_id = dev_name(dev->dev); - gpiod_add_lookup_table(&mdfld_dsi_pipe_gpio_table); - - return mid_chip_setup(dev); -} - -const struct psb_ops mdfld_chip_ops = { - .name = "mdfld", - .pipes = 3, - .crtcs = 3, - .lvds_mask = (1 << 1), - .hdmi_mask = (1 << 1), - .cursor_needs_phys = 0, - .sgx_offset = mrst_sgx_offset, - - .chip_setup = mdfld_chip_setup, - .crtc_helper = &mdfld_helper_funcs, - .crtc_funcs = &psb_intel_crtc_funcs, - - .output_init = mdfld_output_init, - -#ifdef config_backlight_class_device - .backlight_init = mdfld_backlight_init, -#endif - - .save_regs = mdfld_save_registers, - .restore_regs = mdfld_restore_registers, - .save_crtc = gma_crtc_save, - .restore_crtc = gma_crtc_restore, - .power_down = mdfld_power_down, - .power_up = mdfld_power_up, -}; diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c --- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c +++ /dev/null -/* - * copyright ©️ 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * jim liu <jim.liu@intel.com> - * jackie li<yaodong.li@intel.com> - */ - -#include <linux/delay.h> - -#include <drm/drm_simple_kms_helper.h> - -#include "mdfld_dsi_dpi.h" -#include "mdfld_dsi_pkg_sender.h" -#include "mdfld_output.h" -#include "psb_drv.h" -#include "tc35876x-dsi-lvds.h" - -static void mdfld_dsi_dpi_shut_down(struct mdfld_dsi_dpi_output *output, - int pipe); - -static void mdfld_wait_for_hs_data_fifo(struct drm_device *dev, u32 pipe) -{ - u32 gen_fifo_stat_reg = mipi_gen_fifo_stat_reg(pipe); - int timeout = 0; - - udelay(500); - - /* this will time out after approximately 2+ seconds */ - while ((timeout < 20000) && - (reg_read(gen_fifo_stat_reg) & dsi_fifo_gen_hs_data_full)) { - udelay(100); - timeout++; - } - - if (timeout == 20000) - drm_info("mipi: hs data fifo was never cleared! "); -} - -static void mdfld_wait_for_hs_ctrl_fifo(struct drm_device *dev, u32 pipe) -{ - u32 gen_fifo_stat_reg = mipi_gen_fifo_stat_reg(pipe); - int timeout = 0; - - udelay(500); - - /* this will time out after approximately 2+ seconds */ - while ((timeout < 20000) && (reg_read(gen_fifo_stat_reg) - & dsi_fifo_gen_hs_ctrl_full)) { - udelay(100); - timeout++; - } - if (timeout == 20000) - drm_info("mipi: hs cmd fifo was never cleared! "); -} - -static void mdfld_wait_for_dpi_ctrl_fifo(struct drm_device *dev, u32 pipe) -{ - u32 gen_fifo_stat_reg = mipi_gen_fifo_stat_reg(pipe); - int timeout = 0; - - udelay(500); - - /* this will time out after approximately 2+ seconds */ - while ((timeout < 20000) && ((reg_read(gen_fifo_stat_reg) & - dpi_fifo_empty) != dpi_fifo_empty)) { - udelay(100); - timeout++; - } - - if (timeout == 20000) - drm_error("mipi: dpi fifo was never cleared "); -} - -static void mdfld_wait_for_spl_pkg_sent(struct drm_device *dev, u32 pipe) -{ - u32 intr_stat_reg = mipi_intr_stat_reg(pipe); - int timeout = 0; - - udelay(500); - - /* this will time out after approximately 2+ seconds */ - while ((timeout < 20000) && (!(reg_read(intr_stat_reg) - & dsi_intr_state_spl_pkg_sent))) { - udelay(100); - timeout++; - } - - if (timeout == 20000) - drm_error("mipi: spl_pkt_sent_interrupt was not sent successfully! "); -} - -/* for tc35876x */ - -static void dsi_set_device_ready_state(struct drm_device *dev, int state, - int pipe) -{ - reg_fld_mod(mipi_device_ready_reg(pipe), !!state, 0, 0); -} - -static void dsi_set_pipe_plane_enable_state(struct drm_device *dev, - int state, int pipe) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - u32 pipeconf_reg = pipeaconf; - u32 dspcntr_reg = dspacntr; - - u32 dspcntr = dev_priv->dspcntr[pipe]; - u32 mipi = mipi_port_en | pass_from_sphy_to_afe | sel_flopped_hstx; - - if (pipe) { - pipeconf_reg = pipecconf; - dspcntr_reg = dspccntr; - } else - mipi &= (~0x03); - - if (state) { - /*set up pipe */ - reg_write(pipeconf_reg, bit(31)); - - if (reg_bit_wait(pipeconf_reg, 1, 30)) - dev_err(dev->dev, "%s: pipe enable timeout ", - __func__); - - /*set up display plane */ - reg_write(dspcntr_reg, dspcntr); - } else { - u32 dspbase_reg = pipe ? mdfld_dspcbase : mrst_dspabase; - - /* put dsi lanes to ulps to disable pipe */ - reg_fld_mod(mipi_device_ready_reg(pipe), 2, 2, 1); - reg_read(mipi_device_ready_reg(pipe)); /* posted write? */ - - /* lp hold */ - reg_fld_mod(mipi_port_control(pipe), 0, 16, 16); - reg_read(mipi_port_control(pipe)); /* posted write? */ - - /* disable display plane */ - reg_fld_mod(dspcntr_reg, 0, 31, 31); - - /* flush the plane changes ??? posted write? */ - reg_write(dspbase_reg, reg_read(dspbase_reg)); - reg_read(dspbase_reg); - - /* disable pipe */ - reg_fld_mod(pipeconf_reg, 0, 31, 31); - - if (reg_bit_wait(pipeconf_reg, 0, 30)) - dev_err(dev->dev, "%s: pipe disable timeout ", - __func__); - - if (reg_bit_wait(mipi_gen_fifo_stat_reg(pipe), 1, 28)) - dev_err(dev->dev, "%s: fifo not empty ", - __func__); - } -} - -static void mdfld_dsi_configure_down(struct mdfld_dsi_encoder *dsi_encoder, - int pipe) -{ - struct mdfld_dsi_dpi_output *dpi_output = - mdfld_dsi_dpi_output(dsi_encoder); - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_encoder_get_config(dsi_encoder); - struct drm_device *dev = dsi_config->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - - if (!dev_priv->dpi_panel_on[pipe]) { - dev_err(dev->dev, "dpi panel is already off "); - return; - } - tc35876x_toshiba_bridge_panel_off(dev); - tc35876x_set_bridge_reset_state(dev, 1); - dsi_set_pipe_plane_enable_state(dev, 0, pipe); - mdfld_dsi_dpi_shut_down(dpi_output, pipe); - dsi_set_device_ready_state(dev, 0, pipe); -} - -static void mdfld_dsi_configure_up(struct mdfld_dsi_encoder *dsi_encoder, - int pipe) -{ - struct mdfld_dsi_dpi_output *dpi_output = - mdfld_dsi_dpi_output(dsi_encoder); - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_encoder_get_config(dsi_encoder); - struct drm_device *dev = dsi_config->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - - if (dev_priv->dpi_panel_on[pipe]) { - dev_err(dev->dev, "dpi panel is already on "); - return; - } - - /* for resume path sequence */ - mdfld_dsi_dpi_shut_down(dpi_output, pipe); - dsi_set_device_ready_state(dev, 0, pipe); - - dsi_set_device_ready_state(dev, 1, pipe); - tc35876x_set_bridge_reset_state(dev, 0); - tc35876x_configure_lvds_bridge(dev); - mdfld_dsi_dpi_turn_on(dpi_output, pipe); /* send turn on command */ - dsi_set_pipe_plane_enable_state(dev, 1, pipe); -} -/* end for tc35876x */ - -/* ************************************************************************* *\ - * function: mdfld_dsi_tpo_ic_init - * - * description: this function is called only by mrst_dsi_mode_set and - * restore_display_registers. since this function does not - * acquire the mutex, it is important that the calling function - * does! -\* ************************************************************************* */ -static void mdfld_dsi_tpo_ic_init(struct mdfld_dsi_config *dsi_config, u32 pipe) -{ - struct drm_device *dev = dsi_config->dev; - u32 dcschannelnumber = dsi_config->channel_num; - u32 gen_data_reg = mipi_hs_gen_data_reg(pipe); - u32 gen_ctrl_reg = mipi_hs_gen_ctrl_reg(pipe); - u32 gen_ctrl_val = gen_long_write; - - drm_info("enter mrst init tpo mipi display. "); - - gen_ctrl_val |= dcschannelnumber << dcs_channel_number_pos; - - /* flip page order */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x00008036); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x02 << word_counts_pos)); - - /* 0xf0 */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x005a5af0); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x03 << word_counts_pos)); - - /* write protection key */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x005a5af1); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x03 << word_counts_pos)); - - /* 0xfc */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x005a5afc); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x03 << word_counts_pos)); - - /* 0xb7 */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x770000b7); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x00000044); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x05 << word_counts_pos)); - - /* 0xb6 */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x000a0ab6); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x03 << word_counts_pos)); - - /* 0xf2 */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x081010f2); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x4a070708); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x000000c5); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x09 << word_counts_pos)); - - /* 0xf8 */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x024003f8); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x01030a04); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x0e020220); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x00000004); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x0d << word_counts_pos)); - - /* 0xe2 */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x398fc3e2); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x0000916f); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x06 << word_counts_pos)); - - /* 0xb0 */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x000000b0); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x02 << word_counts_pos)); - - /* 0xf4 */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x240242f4); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x78ee2002); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x2a071050); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x507fee10); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x10300710); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x14 << word_counts_pos)); - - /* 0xba */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x19fe07ba); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x101c0a31); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x00000010); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x09 << word_counts_pos)); - - /* 0xbb */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x28ff07bb); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x24280a31); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x00000034); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x09 << word_counts_pos)); - - /* 0xfb */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x535d05fb); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x1b1a2130); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x221e180e); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x131d2120); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x535d0508); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x1c1a2131); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x231f160d); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x111b2220); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x535c2008); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x1f1d2433); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x2c251a10); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x2c34372d); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x00000023); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x31 << word_counts_pos)); - - /* 0xfa */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x525c0bfa); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x1c1c232f); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x2623190e); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x18212625); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x545d0d0e); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x1e1d2333); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x26231a10); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x1a222725); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x545d280f); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x21202635); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x31292013); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x31393d33); - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x00000029); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x31 << word_counts_pos)); - - /* set dm */ - mdfld_wait_for_hs_data_fifo(dev, pipe); - reg_write(gen_data_reg, 0x000100f7); - mdfld_wait_for_hs_ctrl_fifo(dev, pipe); - reg_write(gen_ctrl_reg, gen_ctrl_val | (0x03 << word_counts_pos)); -} - -static u16 mdfld_dsi_dpi_to_byte_clock_count(int pixel_clock_count, - int num_lane, int bpp) -{ - return (u16)((pixel_clock_count * bpp) / (num_lane * 8)); -} - -/* - * calculate the dpi time basing on a given drm mode @mode - * return 0 on success. - * fixme: i was using proposed mode value for calculation, may need to - * use crtc mode values later - */ -int mdfld_dsi_dpi_timing_calculation(struct drm_display_mode *mode, - struct mdfld_dsi_dpi_timing *dpi_timing, - int num_lane, int bpp) -{ - int pclk_hsync, pclk_hfp, pclk_hbp, pclk_hactive; - int pclk_vsync, pclk_vfp, pclk_vbp; - - pclk_hactive = mode->hdisplay; - pclk_hfp = mode->hsync_start - mode->hdisplay; - pclk_hsync = mode->hsync_end - mode->hsync_start; - pclk_hbp = mode->htotal - mode->hsync_end; - - pclk_vfp = mode->vsync_start - mode->vdisplay; - pclk_vsync = mode->vsync_end - mode->vsync_start; - pclk_vbp = mode->vtotal - mode->vsync_end; - - /* - * byte clock counts were calculated by following formula - * bclock_count = pclk_count * bpp / num_lane / 8 - */ - dpi_timing->hsync_count = mdfld_dsi_dpi_to_byte_clock_count( - pclk_hsync, num_lane, bpp); - dpi_timing->hbp_count = mdfld_dsi_dpi_to_byte_clock_count( - pclk_hbp, num_lane, bpp); - dpi_timing->hfp_count = mdfld_dsi_dpi_to_byte_clock_count( - pclk_hfp, num_lane, bpp); - dpi_timing->hactive_count = mdfld_dsi_dpi_to_byte_clock_count( - pclk_hactive, num_lane, bpp); - dpi_timing->vsync_count = mdfld_dsi_dpi_to_byte_clock_count( - pclk_vsync, num_lane, bpp); - dpi_timing->vbp_count = mdfld_dsi_dpi_to_byte_clock_count( - pclk_vbp, num_lane, bpp); - dpi_timing->vfp_count = mdfld_dsi_dpi_to_byte_clock_count( - pclk_vfp, num_lane, bpp); - - return 0; -} - -void mdfld_dsi_dpi_controller_init(struct mdfld_dsi_config *dsi_config, - int pipe) -{ - struct drm_device *dev = dsi_config->dev; - int lane_count = dsi_config->lane_count; - struct mdfld_dsi_dpi_timing dpi_timing; - struct drm_display_mode *mode = dsi_config->mode; - u32 val; - - /*un-ready device*/ - reg_fld_mod(mipi_device_ready_reg(pipe), 0, 0, 0); - - /*init dsi adapter before kicking off*/ - reg_write(mipi_ctrl_reg(pipe), 0x00000018); - - /*enable all interrupts*/ - reg_write(mipi_intr_en_reg(pipe), 0xffffffff); - - /*set up func_prg*/ - val = lane_count; - val |= dsi_config->channel_num << dsi_dpi_virt_channel_offset; - - switch (dsi_config->bpp) { - case 16: - val |= dsi_dpi_color_format_rgb565; - break; - case 18: - val |= dsi_dpi_color_format_rgb666; - break; - case 24: - val |= dsi_dpi_color_format_rgb888; - break; - default: - drm_error("unsupported color format, bpp = %d ", - dsi_config->bpp); - } - reg_write(mipi_dsi_func_prg_reg(pipe), val); - - reg_write(mipi_hs_tx_timeout_reg(pipe), - (mode->vtotal * mode->htotal * dsi_config->bpp / - (8 * lane_count)) & dsi_hs_tx_timeout_mask); - reg_write(mipi_lp_rx_timeout_reg(pipe), - 0xffff & dsi_lp_rx_timeout_mask); - - /*max value: 20 clock cycles of txclkesc*/ - reg_write(mipi_turn_around_timeout_reg(pipe), - 0x14 & dsi_turn_around_timeout_mask); - - /*min 21 txclkesc, max: ffffh*/ - reg_write(mipi_device_reset_timer_reg(pipe), - 0xffff & dsi_reset_timer_mask); - - reg_write(mipi_dpi_resolution_reg(pipe), - mode->vdisplay << 16 | mode->hdisplay); - - /*set dpi timing registers*/ - mdfld_dsi_dpi_timing_calculation(mode, &dpi_timing, - dsi_config->lane_count, dsi_config->bpp); - - reg_write(mipi_hsync_count_reg(pipe), - dpi_timing.hsync_count & dsi_dpi_timing_mask); - reg_write(mipi_hbp_count_reg(pipe), - dpi_timing.hbp_count & dsi_dpi_timing_mask); - reg_write(mipi_hfp_count_reg(pipe), - dpi_timing.hfp_count & dsi_dpi_timing_mask); - reg_write(mipi_hactive_count_reg(pipe), - dpi_timing.hactive_count & dsi_dpi_timing_mask); - reg_write(mipi_vsync_count_reg(pipe), - dpi_timing.vsync_count & dsi_dpi_timing_mask); - reg_write(mipi_vbp_count_reg(pipe), - dpi_timing.vbp_count & dsi_dpi_timing_mask); - reg_write(mipi_vfp_count_reg(pipe), - dpi_timing.vfp_count & dsi_dpi_timing_mask); - - reg_write(mipi_high_low_switch_count_reg(pipe), 0x46); - - /*min: 7d0 max: 4e20*/ - reg_write(mipi_init_count_reg(pipe), 0x000007d0); - - /*set up video mode*/ - val = dsi_config->video_mode | dsi_dpi_complete_last_line; - reg_write(mipi_video_mode_format_reg(pipe), val); - - reg_write(mipi_eot_disable_reg(pipe), 0x00000000); - - reg_write(mipi_lp_byteclk_reg(pipe), 0x00000004); - - /*todo: figure out how to setup these registers*/ - if (mdfld_get_panel_type(dev, pipe) == tc35876x) - reg_write(mipi_dphy_param_reg(pipe), 0x2a0c6008); - else - reg_write(mipi_dphy_param_reg(pipe), 0x150c3408); - - reg_write(mipi_clk_lane_switch_time_cnt_reg(pipe), (0xa << 16) | 0x14); - - if (mdfld_get_panel_type(dev, pipe) == tc35876x) - tc35876x_set_bridge_reset_state(dev, 0); /*pull high reset */ - - /*set device ready*/ - reg_fld_mod(mipi_device_ready_reg(pipe), 1, 0, 0); -} - -void mdfld_dsi_dpi_turn_on(struct mdfld_dsi_dpi_output *output, int pipe) -{ - struct drm_device *dev = output->dev; - - /* clear special packet sent bit */ - if (reg_read(mipi_intr_stat_reg(pipe)) & dsi_intr_state_spl_pkg_sent) - reg_write(mipi_intr_stat_reg(pipe), - dsi_intr_state_spl_pkg_sent); - - /*send turn on package*/ - reg_write(mipi_dpi_control_reg(pipe), dsi_dpi_ctrl_hs_turn_on); - - /*wait for spl_pkg_sent interrupt*/ - mdfld_wait_for_spl_pkg_sent(dev, pipe); - - if (reg_read(mipi_intr_stat_reg(pipe)) & dsi_intr_state_spl_pkg_sent) - reg_write(mipi_intr_stat_reg(pipe), - dsi_intr_state_spl_pkg_sent); - - output->panel_on = 1; - - /* fixme the following is disabled to wa the x slow start issue - for tmd panel - if (pipe == 2) - dev_priv->dpi_panel_on2 = true; - else if (pipe == 0) - dev_priv->dpi_panel_on = true; */ -} - -static void mdfld_dsi_dpi_shut_down(struct mdfld_dsi_dpi_output *output, - int pipe) -{ - struct drm_device *dev = output->dev; - - /*if output is on, or mode setting didn't happen, ignore this*/ - if ((!output->panel_on) || output->first_boot) { - output->first_boot = 0; - return; - } - - /* wait for dpi fifo to empty */ - mdfld_wait_for_dpi_ctrl_fifo(dev, pipe); - - /* clear the special packet interrupt bit if set */ - if (reg_read(mipi_intr_stat_reg(pipe)) & dsi_intr_state_spl_pkg_sent) - reg_write(mipi_intr_stat_reg(pipe), - dsi_intr_state_spl_pkg_sent); - - if (reg_read(mipi_dpi_control_reg(pipe)) == dsi_dpi_ctrl_hs_shutdown) - goto shutdown_out; - - reg_write(mipi_dpi_control_reg(pipe), dsi_dpi_ctrl_hs_shutdown); - -shutdown_out: - output->panel_on = 0; - output->first_boot = 0; - - /* fixme the following is disabled to wa the x slow start issue - for tmd panel - if (pipe == 2) - dev_priv->dpi_panel_on2 = false; - else if (pipe == 0) - dev_priv->dpi_panel_on = false; */ -} - -static void mdfld_dsi_dpi_set_power(struct drm_encoder *encoder, bool on) -{ - struct mdfld_dsi_encoder *dsi_encoder = mdfld_dsi_encoder(encoder); - struct mdfld_dsi_dpi_output *dpi_output = - mdfld_dsi_dpi_output(dsi_encoder); - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_encoder_get_config(dsi_encoder); - int pipe = mdfld_dsi_encoder_get_pipe(dsi_encoder); - struct drm_device *dev = dsi_config->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - - /*start up display island if it was shutdown*/ - if (!gma_power_begin(dev, true)) - return; - - if (on) { - if (mdfld_get_panel_type(dev, pipe) == tmd_vid) - mdfld_dsi_dpi_turn_on(dpi_output, pipe); - else if (mdfld_get_panel_type(dev, pipe) == tc35876x) - mdfld_dsi_configure_up(dsi_encoder, pipe); - else { - /*enable mipi port*/ - reg_write(mipi_port_control(pipe), - reg_read(mipi_port_control(pipe)) | bit(31)); - reg_read(mipi_port_control(pipe)); - - mdfld_dsi_dpi_turn_on(dpi_output, pipe); - mdfld_dsi_tpo_ic_init(dsi_config, pipe); - } - dev_priv->dpi_panel_on[pipe] = true; - } else { - if (mdfld_get_panel_type(dev, pipe) == tmd_vid) - mdfld_dsi_dpi_shut_down(dpi_output, pipe); - else if (mdfld_get_panel_type(dev, pipe) == tc35876x) - mdfld_dsi_configure_down(dsi_encoder, pipe); - else { - mdfld_dsi_dpi_shut_down(dpi_output, pipe); - - /*disable mipi port*/ - reg_write(mipi_port_control(pipe), - reg_read(mipi_port_control(pipe)) & ~bit(31)); - reg_read(mipi_port_control(pipe)); - } - dev_priv->dpi_panel_on[pipe] = false; - } - gma_power_end(dev); -} - -void mdfld_dsi_dpi_dpms(struct drm_encoder *encoder, int mode) -{ - mdfld_dsi_dpi_set_power(encoder, mode == drm_mode_dpms_on); -} - -bool mdfld_dsi_dpi_mode_fixup(struct drm_encoder *encoder, - const struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode) -{ - struct mdfld_dsi_encoder *dsi_encoder = mdfld_dsi_encoder(encoder); - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_encoder_get_config(dsi_encoder); - struct drm_display_mode *fixed_mode = dsi_config->fixed_mode; - - if (fixed_mode) { - adjusted_mode->hdisplay = fixed_mode->hdisplay; - adjusted_mode->hsync_start = fixed_mode->hsync_start; - adjusted_mode->hsync_end = fixed_mode->hsync_end; - adjusted_mode->htotal = fixed_mode->htotal; - adjusted_mode->vdisplay = fixed_mode->vdisplay; - adjusted_mode->vsync_start = fixed_mode->vsync_start; - adjusted_mode->vsync_end = fixed_mode->vsync_end; - adjusted_mode->vtotal = fixed_mode->vtotal; - adjusted_mode->clock = fixed_mode->clock; - drm_mode_set_crtcinfo(adjusted_mode, crtc_interlace_halve_v); - } - return true; -} - -void mdfld_dsi_dpi_prepare(struct drm_encoder *encoder) -{ - mdfld_dsi_dpi_set_power(encoder, false); -} - -void mdfld_dsi_dpi_commit(struct drm_encoder *encoder) -{ - mdfld_dsi_dpi_set_power(encoder, true); -} - -/* for tc35876x */ -/* this functionality was implemented in fw in icdk */ -/* but removed in dv0 and later. so need to add here. */ -static void mipi_set_properties(struct mdfld_dsi_config *dsi_config, int pipe) -{ - struct drm_device *dev = dsi_config->dev; - - reg_write(mipi_ctrl_reg(pipe), 0x00000018); - reg_write(mipi_intr_en_reg(pipe), 0xffffffff); - reg_write(mipi_hs_tx_timeout_reg(pipe), 0xffffff); - reg_write(mipi_lp_rx_timeout_reg(pipe), 0xffffff); - reg_write(mipi_turn_around_timeout_reg(pipe), 0x14); - reg_write(mipi_device_reset_timer_reg(pipe), 0xff); - reg_write(mipi_high_low_switch_count_reg(pipe), 0x25); - reg_write(mipi_init_count_reg(pipe), 0xf0); - reg_write(mipi_eot_disable_reg(pipe), 0x00000000); - reg_write(mipi_lp_byteclk_reg(pipe), 0x00000004); - reg_write(mipi_dbi_bw_ctrl_reg(pipe), 0x00000820); - reg_write(mipi_clk_lane_switch_time_cnt_reg(pipe), (0xa << 16) | 0x14); -} - -static void mdfld_mipi_set_video_timing(struct mdfld_dsi_config *dsi_config, - int pipe) -{ - struct drm_device *dev = dsi_config->dev; - struct mdfld_dsi_dpi_timing dpi_timing; - struct drm_display_mode *mode = dsi_config->mode; - - mdfld_dsi_dpi_timing_calculation(mode, &dpi_timing, - dsi_config->lane_count, - dsi_config->bpp); - - reg_write(mipi_dpi_resolution_reg(pipe), - mode->vdisplay << 16 | mode->hdisplay); - reg_write(mipi_hsync_count_reg(pipe), - dpi_timing.hsync_count & dsi_dpi_timing_mask); - reg_write(mipi_hbp_count_reg(pipe), - dpi_timing.hbp_count & dsi_dpi_timing_mask); - reg_write(mipi_hfp_count_reg(pipe), - dpi_timing.hfp_count & dsi_dpi_timing_mask); - reg_write(mipi_hactive_count_reg(pipe), - dpi_timing.hactive_count & dsi_dpi_timing_mask); - reg_write(mipi_vsync_count_reg(pipe), - dpi_timing.vsync_count & dsi_dpi_timing_mask); - reg_write(mipi_vbp_count_reg(pipe), - dpi_timing.vbp_count & dsi_dpi_timing_mask); - reg_write(mipi_vfp_count_reg(pipe), - dpi_timing.vfp_count & dsi_dpi_timing_mask); -} - -static void mdfld_mipi_config(struct mdfld_dsi_config *dsi_config, int pipe) -{ - struct drm_device *dev = dsi_config->dev; - int lane_count = dsi_config->lane_count; - - if (pipe) { - reg_write(mipi_port_control(0), 0x00000002); - reg_write(mipi_port_control(2), 0x80000000); - } else { - reg_write(mipi_port_control(0), 0x80010000); - reg_write(mipi_port_control(2), 0x00); - } - - reg_write(mipi_dphy_param_reg(pipe), 0x150a600f); - reg_write(mipi_video_mode_format_reg(pipe), 0x0000000f); - - /* lane_count = 3 */ - reg_write(mipi_dsi_func_prg_reg(pipe), 0x00000200 | lane_count); - - mdfld_mipi_set_video_timing(dsi_config, pipe); -} - -static void mdfld_set_pipe_timing(struct mdfld_dsi_config *dsi_config, int pipe) -{ - struct drm_device *dev = dsi_config->dev; - struct drm_display_mode *mode = dsi_config->mode; - - reg_write(htotal_a, ((mode->htotal - 1) << 16) | (mode->hdisplay - 1)); - reg_write(hblank_a, ((mode->htotal - 1) << 16) | (mode->hdisplay - 1)); - reg_write(hsync_a, - ((mode->hsync_end - 1) << 16) | (mode->hsync_start - 1)); - - reg_write(vtotal_a, ((mode->vtotal - 1) << 16) | (mode->vdisplay - 1)); - reg_write(vblank_a, ((mode->vtotal - 1) << 16) | (mode->vdisplay - 1)); - reg_write(vsync_a, - ((mode->vsync_end - 1) << 16) | (mode->vsync_start - 1)); - - reg_write(pipeasrc, - ((mode->hdisplay - 1) << 16) | (mode->vdisplay - 1)); -} -/* end for tc35876x */ - -void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder, - struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode) -{ - struct mdfld_dsi_encoder *dsi_encoder = mdfld_dsi_encoder(encoder); - struct mdfld_dsi_dpi_output *dpi_output = - mdfld_dsi_dpi_output(dsi_encoder); - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_encoder_get_config(dsi_encoder); - struct drm_device *dev = dsi_config->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - int pipe = mdfld_dsi_encoder_get_pipe(dsi_encoder); - u32 pipeconf_reg = pipeaconf; - u32 dspcntr_reg = dspacntr; - u32 pipeconf, dspcntr; - - u32 mipi = mipi_port_en | pass_from_sphy_to_afe | sel_flopped_hstx; - - if (warn_on(pipe < 0)) - return; - - pipeconf = dev_priv->pipeconf[pipe]; - dspcntr = dev_priv->dspcntr[pipe]; - - if (pipe) { - pipeconf_reg = pipecconf; - dspcntr_reg = dspccntr; - } else { - if (mdfld_get_panel_type(dev, pipe) == tc35876x) - mipi &= (~0x03); /* use all four lanes */ - else - mipi |= 2; - } - - /*start up display island if it was shutdown*/ - if (!gma_power_begin(dev, true)) - return; - - if (mdfld_get_panel_type(dev, pipe) == tc35876x) { - /* - * the following logic is required to reset the bridge and - * configure. this also starts the dsi clock at 200mhz. - */ - tc35876x_set_bridge_reset_state(dev, 0); /*pull high reset */ - tc35876x_toshiba_bridge_panel_on(dev); - udelay(100); - /* now start the dsi clock */ - reg_write(mrst_dpll_a, 0x00); - reg_write(mrst_fpa0, 0xc1); - reg_write(mrst_dpll_a, 0x00800000); - udelay(500); - reg_write(mrst_dpll_a, 0x80800000); - - if (reg_bit_wait(pipeconf_reg, 1, 29)) - dev_err(dev->dev, "%s: dsi pll lock timeout ", - __func__); - - reg_write(mipi_dphy_param_reg(pipe), 0x2a0c6008); - - mipi_set_properties(dsi_config, pipe); - mdfld_mipi_config(dsi_config, pipe); - mdfld_set_pipe_timing(dsi_config, pipe); - - reg_write(dspabase, 0x00); - reg_write(dspasize, - ((mode->vdisplay - 1) << 16) | (mode->hdisplay - 1)); - - reg_write(dspacntr, 0x98000000); - reg_write(dspasurf, 0x00); - - reg_write(vgacntrl, 0x80000000); - reg_write(device_ready_reg, 0x00000001); - - reg_write(mipi_port_control(pipe), 0x80810000); - } else { - /*set up mipi port fixme: do at init time */ - reg_write(mipi_port_control(pipe), mipi); - } - reg_read(mipi_port_control(pipe)); - - if (mdfld_get_panel_type(dev, pipe) == tmd_vid) { - /* nop */ - } else if (mdfld_get_panel_type(dev, pipe) == tc35876x) { - /* set up dsi controller dpi interface */ - mdfld_dsi_dpi_controller_init(dsi_config, pipe); - - /* configure mipi bridge and panel */ - tc35876x_configure_lvds_bridge(dev); - dev_priv->dpi_panel_on[pipe] = true; - } else { - /*turn on dpi interface*/ - mdfld_dsi_dpi_turn_on(dpi_output, pipe); - } - - /*set up pipe*/ - reg_write(pipeconf_reg, pipeconf); - reg_read(pipeconf_reg); - - /*set up display plane*/ - reg_write(dspcntr_reg, dspcntr); - reg_read(dspcntr_reg); - - msleep(20); /* fixme: this should wait for vblank */ - - if (mdfld_get_panel_type(dev, pipe) == tmd_vid) { - /* nop */ - } else if (mdfld_get_panel_type(dev, pipe) == tc35876x) { - mdfld_dsi_dpi_turn_on(dpi_output, pipe); - } else { - /* init driver ic */ - mdfld_dsi_tpo_ic_init(dsi_config, pipe); - /*init backlight*/ - mdfld_dsi_brightness_init(dsi_config, pipe); - } - - gma_power_end(dev); -} - -/* - * init dsi dpi encoder. - * allocate an mdfld_dsi_encoder and attach it to given @dsi_connector - * return pointer of newly allocated dpi encoder, null on error - */ -struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev, - struct mdfld_dsi_connector *dsi_connector, - const struct panel_funcs *p_funcs) -{ - struct mdfld_dsi_dpi_output *dpi_output = null; - struct mdfld_dsi_config *dsi_config; - struct drm_connector *connector = null; - struct drm_encoder *encoder = null; - int pipe; - u32 data; - int ret; - - pipe = dsi_connector->pipe; - - if (mdfld_get_panel_type(dev, pipe) != tc35876x) { - dsi_config = mdfld_dsi_get_config(dsi_connector); - - /* panel hard-reset */ - if (p_funcs->reset) { - ret = p_funcs->reset(dev, pipe); - if (ret) { - drm_error("panel %d hard-reset failed ", pipe); - return null; - } - } - - /* panel drvic init */ - if (p_funcs->drv_ic_init) - p_funcs->drv_ic_init(dsi_config, pipe); - - /* panel power mode detect */ - ret = mdfld_dsi_get_power_mode(dsi_config, &data, false); - if (ret) { - drm_error("panel %d get power mode failed ", pipe); - dsi_connector->status = connector_status_disconnected; - } else { - drm_info("pipe %d power mode 0x%x ", pipe, data); - dsi_connector->status = connector_status_connected; - } - } - - dpi_output = kzalloc(sizeof(struct mdfld_dsi_dpi_output), gfp_kernel); - if (!dpi_output) { - drm_error("no memory "); - return null; - } - - dpi_output->panel_on = 0; - dpi_output->dev = dev; - if (mdfld_get_panel_type(dev, pipe) != tc35876x) - dpi_output->p_funcs = p_funcs; - dpi_output->first_boot = 1; - - /*get fixed mode*/ - dsi_config = mdfld_dsi_get_config(dsi_connector); - - /*create drm encoder object*/ - connector = &dsi_connector->base.base; - encoder = &dpi_output->base.base.base; - drm_simple_encoder_init(dev, encoder, drm_mode_encoder_lvds); - drm_encoder_helper_add(encoder, - p_funcs->encoder_helper_funcs); - - /*attach to given connector*/ - drm_connector_attach_encoder(connector, encoder); - - /*set possible crtcs and clones*/ - if (dsi_connector->pipe) { - encoder->possible_crtcs = (1 << 2); - encoder->possible_clones = 0; - } else { - encoder->possible_crtcs = (1 << 0); - encoder->possible_clones = 0; - } - - dsi_connector->base.encoder = &dpi_output->base.base; - - return &dpi_output->base; -} diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.h b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.h --- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.h +++ /dev/null -/* - * copyright ©️ 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * jim liu <jim.liu@intel.com> - * jackie li<yaodong.li@intel.com> - */ - -#ifndef __mdfld_dsi_dpi_h__ -#define __mdfld_dsi_dpi_h__ - -#include "mdfld_dsi_output.h" -#include "mdfld_output.h" - -struct mdfld_dsi_dpi_timing { - u16 hsync_count; - u16 hbp_count; - u16 hfp_count; - u16 hactive_count; - u16 vsync_count; - u16 vbp_count; - u16 vfp_count; -}; - -struct mdfld_dsi_dpi_output { - struct mdfld_dsi_encoder base; - struct drm_device *dev; - - int panel_on; - int first_boot; - - const struct panel_funcs *p_funcs; -}; - -#define mdfld_dsi_dpi_output(dsi_encoder)\ - container_of(dsi_encoder, struct mdfld_dsi_dpi_output, base) - -/* export functions */ -extern int mdfld_dsi_dpi_timing_calculation(struct drm_display_mode *mode, - struct mdfld_dsi_dpi_timing *dpi_timing, - int num_lane, int bpp); -extern struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev, - struct mdfld_dsi_connector *dsi_connector, - const struct panel_funcs *p_funcs); - -/* mdfld dpi helper functions */ -extern void mdfld_dsi_dpi_dpms(struct drm_encoder *encoder, int mode); -extern bool mdfld_dsi_dpi_mode_fixup(struct drm_encoder *encoder, - const struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode); -extern void mdfld_dsi_dpi_prepare(struct drm_encoder *encoder); -extern void mdfld_dsi_dpi_commit(struct drm_encoder *encoder); -extern void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder, - struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode); -extern void mdfld_dsi_dpi_turn_on(struct mdfld_dsi_dpi_output *output, - int pipe); -extern void mdfld_dsi_dpi_controller_init(struct mdfld_dsi_config *dsi_config, - int pipe); -#endif /*__mdfld_dsi_dpi_h__*/ diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c --- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c +++ /dev/null -/* - * copyright ©️ 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * jim liu <jim.liu@intel.com> - * jackie li<yaodong.li@intel.com> - */ - -#include <linux/delay.h> -#include <linux/moduleparam.h> -#include <linux/pm_runtime.h> -#include <linux/gpio/consumer.h> - -#include <asm/intel_scu_ipc.h> - -#include "mdfld_dsi_dpi.h" -#include "mdfld_dsi_output.h" -#include "mdfld_dsi_pkg_sender.h" -#include "mdfld_output.h" -#include "tc35876x-dsi-lvds.h" - -/* get the labc from command line. */ -static int labc_control = 1; - -#ifdef module -module_param(labc_control, int, 0644); -#else - -static int __init parse_labc_control(char *arg) -{ - /* labc control can be passed in as a cmdline parameter */ - /* to enable this feature add labc=1 to cmdline */ - /* to disable this feature add labc=0 to cmdline */ - if (!arg) - return -einval; - - if (!strcasecmp(arg, "0")) - labc_control = 0; - else if (!strcasecmp(arg, "1")) - labc_control = 1; - - return 0; -} -early_param("labc", parse_labc_control); -#endif - -/* - * check and see if the generic control or data buffer is empty and ready. - */ -void mdfld_dsi_gen_fifo_ready(struct drm_device *dev, u32 gen_fifo_stat_reg, - u32 fifo_stat) -{ - u32 gen_bf_time_out_count; - - /* check mipi adatper command registers */ - for (gen_bf_time_out_count = 0; - gen_bf_time_out_count < gen_fb_time_out; - gen_bf_time_out_count++) { - if ((reg_read(gen_fifo_stat_reg) & fifo_stat) == fifo_stat) - break; - udelay(100); - } - - if (gen_bf_time_out_count == gen_fb_time_out) - drm_error("mdfld_dsi_gen_fifo_ready, timeout. gen_fifo_stat_reg = 0x%x. ", - gen_fifo_stat_reg); -} - -/* - * manage the dsi mipi keyboard and display brightness. - * fixme: this is exported to ospm code. should work out an specific - * display interface to ospm. - */ - -void mdfld_dsi_brightness_init(struct mdfld_dsi_config *dsi_config, int pipe) -{ - struct mdfld_dsi_pkg_sender *sender = - mdfld_dsi_get_pkg_sender(dsi_config); - struct drm_device *dev; - struct drm_psb_private *dev_priv; - u32 gen_ctrl_val; - - if (!sender) { - drm_error("no sender found "); - return; - } - - dev = sender->dev; - dev_priv = dev->dev_private; - - /* set default display backlight value to 85% (0xd8)*/ - mdfld_dsi_send_mcs_short(sender, write_display_brightness, 0xd8, 1, - true); - - /* set minimum brightness setting of cabc function to 20% (0x33)*/ - mdfld_dsi_send_mcs_short(sender, write_cabc_min_bright, 0x33, 1, true); - - /* enable backlight or/and labc */ - gen_ctrl_val = bright_cntl_block_on | display_dimming_on | - backlight_on; - if (labc_control == 1) - gen_ctrl_val |= display_dimming_on | display_brightness_auto - | gamma_auto; - - if (labc_control == 1) - gen_ctrl_val |= ambient_light_sense_on; - - dev_priv->mipi_ctrl_display = gen_ctrl_val; - - mdfld_dsi_send_mcs_short(sender, write_ctrl_display, (u8)gen_ctrl_val, - 1, true); - - mdfld_dsi_send_mcs_short(sender, write_ctrl_cabc, ui_image, 1, true); -} - -void mdfld_dsi_brightness_control(struct drm_device *dev, int pipe, int level) -{ - struct mdfld_dsi_pkg_sender *sender; - struct drm_psb_private *dev_priv; - struct mdfld_dsi_config *dsi_config; - u32 gen_ctrl_val = 0; - int p_type = tmd_vid; - - if (!dev || (pipe != 0 && pipe != 2)) { - drm_error("invalid parameter "); - return; - } - - p_type = mdfld_get_panel_type(dev, 0); - - dev_priv = dev->dev_private; - - if (pipe) - dsi_config = dev_priv->dsi_configs[1]; - else - dsi_config = dev_priv->dsi_configs[0]; - - sender = mdfld_dsi_get_pkg_sender(dsi_config); - - if (!sender) { - drm_error("no sender found "); - return; - } - - gen_ctrl_val = (level * 0xff / mdfld_dsi_brightness_max_level) & 0xff; - - dev_dbg(sender->dev->dev, "pipe = %d, gen_ctrl_val = %d. ", - pipe, gen_ctrl_val); - - if (p_type == tmd_vid) { - /* set display backlight value */ - mdfld_dsi_send_mcs_short(sender, tmd_write_display_brightness, - (u8)gen_ctrl_val, 1, true); - } else { - /* set display backlight value */ - mdfld_dsi_send_mcs_short(sender, write_display_brightness, - (u8)gen_ctrl_val, 1, true); - - /* enable backlight control */ - if (level == 0) - gen_ctrl_val = 0; - else - gen_ctrl_val = dev_priv->mipi_ctrl_display; - - mdfld_dsi_send_mcs_short(sender, write_ctrl_display, - (u8)gen_ctrl_val, 1, true); - } -} - -static int mdfld_dsi_get_panel_status(struct mdfld_dsi_config *dsi_config, - u8 dcs, u32 *data, bool hs) -{ - struct mdfld_dsi_pkg_sender *sender - = mdfld_dsi_get_pkg_sender(dsi_config); - - if (!sender || !data) { - drm_error("invalid parameter "); - return -einval; - } - - return mdfld_dsi_read_mcs(sender, dcs, data, 1, hs); -} - -int mdfld_dsi_get_power_mode(struct mdfld_dsi_config *dsi_config, u32 *mode, - bool hs) -{ - if (!dsi_config || !mode) { - drm_error("invalid parameter "); - return -einval; - } - - return mdfld_dsi_get_panel_status(dsi_config, 0x0a, mode, hs); -} - -/* - * note: this function was used by ospm. - * todo: will be removed later, should work out display interfaces for ospm - */ -void mdfld_dsi_controller_init(struct mdfld_dsi_config *dsi_config, int pipe) -{ - if (!dsi_config || ((pipe != 0) && (pipe != 2))) { - drm_error("invalid parameters "); - return; - } - - mdfld_dsi_dpi_controller_init(dsi_config, pipe); -} - -static void mdfld_dsi_connector_save(struct drm_connector *connector) -{ -} - -static void mdfld_dsi_connector_restore(struct drm_connector *connector) -{ -} - -/* fixme: start using the force parameter */ -static enum drm_connector_status -mdfld_dsi_connector_detect(struct drm_connector *connector, bool force) -{ - struct mdfld_dsi_connector *dsi_connector - = mdfld_dsi_connector(connector); - - dsi_connector->status = connector_status_connected; - - return dsi_connector->status; -} - -static int mdfld_dsi_connector_set_property(struct drm_connector *connector, - struct drm_property *property, - uint64_t value) -{ - struct drm_encoder *encoder = connector->encoder; - - if (!strcmp(property->name, "scaling mode") && encoder) { - struct gma_crtc *gma_crtc = to_gma_crtc(encoder->crtc); - bool centerechange; - uint64_t val; - - if (!gma_crtc) - goto set_prop_error; - - switch (value) { - case drm_mode_scale_fullscreen: - break; - case drm_mode_scale_no_scale: - break; - case drm_mode_scale_aspect: - break; - default: - goto set_prop_error; - } - - if (drm_object_property_get_value(&connector->base, property, &val)) - goto set_prop_error; - - if (val == value) - goto set_prop_done; - - if (drm_object_property_set_value(&connector->base, - property, value)) - goto set_prop_error; - - centerechange = (val == drm_mode_scale_no_scale) || - (value == drm_mode_scale_no_scale); - - if (gma_crtc->saved_mode.hdisplay != 0 && - gma_crtc->saved_mode.vdisplay != 0) { - if (centerechange) { - if (!drm_crtc_helper_set_mode(encoder->crtc, - &gma_crtc->saved_mode, - encoder->crtc->x, - encoder->crtc->y, - encoder->crtc->primary->fb)) - goto set_prop_error; - } else { - const struct drm_encoder_helper_funcs *funcs = - encoder->helper_private; - funcs->mode_set(encoder, - &gma_crtc->saved_mode, - &gma_crtc->saved_adjusted_mode); - } - } - } else if (!strcmp(property->name, "backlight") && encoder) { - if (drm_object_property_set_value(&connector->base, property, - value)) - goto set_prop_error; - else - gma_backlight_set(encoder->dev, value); - } -set_prop_done: - return 0; -set_prop_error: - return -1; -} - -static void mdfld_dsi_connector_destroy(struct drm_connector *connector) -{ - struct mdfld_dsi_connector *dsi_connector = - mdfld_dsi_connector(connector); - struct mdfld_dsi_pkg_sender *sender; - - if (!dsi_connector) - return; - drm_connector_unregister(connector); - drm_connector_cleanup(connector); - sender = dsi_connector->pkg_sender; - mdfld_dsi_pkg_sender_destroy(sender); - kfree(dsi_connector); -} - -static int mdfld_dsi_connector_get_modes(struct drm_connector *connector) -{ - struct mdfld_dsi_connector *dsi_connector = - mdfld_dsi_connector(connector); - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_get_config(dsi_connector); - struct drm_display_mode *fixed_mode = dsi_config->fixed_mode; - struct drm_display_mode *dup_mode = null; - struct drm_device *dev = connector->dev; - - if (fixed_mode) { - dev_dbg(dev->dev, "fixed_mode %dx%d ", - fixed_mode->hdisplay, fixed_mode->vdisplay); - dup_mode = drm_mode_duplicate(dev, fixed_mode); - drm_mode_probed_add(connector, dup_mode); - return 1; - } - drm_error("didn't get any modes! "); - return 0; -} - -static enum drm_mode_status mdfld_dsi_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) -{ - struct mdfld_dsi_connector *dsi_connector = - mdfld_dsi_connector(connector); - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_get_config(dsi_connector); - struct drm_display_mode *fixed_mode = dsi_config->fixed_mode; - - if (mode->flags & drm_mode_flag_dblscan) - return mode_no_dblescan; - - if (mode->flags & drm_mode_flag_interlace) - return mode_no_interlace; - - /** - * fixme: current dc has no fitting unit, reject any mode setting - * request - * will figure out a way to do up-scaling(panel fitting) later. - **/ - if (fixed_mode) { - if (mode->hdisplay != fixed_mode->hdisplay) - return mode_panel; - - if (mode->vdisplay != fixed_mode->vdisplay) - return mode_panel; - } - - return mode_ok; -} - -static struct drm_encoder *mdfld_dsi_connector_best_encoder( - struct drm_connector *connector) -{ - struct mdfld_dsi_connector *dsi_connector = - mdfld_dsi_connector(connector); - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_get_config(dsi_connector); - return &dsi_config->encoder->base.base; -} - -/*dsi connector funcs*/ -static const struct drm_connector_funcs mdfld_dsi_connector_funcs = { - .dpms = drm_helper_connector_dpms, - .detect = mdfld_dsi_connector_detect, - .fill_modes = drm_helper_probe_single_connector_modes, - .set_property = mdfld_dsi_connector_set_property, - .destroy = mdfld_dsi_connector_destroy, -}; - -/*dsi connector helper funcs*/ -static const struct drm_connector_helper_funcs - mdfld_dsi_connector_helper_funcs = { - .get_modes = mdfld_dsi_connector_get_modes, - .mode_valid = mdfld_dsi_connector_mode_valid, - .best_encoder = mdfld_dsi_connector_best_encoder, -}; - -static int mdfld_dsi_get_default_config(struct drm_device *dev, - struct mdfld_dsi_config *config, int pipe) -{ - if (!dev || !config) { - drm_error("invalid parameters"); - return -einval; - } - - config->bpp = 24; - if (mdfld_get_panel_type(dev, pipe) == tc35876x) - config->lane_count = 4; - else - config->lane_count = 2; - config->channel_num = 0; - - if (mdfld_get_panel_type(dev, pipe) == tmd_vid) - config->video_mode = mdfld_dsi_video_non_burst_mode_sync_pulse; - else if (mdfld_get_panel_type(dev, pipe) == tc35876x) - config->video_mode = - mdfld_dsi_video_non_burst_mode_sync_events; - else - config->video_mode = mdfld_dsi_video_burst_mode; - - return 0; -} - -int mdfld_dsi_panel_reset(struct drm_device *ddev, int pipe) -{ - struct device *dev = ddev->dev; - struct gpio_desc *gpiod; - - /* - * raise the gpio reset line for the corresponding pipe to high, - * this is probably because it is active low so this takes the - * respective pipe out of reset. (we have no code to put it back - * into reset in this driver.) - */ - switch (pipe) { - case 0: - gpiod = gpiod_get(dev, "dsi-pipe0-reset", gpiod_out_high); - if (is_err(gpiod)) - return ptr_err(gpiod); - break; - case 2: - gpiod = gpiod_get(dev, "dsi-pipe2-reset", gpiod_out_high); - if (is_err(gpiod)) - return ptr_err(gpiod); - break; - default: - drm_dev_error(dev, "invalid output pipe "); - return -einval; - } - gpiod_put(gpiod); - - /* flush posted writes on the device */ - gpiod = gpiod_get(dev, "dsi-pipe0-reset", gpiod_asis); - if (is_err(gpiod)) - return ptr_err(gpiod); - gpiod_get_value(gpiod); - gpiod_put(gpiod); - - return 0; -} - -/* - * mipi output init - * @dev drm device - * @pipe pipe number. 0 or 2 - * @config - * - * do the initialization of a mipi output, including create drm mode objects - * initialization of dsi output on @pipe - */ -void mdfld_dsi_output_init(struct drm_device *dev, - int pipe, - const struct panel_funcs *p_vid_funcs) -{ - struct mdfld_dsi_config *dsi_config; - struct mdfld_dsi_connector *dsi_connector; - struct drm_connector *connector; - struct mdfld_dsi_encoder *encoder; - struct drm_psb_private *dev_priv = dev->dev_private; - struct panel_info dsi_panel_info; - u32 width_mm, height_mm; - - dev_dbg(dev->dev, "init dsi output on pipe %d ", pipe); - - if (pipe != 0 && pipe != 2) { - drm_error("invalid parameter "); - return; - } - - /*create a new connector*/ - dsi_connector = kzalloc(sizeof(struct mdfld_dsi_connector), gfp_kernel); - if (!dsi_connector) { - drm_error("no memory"); - return; - } - - dsi_connector->pipe = pipe; - - dsi_config = kzalloc(sizeof(struct mdfld_dsi_config), - gfp_kernel); - if (!dsi_config) { - drm_error("cannot allocate memory for dsi config "); - goto dsi_init_err0; - } - mdfld_dsi_get_default_config(dev, dsi_config, pipe); - - dsi_connector->private = dsi_config; - - dsi_config->changed = 1; - dsi_config->dev = dev; - - dsi_config->fixed_mode = p_vid_funcs->get_config_mode(dev); - if (p_vid_funcs->get_panel_info(dev, pipe, &dsi_panel_info)) - goto dsi_init_err0; - - width_mm = dsi_panel_info.width_mm; - height_mm = dsi_panel_info.height_mm; - - dsi_config->mode = dsi_config->fixed_mode; - dsi_config->connector = dsi_connector; - - if (!dsi_config->fixed_mode) { - drm_error("no panel fixed mode was found "); - goto dsi_init_err0; - } - - if (pipe && dev_priv->dsi_configs[0]) { - dsi_config->dvr_ic_inited = 0; - dev_priv->dsi_configs[1] = dsi_config; - } else if (pipe == 0) { - dsi_config->dvr_ic_inited = 1; - dev_priv->dsi_configs[0] = dsi_config; - } else { - drm_error("trying to init mipi1 before mipi0 "); - goto dsi_init_err0; - } - - - connector = &dsi_connector->base.base; - dsi_connector->base.save = mdfld_dsi_connector_save; - dsi_connector->base.restore = mdfld_dsi_connector_restore; - - drm_connector_init(dev, connector, &mdfld_dsi_connector_funcs, - drm_mode_connector_lvds); - drm_connector_helper_add(connector, &mdfld_dsi_connector_helper_funcs); - - connector->display_info.subpixel_order = subpixelhorizontalrgb; - connector->display_info.width_mm = width_mm; - connector->display_info.height_mm = height_mm; - connector->interlace_allowed = false; - connector->doublescan_allowed = false; - - /*attach properties*/ - drm_object_attach_property(&connector->base, - dev->mode_config.scaling_mode_property, - drm_mode_scale_fullscreen); - drm_object_attach_property(&connector->base, - dev_priv->backlight_property, - mdfld_dsi_brightness_max_level); - - /*init dsi package sender on this output*/ - if (mdfld_dsi_pkg_sender_init(dsi_connector, pipe)) { - drm_error("package sender initialization failed on pipe %d ", - pipe); - goto dsi_init_err0; - } - - encoder = mdfld_dsi_dpi_init(dev, dsi_connector, p_vid_funcs); - if (!encoder) { - drm_error("create dpi encoder failed "); - goto dsi_init_err1; - } - encoder->private = dsi_config; - dsi_config->encoder = encoder; - encoder->base.type = (pipe == 0) ? intel_output_mipi : - intel_output_mipi2; - drm_connector_register(connector); - return; - - /*todo: add code to destroy outputs on error*/ -dsi_init_err1: - /*destroy sender*/ - mdfld_dsi_pkg_sender_destroy(dsi_connector->pkg_sender); - - drm_connector_cleanup(connector); - - kfree(dsi_config->fixed_mode); - kfree(dsi_config); -dsi_init_err0: - kfree(dsi_connector); -} diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.h b/drivers/gpu/drm/gma500/mdfld_dsi_output.h --- a/drivers/gpu/drm/gma500/mdfld_dsi_output.h +++ /dev/null -/* - * copyright ©️ 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * jim liu <jim.liu@intel.com> - * jackie li<yaodong.li@intel.com> - */ - -#ifndef __mdfld_dsi_output_h__ -#define __mdfld_dsi_output_h__ - -#include <linux/backlight.h> - -#include <asm/intel-mid.h> - -#include <drm/drm.h> -#include <drm/drm_crtc.h> -#include <drm/drm_edid.h> - -#include "mdfld_output.h" -#include "psb_drv.h" -#include "psb_intel_drv.h" -#include "psb_intel_reg.h" - -#define fld_mask(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end)) -#define fld_val(val, start, end) (((val) << (end)) & fld_mask(start, end)) -#define fld_get(val, start, end) (((val) & fld_mask(start, end)) >> (end)) -#define fld_mod(orig, val, start, end) \ - (((orig) & ~fld_mask(start, end)) | fld_val(val, start, end)) - -#define reg_fld_mod(reg, val, start, end) \ - reg_write(reg, fld_mod(reg_read(reg), val, start, end)) - -static inline int register_fld_wait(struct drm_device *dev, u32 reg, - u32 val, int start, int end) -{ - int t = 100000; - - while (fld_get(reg_read(reg), start, end) != val) { - if (--t == 0) - return 1; - } - - return 0; -} - -#define reg_fld_wait(reg, val, start, end) \ - register_fld_wait(dev, reg, val, start, end) - -#define reg_bit_wait(reg, val, bitnum) \ - register_fld_wait(dev, reg, val, bitnum, bitnum) - -#define mdfld_dsi_brightness_max_level 100 - -#ifdef debug -#define check_pipe(pipe) ({ \ - const typeof(pipe) __pipe = (pipe); \ - bug_on(__pipe != 0 && __pipe != 2); \ - __pipe; }) -#else -#define check_pipe(pipe) (pipe) -#endif - -/* - * actual mipia->mipic reg offset is 0x800, value 0x400 is valid for 0 and 2 - */ -#define reg_offset(pipe) (check_pipe(pipe) * 0x400) - -/* mdfld dsi controller registers */ -#define mipi_device_ready_reg(pipe) (0xb000 + reg_offset(pipe)) -#define mipi_intr_stat_reg(pipe) (0xb004 + reg_offset(pipe)) -#define mipi_intr_en_reg(pipe) (0xb008 + reg_offset(pipe)) -#define mipi_dsi_func_prg_reg(pipe) (0xb00c + reg_offset(pipe)) -#define mipi_hs_tx_timeout_reg(pipe) (0xb010 + reg_offset(pipe)) -#define mipi_lp_rx_timeout_reg(pipe) (0xb014 + reg_offset(pipe)) -#define mipi_turn_around_timeout_reg(pipe) (0xb018 + reg_offset(pipe)) -#define mipi_device_reset_timer_reg(pipe) (0xb01c + reg_offset(pipe)) -#define mipi_dpi_resolution_reg(pipe) (0xb020 + reg_offset(pipe)) -#define mipi_dbi_fifo_throttle_reg(pipe) (0xb024 + reg_offset(pipe)) -#define mipi_hsync_count_reg(pipe) (0xb028 + reg_offset(pipe)) -#define mipi_hbp_count_reg(pipe) (0xb02c + reg_offset(pipe)) -#define mipi_hfp_count_reg(pipe) (0xb030 + reg_offset(pipe)) -#define mipi_hactive_count_reg(pipe) (0xb034 + reg_offset(pipe)) -#define mipi_vsync_count_reg(pipe) (0xb038 + reg_offset(pipe)) -#define mipi_vbp_count_reg(pipe) (0xb03c + reg_offset(pipe)) -#define mipi_vfp_count_reg(pipe) (0xb040 + reg_offset(pipe)) -#define mipi_high_low_switch_count_reg(pipe) (0xb044 + reg_offset(pipe)) -#define mipi_dpi_control_reg(pipe) (0xb048 + reg_offset(pipe)) -#define mipi_dpi_data_reg(pipe) (0xb04c + reg_offset(pipe)) -#define mipi_init_count_reg(pipe) (0xb050 + reg_offset(pipe)) -#define mipi_max_return_pack_size_reg(pipe) (0xb054 + reg_offset(pipe)) -#define mipi_video_mode_format_reg(pipe) (0xb058 + reg_offset(pipe)) -#define mipi_eot_disable_reg(pipe) (0xb05c + reg_offset(pipe)) -#define mipi_lp_byteclk_reg(pipe) (0xb060 + reg_offset(pipe)) -#define mipi_lp_gen_data_reg(pipe) (0xb064 + reg_offset(pipe)) -#define mipi_hs_gen_data_reg(pipe) (0xb068 + reg_offset(pipe)) -#define mipi_lp_gen_ctrl_reg(pipe) (0xb06c + reg_offset(pipe)) -#define mipi_hs_gen_ctrl_reg(pipe) (0xb070 + reg_offset(pipe)) -#define mipi_gen_fifo_stat_reg(pipe) (0xb074 + reg_offset(pipe)) -#define mipi_hs_ls_dbi_enable_reg(pipe) (0xb078 + reg_offset(pipe)) -#define mipi_dphy_param_reg(pipe) (0xb080 + reg_offset(pipe)) -#define mipi_dbi_bw_ctrl_reg(pipe) (0xb084 + reg_offset(pipe)) -#define mipi_clk_lane_switch_time_cnt_reg(pipe) (0xb088 + reg_offset(pipe)) - -#define mipi_ctrl_reg(pipe) (0xb104 + reg_offset(pipe)) -#define mipi_data_add_reg(pipe) (0xb108 + reg_offset(pipe)) -#define mipi_data_len_reg(pipe) (0xb10c + reg_offset(pipe)) -#define mipi_cmd_add_reg(pipe) (0xb110 + reg_offset(pipe)) -#define mipi_cmd_len_reg(pipe) (0xb114 + reg_offset(pipe)) - -/* non-uniform reg offset */ -#define mipi_port_control(pipe) (check_pipe(pipe) ? mipi_c : mipi) - -#define dsi_device_ready (0x1) -#define dsi_power_state_ulps_enter (0x2 << 1) -#define dsi_power_state_ulps_exit (0x1 << 1) -#define dsi_power_state_ulps_offset (0x1) - - -#define dsi_one_data_lane (0x1) -#define dsi_two_data_lane (0x2) -#define dsi_three_data_lane (0x3) -#define dsi_four_data_lane (0x4) -#define dsi_dpi_virt_channel_offset (0x3) -#define dsi_dbi_virt_channel_offset (0x5) -#define dsi_dpi_color_format_rgb565 (0x01 << 7) -#define dsi_dpi_color_format_rgb666 (0x02 << 7) -#define dsi_dpi_color_format_rgb666_unpack (0x03 << 7) -#define dsi_dpi_color_format_rgb888 (0x04 << 7) -#define dsi_dbi_color_format_option2 (0x05 << 13) - -#define dsi_intr_state_rxsoterror bit(0) - -#define dsi_intr_state_spl_pkg_sent bit(30) -#define dsi_intr_state_te bit(31) - -#define dsi_hs_tx_timeout_mask (0xffffff) - -#define dsi_lp_rx_timeout_mask (0xffffff) - -#define dsi_turn_around_timeout_mask (0x3f) - -#define dsi_reset_timer_mask (0xffff) - -#define dsi_dbi_fifo_wm_half (0x0) -#define dsi_dbi_fifo_wm_quarter (0x1) -#define dsi_dbi_fifo_wm_low (0x2) - -#define dsi_dpi_timing_mask (0xffff) - -#define dsi_init_timer_mask (0xffff) - -#define dsi_dbi_return_pack_size_mask (0x3ff) - -#define dsi_lp_byteclk_mask (0x0ffff) - -#define dsi_hs_ctrl_gen_short_w0 (0x03) -#define dsi_hs_ctrl_gen_short_w1 (0x13) -#define dsi_hs_ctrl_gen_short_w2 (0x23) -#define dsi_hs_ctrl_gen_r0 (0x04) -#define dsi_hs_ctrl_gen_r1 (0x14) -#define dsi_hs_ctrl_gen_r2 (0x24) -#define dsi_hs_ctrl_gen_long_w (0x29) -#define dsi_hs_ctrl_mcs_short_w0 (0x05) -#define dsi_hs_ctrl_mcs_short_w1 (0x15) -#define dsi_hs_ctrl_mcs_r0 (0x06) -#define dsi_hs_ctrl_mcs_long_w (0x39) -#define dsi_hs_ctrl_vc_offset (0x06) -#define dsi_hs_ctrl_wc_offset (0x08) - -#define dsi_fifo_gen_hs_data_full bit(0) -#define dsi_fifo_gen_hs_data_half_empty bit(1) -#define dsi_fifo_gen_hs_data_empty bit(2) -#define dsi_fifo_gen_lp_data_full bit(8) -#define dsi_fifo_gen_lp_data_half_empty bit(9) -#define dsi_fifo_gen_lp_data_empty bit(10) -#define dsi_fifo_gen_hs_ctrl_full bit(16) -#define dsi_fifo_gen_hs_ctrl_half_empty bit(17) -#define dsi_fifo_gen_hs_ctrl_empty bit(18) -#define dsi_fifo_gen_lp_ctrl_full bit(24) -#define dsi_fifo_gen_lp_ctrl_half_empty bit(25) -#define dsi_fifo_gen_lp_ctrl_empty bit(26) -#define dsi_fifo_dbi_empty bit(27) -#define dsi_fifo_dpi_empty bit(28) - -#define dsi_dbi_hs_lp_switch_mask (0x1) - -#define dsi_hs_lp_switch_counter_offset (0x0) -#define dsi_lp_hs_switch_counter_offset (0x16) - -#define dsi_dpi_ctrl_hs_shutdown (0x00000001) -#define dsi_dpi_ctrl_hs_turn_on (0x00000002) - -/*dsi power modes*/ -#define dsi_power_mode_display_on bit(2) -#define dsi_power_mode_normal_on bit(3) -#define dsi_power_mode_sleep_out bit(4) -#define dsi_power_mode_partial_on bit(5) -#define dsi_power_mode_idle_on bit(6) - -enum { - mdfld_dsi_video_non_burst_mode_sync_pulse = 1, - mdfld_dsi_video_non_burst_mode_sync_events = 2, - mdfld_dsi_video_burst_mode = 3, -}; - -#define dsi_dpi_complete_last_line bit(2) -#define dsi_dpi_disable_bta bit(3) - -struct mdfld_dsi_connector { - struct gma_connector base; - - int pipe; - void *private; - void *pkg_sender; - - /* connection status */ - enum drm_connector_status status; -}; - -struct mdfld_dsi_encoder { - struct gma_encoder base; - void *private; -}; - -/* - * dsi config, consists of one dsi connector, two dsi encoders. - * drm will pick up on dsi encoder basing on differents configs. - */ -struct mdfld_dsi_config { - struct drm_device *dev; - struct drm_display_mode *fixed_mode; - struct drm_display_mode *mode; - - struct mdfld_dsi_connector *connector; - struct mdfld_dsi_encoder *encoder; - - int changed; - - int bpp; - int lane_count; - /*virtual channel number for this encoder*/ - int channel_num; - /*video mode configure*/ - int video_mode; - - int dvr_ic_inited; -}; - -static inline struct mdfld_dsi_connector *mdfld_dsi_connector( - struct drm_connector *connector) -{ - struct gma_connector *gma_connector; - - gma_connector = to_gma_connector(connector); - - return container_of(gma_connector, struct mdfld_dsi_connector, base); -} - -static inline struct mdfld_dsi_encoder *mdfld_dsi_encoder( - struct drm_encoder *encoder) -{ - struct gma_encoder *gma_encoder; - - gma_encoder = to_gma_encoder(encoder); - - return container_of(gma_encoder, struct mdfld_dsi_encoder, base); -} - -static inline struct mdfld_dsi_config * - mdfld_dsi_get_config(struct mdfld_dsi_connector *connector) -{ - if (!connector) - return null; - return (struct mdfld_dsi_config *)connector->private; -} - -static inline void *mdfld_dsi_get_pkg_sender(struct mdfld_dsi_config *config) -{ - struct mdfld_dsi_connector *dsi_connector; - - if (!config) - return null; - - dsi_connector = config->connector; - - if (!dsi_connector) - return null; - - return dsi_connector->pkg_sender; -} - -static inline struct mdfld_dsi_config * - mdfld_dsi_encoder_get_config(struct mdfld_dsi_encoder *encoder) -{ - if (!encoder) - return null; - return (struct mdfld_dsi_config *)encoder->private; -} - -static inline struct mdfld_dsi_connector * - mdfld_dsi_encoder_get_connector(struct mdfld_dsi_encoder *encoder) -{ - struct mdfld_dsi_config *config; - - if (!encoder) - return null; - - config = mdfld_dsi_encoder_get_config(encoder); - if (!config) - return null; - - return config->connector; -} - -static inline void *mdfld_dsi_encoder_get_pkg_sender( - struct mdfld_dsi_encoder *encoder) -{ - struct mdfld_dsi_config *dsi_config; - - dsi_config = mdfld_dsi_encoder_get_config(encoder); - if (!dsi_config) - return null; - - return mdfld_dsi_get_pkg_sender(dsi_config); -} - -static inline int mdfld_dsi_encoder_get_pipe(struct mdfld_dsi_encoder *encoder) -{ - struct mdfld_dsi_connector *connector; - - if (!encoder) - return -1; - - connector = mdfld_dsi_encoder_get_connector(encoder); - if (!connector) - return -1; - return connector->pipe; -} - -/* export functions */ -extern void mdfld_dsi_gen_fifo_ready(struct drm_device *dev, - u32 gen_fifo_stat_reg, u32 fifo_stat); -extern void mdfld_dsi_brightness_init(struct mdfld_dsi_config *dsi_config, - int pipe); -extern void mdfld_dsi_brightness_control(struct drm_device *dev, int pipe, - int level); -extern void mdfld_dsi_output_init(struct drm_device *dev, - int pipe, - const struct panel_funcs *p_vid_funcs); -extern void mdfld_dsi_controller_init(struct mdfld_dsi_config *dsi_config, - int pipe); - -extern int mdfld_dsi_get_power_mode(struct mdfld_dsi_config *dsi_config, - u32 *mode, bool hs); -extern int mdfld_dsi_panel_reset(struct drm_device *dev, int pipe); - -#endif /*__mdfld_dsi_output_h__*/ diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c --- a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c +++ /dev/null -/* - * copyright ©️ 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * jackie li<yaodong.li@intel.com> - */ - -#include <linux/delay.h> -#include <linux/freezer.h> - -#include <video/mipi_display.h> - -#include "mdfld_dsi_dpi.h" -#include "mdfld_dsi_output.h" -#include "mdfld_dsi_pkg_sender.h" - -#define mdfld_dsi_read_max_count 5000 - -enum { - mdfld_dsi_panel_mode_sleep = 0x1, -}; - -enum { - mdfld_dsi_pkg_sender_free = 0x0, - mdfld_dsi_pkg_sender_busy = 0x1, -}; - -static const char *const dsi_errors[] = { - "rx sot error", - "rx sot sync error", - "rx eot sync error", - "rx escape mode entry error", - "rx lp tx sync error", - "rx hs receive timeout error", - "rx false control error", - "rx ecc single bit error", - "rx ecc multibit error", - "rx checksum error", - "rx dsi data type not recognised", - "rx dsi vc id invalid", - "tx false control error", - "tx ecc single bit error", - "tx ecc multibit error", - "tx checksum error", - "tx dsi data type not recognised", - "tx dsi vc id invalid", - "high contention", - "low contention", - "dpi fifo under run", - "hs tx timeout", - "lp rx timeout", - "turn around ack timeout", - "ack with no error", - "rx invalid tx length", - "rx prot violation", - "hs generic write fifo full", - "lp generic write fifo full", - "generic read data avail", - "special packet sent", - "tearing effect", -}; - -static inline int wait_for_gen_fifo_empty(struct mdfld_dsi_pkg_sender *sender, - u32 mask) -{ - struct drm_device *dev = sender->dev; - u32 gen_fifo_stat_reg = sender->mipi_gen_fifo_stat_reg; - int retry = 0xffff; - - while (retry--) { - if ((mask & reg_read(gen_fifo_stat_reg)) == mask) - return 0; - udelay(100); - } - drm_error("fifo is not empty 0x%08x ", reg_read(gen_fifo_stat_reg)); - return -eio; -} - -static int wait_for_all_fifos_empty(struct mdfld_dsi_pkg_sender *sender) -{ - return wait_for_gen_fifo_empty(sender, (bit(2) | bit(10) | bit(18) | - bit(26) | bit(27) | bit(28))); -} - -static int wait_for_lp_fifos_empty(struct mdfld_dsi_pkg_sender *sender) -{ - return wait_for_gen_fifo_empty(sender, (bit(10) | bit(26))); -} - -static int wait_for_hs_fifos_empty(struct mdfld_dsi_pkg_sender *sender) -{ - return wait_for_gen_fifo_empty(sender, (bit(2) | bit(18))); -} - -static int handle_dsi_error(struct mdfld_dsi_pkg_sender *sender, u32 mask) -{ - u32 intr_stat_reg = sender->mipi_intr_stat_reg; - struct drm_device *dev = sender->dev; - - dev_dbg(sender->dev->dev, "handling error 0x%08x ", mask); - - switch (mask) { - case bit(0): - case bit(1): - case bit(2): - case bit(3): - case bit(4): - case bit(5): - case bit(6): - case bit(7): - case bit(8): - case bit(9): - case bit(10): - case bit(11): - case bit(12): - case bit(13): - dev_dbg(sender->dev->dev, "no action required "); - break; - case bit(14): - /*wait for all fifo empty*/ - /*wait_for_all_fifos_empty(sender)*/ - break; - case bit(15): - dev_dbg(sender->dev->dev, "no action required "); - break; - case bit(16): - break; - case bit(17): - break; - case bit(18): - case bit(19): - dev_dbg(sender->dev->dev, "high/low contention detected "); - /*wait for contention recovery time*/ - /*mdelay(10);*/ - /*wait for all fifo empty*/ - if (0) - wait_for_all_fifos_empty(sender); - break; - case bit(20): - dev_dbg(sender->dev->dev, "no action required "); - break; - case bit(21): - /*wait for all fifo empty*/ - /*wait_for_all_fifos_empty(sender);*/ - break; - case bit(22): - break; - case bit(23): - case bit(24): - case bit(25): - case bit(26): - case bit(27): - dev_dbg(sender->dev->dev, "hs gen fifo full "); - reg_write(intr_stat_reg, mask); - wait_for_hs_fifos_empty(sender); - break; - case bit(28): - dev_dbg(sender->dev->dev, "lp gen fifo full "); - reg_write(intr_stat_reg, mask); - wait_for_lp_fifos_empty(sender); - break; - case bit(29): - case bit(30): - case bit(31): - dev_dbg(sender->dev->dev, "no action required "); - break; - } - - if (mask & reg_read(intr_stat_reg)) - dev_dbg(sender->dev->dev, - "cannot clean interrupt 0x%08x ", mask); - return 0; -} - -static int dsi_error_handler(struct mdfld_dsi_pkg_sender *sender) -{ - struct drm_device *dev = sender->dev; - u32 intr_stat_reg = sender->mipi_intr_stat_reg; - u32 mask; - u32 intr_stat; - int i; - int err = 0; - - intr_stat = reg_read(intr_stat_reg); - - for (i = 0; i < 32; i++) { - mask = (0x00000001ul) << i; - if (intr_stat & mask) { - dev_dbg(sender->dev->dev, "[dsi]: %s ", dsi_errors[i]); - err = handle_dsi_error(sender, mask); - if (err) - drm_error("cannot handle error "); - } - } - return err; -} - -static int send_short_pkg(struct mdfld_dsi_pkg_sender *sender, u8 data_type, - u8 cmd, u8 param, bool hs) -{ - struct drm_device *dev = sender->dev; - u32 ctrl_reg; - u32 val; - u8 virtual_channel = 0; - - if (hs) { - ctrl_reg = sender->mipi_hs_gen_ctrl_reg; - - /* fixme: wait_for_hs_fifos_empty(sender); */ - } else { - ctrl_reg = sender->mipi_lp_gen_ctrl_reg; - - /* fixme: wait_for_lp_fifos_empty(sender); */ - } - - val = fld_val(param, 23, 16) | fld_val(cmd, 15, 8) | - fld_val(virtual_channel, 7, 6) | fld_val(data_type, 5, 0); - - reg_write(ctrl_reg, val); - - return 0; -} - -static int send_long_pkg(struct mdfld_dsi_pkg_sender *sender, u8 data_type, - u8 *data, int len, bool hs) -{ - struct drm_device *dev = sender->dev; - u32 ctrl_reg; - u32 data_reg; - u32 val; - u8 *p; - u8 b1, b2, b3, b4; - u8 virtual_channel = 0; - int i; - - if (hs) { - ctrl_reg = sender->mipi_hs_gen_ctrl_reg; - data_reg = sender->mipi_hs_gen_data_reg; - - /* fixme: wait_for_hs_fifos_empty(sender); */ - } else { - ctrl_reg = sender->mipi_lp_gen_ctrl_reg; - data_reg = sender->mipi_lp_gen_data_reg; - - /* fixme: wait_for_lp_fifos_empty(sender); */ - } - - p = data; - for (i = 0; i < len / 4; i++) { - b1 = *p++; - b2 = *p++; - b3 = *p++; - b4 = *p++; - - reg_write(data_reg, b4 << 24 | b3 << 16 | b2 << 8 | b1); - } - - i = len % 4; - if (i) { - b1 = 0; b2 = 0; b3 = 0; - - switch (i) { - case 3: - b1 = *p++; - b2 = *p++; - b3 = *p++; - break; - case 2: - b1 = *p++; - b2 = *p++; - break; - case 1: - b1 = *p++; - break; - } - - reg_write(data_reg, b3 << 16 | b2 << 8 | b1); - } - - val = fld_val(len, 23, 8) | fld_val(virtual_channel, 7, 6) | - fld_val(data_type, 5, 0); - - reg_write(ctrl_reg, val); - - return 0; -} - -static int send_pkg_prepare(struct mdfld_dsi_pkg_sender *sender, u8 data_type, - u8 *data, u16 len) -{ - u8 cmd; - - switch (data_type) { - case mipi_dsi_dcs_short_write: - case mipi_dsi_dcs_short_write_param: - case mipi_dsi_dcs_long_write: - cmd = *data; - break; - default: - return 0; - } - - /*this prevents other package sending while doing msleep*/ - sender->status = mdfld_dsi_pkg_sender_busy; - - /*wait for 120 milliseconds in case exit_sleep_mode just be sent*/ - if (unlikely(cmd == mipi_dcs_enter_sleep_mode)) { - /*todo: replace it with msleep later*/ - mdelay(120); - } - - if (unlikely(cmd == mipi_dcs_exit_sleep_mode)) { - /*todo: replace it with msleep later*/ - mdelay(120); - } - return 0; -} - -static int send_pkg_done(struct mdfld_dsi_pkg_sender *sender, u8 data_type, - u8 *data, u16 len) -{ - u8 cmd; - - switch (data_type) { - case mipi_dsi_dcs_short_write: - case mipi_dsi_dcs_short_write_param: - case mipi_dsi_dcs_long_write: - cmd = *data; - break; - default: - return 0; - } - - /*update panel status*/ - if (unlikely(cmd == mipi_dcs_enter_sleep_mode)) { - sender->panel_mode |= mdfld_dsi_panel_mode_sleep; - /*todo: replace it with msleep later*/ - mdelay(120); - } else if (unlikely(cmd == mipi_dcs_exit_sleep_mode)) { - sender->panel_mode &= ~mdfld_dsi_panel_mode_sleep; - /*todo: replace it with msleep later*/ - mdelay(120); - } else if (unlikely(cmd == mipi_dcs_soft_reset)) { - /*todo: replace it with msleep later*/ - mdelay(5); - } - - sender->status = mdfld_dsi_pkg_sender_free; - - return 0; -} - -static int send_pkg(struct mdfld_dsi_pkg_sender *sender, u8 data_type, - u8 *data, u16 len, bool hs) -{ - int ret; - - /*handle dsi error*/ - ret = dsi_error_handler(sender); - if (ret) { - drm_error("error handling failed "); - return -eagain; - } - - /* send pkg */ - if (sender->status == mdfld_dsi_pkg_sender_busy) { - drm_error("sender is busy "); - return -eagain; - } - - ret = send_pkg_prepare(sender, data_type, data, len); - if (ret) { - drm_error("send_pkg_prepare error "); - return ret; - } - - switch (data_type) { - case mipi_dsi_generic_short_write_0_param: - case mipi_dsi_generic_short_write_1_param: - case mipi_dsi_generic_short_write_2_param: - case mipi_dsi_generic_read_request_0_param: - case mipi_dsi_generic_read_request_1_param: - case mipi_dsi_generic_read_request_2_param: - case mipi_dsi_dcs_short_write: - case mipi_dsi_dcs_short_write_param: - case mipi_dsi_dcs_read: - ret = send_short_pkg(sender, data_type, data[0], data[1], hs); - break; - case mipi_dsi_generic_long_write: - case mipi_dsi_dcs_long_write: - ret = send_long_pkg(sender, data_type, data, len, hs); - break; - } - - send_pkg_done(sender, data_type, data, len); - - /*fixme: should i query complete and fifo empty here?*/ - - return ret; -} - -int mdfld_dsi_send_mcs_long(struct mdfld_dsi_pkg_sender *sender, u8 *data, - u32 len, bool hs) -{ - unsigned long flags; - - if (!sender || !data || !len) { - drm_error("invalid parameters "); - return -einval; - } - - spin_lock_irqsave(&sender->lock, flags); - send_pkg(sender, mipi_dsi_dcs_long_write, data, len, hs); - spin_unlock_irqrestore(&sender->lock, flags); - - return 0; -} - -int mdfld_dsi_send_mcs_short(struct mdfld_dsi_pkg_sender *sender, u8 cmd, - u8 param, u8 param_num, bool hs) -{ - u8 data[2]; - unsigned long flags; - u8 data_type; - - if (!sender) { - drm_error("invalid parameter "); - return -einval; - } - - data[0] = cmd; - - if (param_num) { - data_type = mipi_dsi_dcs_short_write_param; - data[1] = param; - } else { - data_type = mipi_dsi_dcs_short_write; - data[1] = 0; - } - - spin_lock_irqsave(&sender->lock, flags); - send_pkg(sender, data_type, data, sizeof(data), hs); - spin_unlock_irqrestore(&sender->lock, flags); - - return 0; -} - -int mdfld_dsi_send_gen_short(struct mdfld_dsi_pkg_sender *sender, u8 param0, - u8 param1, u8 param_num, bool hs) -{ - u8 data[2]; - unsigned long flags; - u8 data_type; - - if (!sender || param_num > 2) { - drm_error("invalid parameter "); - return -einval; - } - - switch (param_num) { - case 0: - data_type = mipi_dsi_generic_short_write_0_param; - data[0] = 0; - data[1] = 0; - break; - case 1: - data_type = mipi_dsi_generic_short_write_1_param; - data[0] = param0; - data[1] = 0; - break; - case 2: - data_type = mipi_dsi_generic_short_write_2_param; - data[0] = param0; - data[1] = param1; - break; - } - - spin_lock_irqsave(&sender->lock, flags); - send_pkg(sender, data_type, data, sizeof(data), hs); - spin_unlock_irqrestore(&sender->lock, flags); - - return 0; -} - -int mdfld_dsi_send_gen_long(struct mdfld_dsi_pkg_sender *sender, u8 *data, - u32 len, bool hs) -{ - unsigned long flags; - - if (!sender || !data || !len) { - drm_error("invalid parameters "); - return -einval; - } - - spin_lock_irqsave(&sender->lock, flags); - send_pkg(sender, mipi_dsi_generic_long_write, data, len, hs); - spin_unlock_irqrestore(&sender->lock, flags); - - return 0; -} - -static int __read_panel_data(struct mdfld_dsi_pkg_sender *sender, u8 data_type, - u8 *data, u16 len, u32 *data_out, u16 len_out, bool hs) -{ - unsigned long flags; - struct drm_device *dev; - int i; - u32 gen_data_reg; - int retry = mdfld_dsi_read_max_count; - - if (!sender || !data_out || !len_out) { - drm_error("invalid parameters "); - return -einval; - } - - dev = sender->dev; - - /** - * do reading. - * 0) send out generic read request - * 1) polling read data avail interrupt - * 2) read data - */ - spin_lock_irqsave(&sender->lock, flags); - - reg_write(sender->mipi_intr_stat_reg, bit(29)); - - if ((reg_read(sender->mipi_intr_stat_reg) & bit(29))) - drm_error("can not clean read data valid interrupt "); - - /*send out read request*/ - send_pkg(sender, data_type, data, len, hs); - - /*polling read data avail interrupt*/ - while (retry && !(reg_read(sender->mipi_intr_stat_reg) & bit(29))) { - udelay(100); - retry--; - } - - if (!retry) { - spin_unlock_irqrestore(&sender->lock, flags); - return -etimedout; - } - - reg_write(sender->mipi_intr_stat_reg, bit(29)); - - /*read data*/ - if (hs) - gen_data_reg = sender->mipi_hs_gen_data_reg; - else - gen_data_reg = sender->mipi_lp_gen_data_reg; - - for (i = 0; i < len_out; i++) - *(data_out + i) = reg_read(gen_data_reg); - - spin_unlock_irqrestore(&sender->lock, flags); - - return 0; -} - -int mdfld_dsi_read_mcs(struct mdfld_dsi_pkg_sender *sender, u8 cmd, - u32 *data, u16 len, bool hs) -{ - if (!sender || !data || !len) { - drm_error("invalid parameters "); - return -einval; - } - - return __read_panel_data(sender, mipi_dsi_dcs_read, &cmd, 1, - data, len, hs); -} - -int mdfld_dsi_pkg_sender_init(struct mdfld_dsi_connector *dsi_connector, - int pipe) -{ - struct mdfld_dsi_pkg_sender *pkg_sender; - struct mdfld_dsi_config *dsi_config = - mdfld_dsi_get_config(dsi_connector); - struct drm_device *dev = dsi_config->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - const struct psb_offset *map = &dev_priv->regmap[pipe]; - u32 mipi_val = 0; - - if (!dsi_connector) { - drm_error("invalid parameter "); - return -einval; - } - - pkg_sender = dsi_connector->pkg_sender; - - if (!pkg_sender || is_err(pkg_sender)) { - pkg_sender = kzalloc(sizeof(struct mdfld_dsi_pkg_sender), - gfp_kernel); - if (!pkg_sender) { - drm_error("create dsi pkg sender failed "); - return -enomem; - } - dsi_connector->pkg_sender = (void *)pkg_sender; - } - - pkg_sender->dev = dev; - pkg_sender->dsi_connector = dsi_connector; - pkg_sender->pipe = pipe; - pkg_sender->pkg_num = 0; - pkg_sender->panel_mode = 0; - pkg_sender->status = mdfld_dsi_pkg_sender_free; - - /*init regs*/ - /* fixme: should just copy the regmap ptr ? */ - pkg_sender->dpll_reg = map->dpll; - pkg_sender->dspcntr_reg = map->cntr; - pkg_sender->pipeconf_reg = map->conf; - pkg_sender->dsplinoff_reg = map->linoff; - pkg_sender->dspsurf_reg = map->surf; - pkg_sender->pipestat_reg = map->status; - - pkg_sender->mipi_intr_stat_reg = mipi_intr_stat_reg(pipe); - pkg_sender->mipi_lp_gen_data_reg = mipi_lp_gen_data_reg(pipe); - pkg_sender->mipi_hs_gen_data_reg = mipi_hs_gen_data_reg(pipe); - pkg_sender->mipi_lp_gen_ctrl_reg = mipi_lp_gen_ctrl_reg(pipe); - pkg_sender->mipi_hs_gen_ctrl_reg = mipi_hs_gen_ctrl_reg(pipe); - pkg_sender->mipi_gen_fifo_stat_reg = mipi_gen_fifo_stat_reg(pipe); - pkg_sender->mipi_data_addr_reg = mipi_data_add_reg(pipe); - pkg_sender->mipi_data_len_reg = mipi_data_len_reg(pipe); - pkg_sender->mipi_cmd_addr_reg = mipi_cmd_add_reg(pipe); - pkg_sender->mipi_cmd_len_reg = mipi_cmd_len_reg(pipe); - - /*init lock*/ - spin_lock_init(&pkg_sender->lock); - - if (mdfld_get_panel_type(dev, pipe) != tc35876x) { - /** - * for video mode, don't enable dpi timing output here, - * will init the dpi timing output during mode setting. - */ - mipi_val = pass_from_sphy_to_afe | sel_flopped_hstx; - - if (pipe == 0) - mipi_val |= 0x2; - - reg_write(mipi_port_control(pipe), mipi_val); - reg_read(mipi_port_control(pipe)); - - /* do dsi controller init */ - mdfld_dsi_controller_init(dsi_config, pipe); - } - - return 0; -} - -void mdfld_dsi_pkg_sender_destroy(struct mdfld_dsi_pkg_sender *sender) -{ - if (!sender || is_err(sender)) - return; - - /*free*/ - kfree(sender); -} - - diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.h b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.h --- a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.h +++ /dev/null -/* - * copyright ©️ 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * jackie li<yaodong.li@intel.com> - */ -#ifndef __mdfld_dsi_pkg_sender_h__ -#define __mdfld_dsi_pkg_sender_h__ - -#include <linux/kthread.h> - -#define mdfld_max_dcs_param 8 - -struct mdfld_dsi_pkg_sender { - struct drm_device *dev; - struct mdfld_dsi_connector *dsi_connector; - u32 status; - u32 panel_mode; - - int pipe; - - spinlock_t lock; - - u32 pkg_num; - - /* registers */ - u32 dpll_reg; - u32 dspcntr_reg; - u32 pipeconf_reg; - u32 pipestat_reg; - u32 dsplinoff_reg; - u32 dspsurf_reg; - - u32 mipi_intr_stat_reg; - u32 mipi_lp_gen_data_reg; - u32 mipi_hs_gen_data_reg; - u32 mipi_lp_gen_ctrl_reg; - u32 mipi_hs_gen_ctrl_reg; - u32 mipi_gen_fifo_stat_reg; - u32 mipi_data_addr_reg; - u32 mipi_data_len_reg; - u32 mipi_cmd_addr_reg; - u32 mipi_cmd_len_reg; -}; - -extern int mdfld_dsi_pkg_sender_init(struct mdfld_dsi_connector *dsi_connector, - int pipe); -extern void mdfld_dsi_pkg_sender_destroy(struct mdfld_dsi_pkg_sender *sender); -int mdfld_dsi_send_mcs_short(struct mdfld_dsi_pkg_sender *sender, u8 cmd, - u8 param, u8 param_num, bool hs); -int mdfld_dsi_send_mcs_long(struct mdfld_dsi_pkg_sender *sender, u8 *data, - u32 len, bool hs); -int mdfld_dsi_send_gen_short(struct mdfld_dsi_pkg_sender *sender, u8 param0, - u8 param1, u8 param_num, bool hs); -int mdfld_dsi_send_gen_long(struct mdfld_dsi_pkg_sender *sender, u8 *data, - u32 len, bool hs); -/* read interfaces */ -int mdfld_dsi_read_mcs(struct mdfld_dsi_pkg_sender *sender, u8 cmd, - u32 *data, u16 len, bool hs); - -#endif diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c --- a/drivers/gpu/drm/gma500/mdfld_intel_display.c +++ /dev/null -// spdx-license-identifier: gpl-2.0-only -/* - * copyright ©️ 2006-2007 intel corporation - * - * authors: - * eric anholt <eric@anholt.net> - */ - -#include <linux/delay.h> -#include <linux/i2c.h> -#include <linux/pm_runtime.h> - -#include <drm/drm_crtc.h> -#include <drm/drm_fourcc.h> - -#include "framebuffer.h" -#include "gma_display.h" -#include "mdfld_dsi_output.h" -#include "mdfld_output.h" -#include "psb_intel_reg.h" - -/* hardcoded currently */ -static int ksel = ksel_crystal_19; - -struct psb_intel_range_t { - int min, max; -}; - -struct mrst_limit_t { - struct psb_intel_range_t dot, m, p1; -}; - -struct mrst_clock_t { - /* derived values */ - int dot; - int m; - int p1; -}; - -#define count_max 0x10000000 - -void mdfldwaitforpipedisable(struct drm_device *dev, int pipe) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - const struct psb_offset *map = &dev_priv->regmap[pipe]; - int count, temp; - - switch (pipe) { - case 0: - case 1: - case 2: - break; - default: - drm_error("illegal pipe number. "); - return; - } - - /* fixme jliu7_po */ - gma_wait_for_vblank(dev); - return; - - /* wait for for the pipe disable to take effect. */ - for (count = 0; count < count_max; count++) { - temp = reg_read(map->conf); - if ((temp & pipeaconf_pipe_state) == 0) - break; - } -} - -void mdfldwaitforpipeenable(struct drm_device *dev, int pipe) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - const struct psb_offset *map = &dev_priv->regmap[pipe]; - int count, temp; - - switch (pipe) { - case 0: - case 1: - case 2: - break; - default: - drm_error("illegal pipe number. "); - return; - } - - /* fixme jliu7_po */ - gma_wait_for_vblank(dev); - return; - - /* wait for for the pipe enable to take effect. */ - for (count = 0; count < count_max; count++) { - temp = reg_read(map->conf); - if (temp & pipeaconf_pipe_state) - break; - } -} - -/* - * return the pipe currently connected to the panel fitter, - * or -1 if the panel fitter is not present or not in use - */ -static int psb_intel_panel_fitter_pipe(struct drm_device *dev) -{ - u32 pfit_control; - - pfit_control = reg_read(pfit_control); - - /* see if the panel fitter is in use */ - if ((pfit_control & pfit_enable) == 0) - return -1; - - /* 965 can place panel fitter on either pipe */ - return (pfit_control >> 29) & 0x3; -} - -static int check_fb(struct drm_framebuffer *fb) -{ - if (!fb) - return 0; - - switch (fb->format->cpp[0] * 8) { - case 8: - case 16: - case 24: - case 32: - return 0; - default: - drm_error("unknown color depth "); - return -einval; - } -} - -static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, - struct drm_framebuffer *old_fb) -{ - struct drm_device *dev = crtc->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - struct drm_framebuffer *fb = crtc->primary->fb; - struct gma_crtc *gma_crtc = to_gma_crtc(crtc); - int pipe = gma_crtc->pipe; - const struct psb_offset *map = &dev_priv->regmap[pipe]; - unsigned long start, offset; - u32 dspcntr; - int ret; - - dev_dbg(dev->dev, "pipe = 0x%x. ", pipe); - - /* no fb bound */ - if (!fb) { - dev_dbg(dev->dev, "no fb bound "); - return 0; - } - - ret = check_fb(fb); - if (ret) - return ret; - - if (pipe > 2) { - drm_error("illegal pipe number. "); - return -einval; - } - - if (!gma_power_begin(dev, true)) - return 0; - - start = to_gtt_range(fb->obj[0])->offset; - offset = y * fb->pitches[0] + x * fb->format->cpp[0]; - - reg_write(map->stride, fb->pitches[0]); - dspcntr = reg_read(map->cntr); - dspcntr &= ~dispplane_pixformat_mask; - - switch (fb->format->cpp[0] * 8) { - case 8: - dspcntr |= dispplane_8bpp; - break; - case 16: - if (fb->format->depth == 15) - dspcntr |= dispplane_15_16bpp; - else - dspcntr |= dispplane_16bpp; - break; - case 24: - case 32: - dspcntr |= dispplane_32bpp_no_alpha; - break; - } - reg_write(map->cntr, dspcntr); - - dev_dbg(dev->dev, "writing base %08lx %08lx %d %d ", - start, offset, x, y); - reg_write(map->linoff, offset); - reg_read(map->linoff); - reg_write(map->surf, start); - reg_read(map->surf); - - gma_power_end(dev); - - return 0; -} - -/* - * disable the pipe, plane and pll. - * - */ -void mdfld_disable_crtc(struct drm_device *dev, int pipe) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - const struct psb_offset *map = &dev_priv->regmap[pipe]; - u32 temp; - - dev_dbg(dev->dev, "pipe = %d ", pipe); - - - if (pipe != 1) - mdfld_dsi_gen_fifo_ready(dev, mipi_gen_fifo_stat_reg(pipe), - hs_ctrl_fifo_empty | hs_data_fifo_empty); - - /* disable display plane */ - temp = reg_read(map->cntr); - if ((temp & display_plane_enable) != 0) { - reg_write(map->cntr, - temp & ~display_plane_enable); - /* flush the plane changes */ - reg_write(map->base, reg_read(map->base)); - reg_read(map->base); - } - - /* fixme_jliu7 mdfld_po revisit */ - - /* next, disable display pipes */ - temp = reg_read(map->conf); - if ((temp & pipeaconf_enable) != 0) { - temp &= ~pipeaconf_enable; - temp |= pipeconf_plane_off | pipeconf_cursor_off; - reg_write(map->conf, temp); - reg_read(map->conf); - - /* wait for for the pipe disable to take effect. */ - mdfldwaitforpipedisable(dev, pipe); - } - - temp = reg_read(map->dpll); - if (temp & dpll_vco_enable) { - if ((pipe != 1 && - !((reg_read(pipeaconf) | reg_read(pipecconf)) - & pipeaconf_enable)) || pipe == 1) { - temp &= ~(dpll_vco_enable); - reg_write(map->dpll, temp); - reg_read(map->dpll); - /* wait for the clocks to turn off. */ - /* fixme_mdfld po may need more delay */ - udelay(500); - - if (!(temp & mdfld_pwr_gate_en)) { - /* gating power of dpll */ - reg_write(map->dpll, temp | mdfld_pwr_gate_en); - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(5000); - } - } - } - -} - -/* - * sets the power management mode of the pipe and plane. - * - * this code should probably grow support for turning the cursor off and back - * on appropriately at the same time as we're turning the pipe off/on. - */ -static void mdfld_crtc_dpms(struct drm_crtc *crtc, int mode) -{ - struct drm_device *dev = crtc->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - struct gma_crtc *gma_crtc = to_gma_crtc(crtc); - int pipe = gma_crtc->pipe; - const struct psb_offset *map = &dev_priv->regmap[pipe]; - u32 pipeconf = dev_priv->pipeconf[pipe]; - u32 temp; - int timeout = 0; - - dev_dbg(dev->dev, "mode = %d, pipe = %d ", mode, pipe); - - /* note: old code uses pipe a stat for pipe b but that appears - to be a bug */ - - if (!gma_power_begin(dev, true)) - return; - - /* xxx: when our outputs are all unaware of dpms modes other than off - * and on, we should map those modes to drm_mode_dpms_off in the crtc. - */ - switch (mode) { - case drm_mode_dpms_on: - case drm_mode_dpms_standby: - case drm_mode_dpms_suspend: - /* enable the dpll */ - temp = reg_read(map->dpll); - - if ((temp & dpll_vco_enable) == 0) { - /* when ungating power of dpll, needs to wait 0.5us - before enable the vco */ - if (temp & mdfld_pwr_gate_en) { - temp &= ~mdfld_pwr_gate_en; - reg_write(map->dpll, temp); - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(500); - } - - reg_write(map->dpll, temp); - reg_read(map->dpll); - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(500); - - reg_write(map->dpll, temp | dpll_vco_enable); - reg_read(map->dpll); - - /** - * wait for dsi pll to lock - * note: only need to poll status of pipe 0 and pipe 1, - * since both mipi pipes share the same pll. - */ - while ((pipe != 2) && (timeout < 20000) && - !(reg_read(map->conf) & pipeconf_dsipll_lock)) { - udelay(150); - timeout++; - } - } - - /* enable the plane */ - temp = reg_read(map->cntr); - if ((temp & display_plane_enable) == 0) { - reg_write(map->cntr, - temp | display_plane_enable); - /* flush the plane changes */ - reg_write(map->base, reg_read(map->base)); - } - - /* enable the pipe */ - temp = reg_read(map->conf); - if ((temp & pipeaconf_enable) == 0) { - reg_write(map->conf, pipeconf); - - /* wait for for the pipe enable to take effect. */ - mdfldwaitforpipeenable(dev, pipe); - } - - /*workaround for sighting 3741701 random x blank display*/ - /*perform w/a in video mode only on pipe a or c*/ - if (pipe == 0 || pipe == 2) { - reg_write(map->status, reg_read(map->status)); - msleep(100); - if (pipe_vblank_status & reg_read(map->status)) - dev_dbg(dev->dev, "ok"); - else { - dev_dbg(dev->dev, "stuck!!!!"); - /*shutdown controller*/ - temp = reg_read(map->cntr); - reg_write(map->cntr, - temp & ~display_plane_enable); - reg_write(map->base, reg_read(map->base)); - /*mdfld_dsi_dpi_shut_down(dev, pipe);*/ - reg_write(0xb048, 1); - msleep(100); - temp = reg_read(map->conf); - temp &= ~pipeaconf_enable; - reg_write(map->conf, temp); - msleep(100); /*wait for pipe disable*/ - reg_write(mipi_device_ready_reg(pipe), 0); - msleep(100); - reg_write(0xb004, reg_read(0xb004)); - /* try to bring the controller back up again*/ - reg_write(mipi_device_ready_reg(pipe), 1); - temp = reg_read(map->cntr); - reg_write(map->cntr, - temp | display_plane_enable); - reg_write(map->base, reg_read(map->base)); - /*mdfld_dsi_dpi_turn_on(dev, pipe);*/ - reg_write(0xb048, 2); - msleep(100); - temp = reg_read(map->conf); - temp |= pipeaconf_enable; - reg_write(map->conf, temp); - } - } - - gma_crtc_load_lut(crtc); - - /* give the overlay scaler a chance to enable - if it's on this pipe */ - /* psb_intel_crtc_dpms_video(crtc, true); todo */ - - break; - case drm_mode_dpms_off: - /* give the overlay scaler a chance to disable - * if it's on this pipe */ - /* psb_intel_crtc_dpms_video(crtc, false); todo */ - if (pipe != 1) - mdfld_dsi_gen_fifo_ready(dev, - mipi_gen_fifo_stat_reg(pipe), - hs_ctrl_fifo_empty | hs_data_fifo_empty); - - /* disable the vga plane that we never use */ - reg_write(vgacntrl, vga_disp_disable); - - /* disable display plane */ - temp = reg_read(map->cntr); - if ((temp & display_plane_enable) != 0) { - reg_write(map->cntr, - temp & ~display_plane_enable); - /* flush the plane changes */ - reg_write(map->base, reg_read(map->base)); - reg_read(map->base); - } - - /* next, disable display pipes */ - temp = reg_read(map->conf); - if ((temp & pipeaconf_enable) != 0) { - temp &= ~pipeaconf_enable; - temp |= pipeconf_plane_off | pipeconf_cursor_off; - reg_write(map->conf, temp); - reg_read(map->conf); - - /* wait for for the pipe disable to take effect. */ - mdfldwaitforpipedisable(dev, pipe); - } - - temp = reg_read(map->dpll); - if (temp & dpll_vco_enable) { - if ((pipe != 1 && !((reg_read(pipeaconf) - | reg_read(pipecconf)) & pipeaconf_enable)) - || pipe == 1) { - temp &= ~(dpll_vco_enable); - reg_write(map->dpll, temp); - reg_read(map->dpll); - /* wait for the clocks to turn off. */ - /* fixme_mdfld po may need more delay */ - udelay(500); - } - } - break; - } - gma_power_end(dev); -} - - -#define mdfld_limt_dpll_19 0 -#define mdfld_limt_dpll_25 1 -#define mdfld_limt_dpll_83 2 -#define mdfld_limt_dpll_100 3 -#define mdfld_limt_dsipll_19 4 -#define mdfld_limt_dsipll_25 5 -#define mdfld_limt_dsipll_83 6 -#define mdfld_limt_dsipll_100 7 - -#define mdfld_dot_min 19750 -#define mdfld_dot_max 120000 -#define mdfld_dpll_m_min_19 113 -#define mdfld_dpll_m_max_19 155 -#define mdfld_dpll_p1_min_19 2 -#define mdfld_dpll_p1_max_19 10 -#define mdfld_dpll_m_min_25 101 -#define mdfld_dpll_m_max_25 130 -#define mdfld_dpll_p1_min_25 2 -#define mdfld_dpll_p1_max_25 10 -#define mdfld_dpll_m_min_83 64 -#define mdfld_dpll_m_max_83 64 -#define mdfld_dpll_p1_min_83 2 -#define mdfld_dpll_p1_max_83 2 -#define mdfld_dpll_m_min_100 64 -#define mdfld_dpll_m_max_100 64 -#define mdfld_dpll_p1_min_100 2 -#define mdfld_dpll_p1_max_100 2 -#define mdfld_dsipll_m_min_19 131 -#define mdfld_dsipll_m_max_19 175 -#define mdfld_dsipll_p1_min_19 3 -#define mdfld_dsipll_p1_max_19 8 -#define mdfld_dsipll_m_min_25 97 -#define mdfld_dsipll_m_max_25 140 -#define mdfld_dsipll_p1_min_25 3 -#define mdfld_dsipll_p1_max_25 9 -#define mdfld_dsipll_m_min_83 33 -#define mdfld_dsipll_m_max_83 92 -#define mdfld_dsipll_p1_min_83 2 -#define mdfld_dsipll_p1_max_83 3 -#define mdfld_dsipll_m_min_100 97 -#define mdfld_dsipll_m_max_100 140 -#define mdfld_dsipll_p1_min_100 3 -#define mdfld_dsipll_p1_max_100 9 - -static const struct mrst_limit_t mdfld_limits[] = { - { /* mdfld_limt_dpll_19 */ - .dot = {.min = mdfld_dot_min, .max = mdfld_dot_max}, - .m = {.min = mdfld_dpll_m_min_19, .max = mdfld_dpll_m_max_19}, - .p1 = {.min = mdfld_dpll_p1_min_19, .max = mdfld_dpll_p1_max_19}, - }, - { /* mdfld_limt_dpll_25 */ - .dot = {.min = mdfld_dot_min, .max = mdfld_dot_max}, - .m = {.min = mdfld_dpll_m_min_25, .max = mdfld_dpll_m_max_25}, - .p1 = {.min = mdfld_dpll_p1_min_25, .max = mdfld_dpll_p1_max_25}, - }, - { /* mdfld_limt_dpll_83 */ - .dot = {.min = mdfld_dot_min, .max = mdfld_dot_max}, - .m = {.min = mdfld_dpll_m_min_83, .max = mdfld_dpll_m_max_83}, - .p1 = {.min = mdfld_dpll_p1_min_83, .max = mdfld_dpll_p1_max_83}, - }, - { /* mdfld_limt_dpll_100 */ - .dot = {.min = mdfld_dot_min, .max = mdfld_dot_max}, - .m = {.min = mdfld_dpll_m_min_100, .max = mdfld_dpll_m_max_100}, - .p1 = {.min = mdfld_dpll_p1_min_100, .max = mdfld_dpll_p1_max_100}, - }, - { /* mdfld_limt_dsipll_19 */ - .dot = {.min = mdfld_dot_min, .max = mdfld_dot_max}, - .m = {.min = mdfld_dsipll_m_min_19, .max = mdfld_dsipll_m_max_19}, - .p1 = {.min = mdfld_dsipll_p1_min_19, .max = mdfld_dsipll_p1_max_19}, - }, - { /* mdfld_limt_dsipll_25 */ - .dot = {.min = mdfld_dot_min, .max = mdfld_dot_max}, - .m = {.min = mdfld_dsipll_m_min_25, .max = mdfld_dsipll_m_max_25}, - .p1 = {.min = mdfld_dsipll_p1_min_25, .max = mdfld_dsipll_p1_max_25}, - }, - { /* mdfld_limt_dsipll_83 */ - .dot = {.min = mdfld_dot_min, .max = mdfld_dot_max}, - .m = {.min = mdfld_dsipll_m_min_83, .max = mdfld_dsipll_m_max_83}, - .p1 = {.min = mdfld_dsipll_p1_min_83, .max = mdfld_dsipll_p1_max_83}, - }, - { /* mdfld_limt_dsipll_100 */ - .dot = {.min = mdfld_dot_min, .max = mdfld_dot_max}, - .m = {.min = mdfld_dsipll_m_min_100, .max = mdfld_dsipll_m_max_100}, - .p1 = {.min = mdfld_dsipll_p1_min_100, .max = mdfld_dsipll_p1_max_100}, - }, -}; - -#define mdfld_m_min 21 -#define mdfld_m_max 180 -static const u32 mdfld_m_converts[] = { -/* m configuration table from 9-bit lfsr table */ - 224, 368, 440, 220, 366, 439, 219, 365, 182, 347, /* 21 - 30 */ - 173, 342, 171, 85, 298, 149, 74, 37, 18, 265, /* 31 - 40 */ - 388, 194, 353, 432, 216, 108, 310, 155, 333, 166, /* 41 - 50 */ - 83, 41, 276, 138, 325, 162, 337, 168, 340, 170, /* 51 - 60 */ - 341, 426, 469, 234, 373, 442, 221, 110, 311, 411, /* 61 - 70 */ - 461, 486, 243, 377, 188, 350, 175, 343, 427, 213, /* 71 - 80 */ - 106, 53, 282, 397, 354, 227, 113, 56, 284, 142, /* 81 - 90 */ - 71, 35, 273, 136, 324, 418, 465, 488, 500, 506, /* 91 - 100 */ - 253, 126, 63, 287, 399, 455, 483, 241, 376, 444, /* 101 - 110 */ - 478, 495, 503, 251, 381, 446, 479, 239, 375, 443, /* 111 - 120 */ - 477, 238, 119, 315, 157, 78, 295, 147, 329, 420, /* 121 - 130 */ - 210, 105, 308, 154, 77, 38, 275, 137, 68, 290, /* 131 - 140 */ - 145, 328, 164, 82, 297, 404, 458, 485, 498, 249, /* 141 - 150 */ - 380, 190, 351, 431, 471, 235, 117, 314, 413, 206, /* 151 - 160 */ - 103, 51, 25, 12, 262, 387, 193, 96, 48, 280, /* 161 - 170 */ - 396, 198, 99, 305, 152, 76, 294, 403, 457, 228, /* 171 - 180 */ -}; - -static const struct mrst_limit_t *mdfld_limit(struct drm_crtc *crtc) -{ - const struct mrst_limit_t *limit = null; - struct drm_device *dev = crtc->dev; - struct drm_psb_private *dev_priv = dev->dev_private; - - if (gma_pipe_has_type(crtc, intel_output_mipi) - || gma_pipe_has_type(crtc, intel_output_mipi2)) { - if ((ksel == ksel_crystal_19) || (ksel == ksel_bypass_19)) - limit = &mdfld_limits[mdfld_limt_dsipll_19]; - else if (ksel == ksel_bypass_25) - limit = &mdfld_limits[mdfld_limt_dsipll_25]; - else if ((ksel == ksel_bypass_83_100) && - (dev_priv->core_freq == 166)) - limit = &mdfld_limits[mdfld_limt_dsipll_83]; - else if ((ksel == ksel_bypass_83_100) && - (dev_priv->core_freq == 100 || - dev_priv->core_freq == 200)) - limit = &mdfld_limits[mdfld_limt_dsipll_100]; - } else if (gma_pipe_has_type(crtc, intel_output_hdmi)) { - if ((ksel == ksel_crystal_19) || (ksel == ksel_bypass_19)) - limit = &mdfld_limits[mdfld_limt_dpll_19]; - else if (ksel == ksel_bypass_25) - limit = &mdfld_limits[mdfld_limt_dpll_25]; - else if ((ksel == ksel_bypass_83_100) && - (dev_priv->core_freq == 166)) - limit = &mdfld_limits[mdfld_limt_dpll_83]; - else if ((ksel == ksel_bypass_83_100) && - (dev_priv->core_freq == 100 || - dev_priv->core_freq == 200)) - limit = &mdfld_limits[mdfld_limt_dpll_100]; - } else { - limit = null; - dev_dbg(dev->dev, "mdfld_limit wrong display type. "); - } - - return limit; -} - -/** derive the pixel clock for the given refclk and divisors for 8xx chips. */ -static void mdfld_clock(int refclk, struct mrst_clock_t *clock) -{ - clock->dot = (refclk * clock->m) / clock->p1; -} - -/* - * returns a set of divisors for the desired target clock with the given refclk, - * or false. divisor values are the actual divisors for - */ -static bool -mdfldfindbestpll(struct drm_crtc *crtc, int target, int refclk, - struct mrst_clock_t *best_clock) -{ - struct mrst_clock_t clock; - const struct mrst_limit_t *limit = mdfld_limit(crtc); - int err = target; - - memset(best_clock, 0, sizeof(*best_clock)); - - for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) { - for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max; - clock.p1++) { - int this_err; - - mdfld_clock(refclk, &clock); - - this_err = abs(clock.dot - target); - if (this_err < err) { - *best_clock = clock; - err = this_err; - } - } - } - return err != target; -} - -static int mdfld_crtc_mode_set(struct drm_crtc *crtc, - struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode, - int x, int y, - struct drm_framebuffer *old_fb) -{ - struct drm_device *dev = crtc->dev; - struct gma_crtc *gma_crtc = to_gma_crtc(crtc); - struct drm_psb_private *dev_priv = dev->dev_private; - int pipe = gma_crtc->pipe; - const struct psb_offset *map = &dev_priv->regmap[pipe]; - int refclk = 0; - int clk_n = 0, clk_p2 = 0, clk_byte = 1, clk = 0, m_conv = 0, - clk_tmp = 0; - struct mrst_clock_t clock; - bool ok; - u32 dpll = 0, fp = 0; - bool is_mipi = false, is_mipi2 = false, is_hdmi = false; - struct drm_mode_config *mode_config = &dev->mode_config; - struct gma_encoder *gma_encoder = null; - uint64_t scalingtype = drm_mode_scale_fullscreen; - struct drm_encoder *encoder; - struct drm_connector *connector; - int timeout = 0; - int ret; - - dev_dbg(dev->dev, "pipe = 0x%x ", pipe); - - ret = check_fb(crtc->primary->fb); - if (ret) - return ret; - - dev_dbg(dev->dev, "adjusted_hdisplay = %d ", - adjusted_mode->hdisplay); - dev_dbg(dev->dev, "adjusted_vdisplay = %d ", - adjusted_mode->vdisplay); - dev_dbg(dev->dev, "adjusted_hsync_start = %d ", - adjusted_mode->hsync_start); - dev_dbg(dev->dev, "adjusted_hsync_end = %d ", - adjusted_mode->hsync_end); - dev_dbg(dev->dev, "adjusted_htotal = %d ", - adjusted_mode->htotal); - dev_dbg(dev->dev, "adjusted_vsync_start = %d ", - adjusted_mode->vsync_start); - dev_dbg(dev->dev, "adjusted_vsync_end = %d ", - adjusted_mode->vsync_end); - dev_dbg(dev->dev, "adjusted_vtotal = %d ", - adjusted_mode->vtotal); - dev_dbg(dev->dev, "adjusted_clock = %d ", - adjusted_mode->clock); - dev_dbg(dev->dev, "hdisplay = %d ", - mode->hdisplay); - dev_dbg(dev->dev, "vdisplay = %d ", - mode->vdisplay); - - if (!gma_power_begin(dev, true)) - return 0; - - memcpy(&gma_crtc->saved_mode, mode, - sizeof(struct drm_display_mode)); - memcpy(&gma_crtc->saved_adjusted_mode, adjusted_mode, - sizeof(struct drm_display_mode)); - - list_for_each_entry(connector, &mode_config->connector_list, head) { - encoder = connector->encoder; - if (!encoder) - continue; - - if (encoder->crtc != crtc) - continue; - - gma_encoder = gma_attached_encoder(connector); - - switch (gma_encoder->type) { - case intel_output_mipi: - is_mipi = true; - break; - case intel_output_mipi2: - is_mipi2 = true; - break; - case intel_output_hdmi: - is_hdmi = true; - break; - } - } - - /* disable the vga plane that we never use */ - reg_write(vgacntrl, vga_disp_disable); - - /* disable the panel fitter if it was on our pipe */ - if (psb_intel_panel_fitter_pipe(dev) == pipe) - reg_write(pfit_control, 0); - - /* pipesrc and dspsize control the size that is scaled from, - * which should always be the user's requested size. - */ - if (pipe == 1) { - /* fixme: to make hdmi display with 864x480 (tpo), 480x864 - * (pyr) or 480x854 (tmd), set the sprite width/height and - * souce image size registers with the adjusted mode for - * pipe b. - */ - - /* - * the defined sprite rectangle must always be completely - * contained within the displayable area of the screen image - * (frame buffer). - */ - reg_write(map->size, ((min(mode->crtc_vdisplay, adjusted_mode->crtc_vdisplay) - 1) << 16) - | (min(mode->crtc_hdisplay, adjusted_mode->crtc_hdisplay) - 1)); - /* set the crtc with encoder mode. */ - reg_write(map->src, ((mode->crtc_hdisplay - 1) << 16) - | (mode->crtc_vdisplay - 1)); - } else { - reg_write(map->size, - ((mode->crtc_vdisplay - 1) << 16) | - (mode->crtc_hdisplay - 1)); - reg_write(map->src, - ((mode->crtc_hdisplay - 1) << 16) | - (mode->crtc_vdisplay - 1)); - } - - reg_write(map->pos, 0); - - if (gma_encoder) - drm_object_property_get_value(&connector->base, - dev->mode_config.scaling_mode_property, &scalingtype); - - if (scalingtype == drm_mode_scale_no_scale) { - /* medfield doesn't have register support for centering so we - * need to mess with the h/vblank and h/vsync start and ends - * to get centering - */ - int offsetx = 0, offsety = 0; - - offsetx = (adjusted_mode->crtc_hdisplay - - mode->crtc_hdisplay) / 2; - offsety = (adjusted_mode->crtc_vdisplay - - mode->crtc_vdisplay) / 2; - - reg_write(map->htotal, (mode->crtc_hdisplay - 1) | - ((adjusted_mode->crtc_htotal - 1) << 16)); - reg_write(map->vtotal, (mode->crtc_vdisplay - 1) | - ((adjusted_mode->crtc_vtotal - 1) << 16)); - reg_write(map->hblank, (adjusted_mode->crtc_hblank_start - - offsetx - 1) | - ((adjusted_mode->crtc_hblank_end - offsetx - 1) << 16)); - reg_write(map->hsync, (adjusted_mode->crtc_hsync_start - - offsetx - 1) | - ((adjusted_mode->crtc_hsync_end - offsetx - 1) << 16)); - reg_write(map->vblank, (adjusted_mode->crtc_vblank_start - - offsety - 1) | - ((adjusted_mode->crtc_vblank_end - offsety - 1) << 16)); - reg_write(map->vsync, (adjusted_mode->crtc_vsync_start - - offsety - 1) | - ((adjusted_mode->crtc_vsync_end - offsety - 1) << 16)); - } else { - reg_write(map->htotal, (adjusted_mode->crtc_hdisplay - 1) | - ((adjusted_mode->crtc_htotal - 1) << 16)); - reg_write(map->vtotal, (adjusted_mode->crtc_vdisplay - 1) | - ((adjusted_mode->crtc_vtotal - 1) << 16)); - reg_write(map->hblank, (adjusted_mode->crtc_hblank_start - 1) | - ((adjusted_mode->crtc_hblank_end - 1) << 16)); - reg_write(map->hsync, (adjusted_mode->crtc_hsync_start - 1) | - ((adjusted_mode->crtc_hsync_end - 1) << 16)); - reg_write(map->vblank, (adjusted_mode->crtc_vblank_start - 1) | - ((adjusted_mode->crtc_vblank_end - 1) << 16)); - reg_write(map->vsync, (adjusted_mode->crtc_vsync_start - 1) | - ((adjusted_mode->crtc_vsync_end - 1) << 16)); - } - - /* flush the plane changes */ - { - const struct drm_crtc_helper_funcs *crtc_funcs = - crtc->helper_private; - crtc_funcs->mode_set_base(crtc, x, y, old_fb); - } - - /* setup pipeconf */ - dev_priv->pipeconf[pipe] = pipeaconf_enable; /* fixme_jliu7 reg_read(pipeconf_reg); */ - - /* set up the display plane register */ - dev_priv->dspcntr[pipe] = reg_read(map->cntr); - dev_priv->dspcntr[pipe] |= pipe << dispplane_sel_pipe_pos; - dev_priv->dspcntr[pipe] |= display_plane_enable; - - if (is_mipi2) - goto mrst_crtc_mode_set_exit; - clk = adjusted_mode->clock; - - if (is_hdmi) { - if ((ksel == ksel_crystal_19) || (ksel == ksel_bypass_19)) { - refclk = 19200; - - if (is_mipi || is_mipi2) - clk_n = 1, clk_p2 = 8; - else if (is_hdmi) - clk_n = 1, clk_p2 = 10; - } else if (ksel == ksel_bypass_25) { - refclk = 25000; - - if (is_mipi || is_mipi2) - clk_n = 1, clk_p2 = 8; - else if (is_hdmi) - clk_n = 1, clk_p2 = 10; - } else if ((ksel == ksel_bypass_83_100) && - dev_priv->core_freq == 166) { - refclk = 83000; - - if (is_mipi || is_mipi2) - clk_n = 4, clk_p2 = 8; - else if (is_hdmi) - clk_n = 4, clk_p2 = 10; - } else if ((ksel == ksel_bypass_83_100) && - (dev_priv->core_freq == 100 || - dev_priv->core_freq == 200)) { - refclk = 100000; - if (is_mipi || is_mipi2) - clk_n = 4, clk_p2 = 8; - else if (is_hdmi) - clk_n = 4, clk_p2 = 10; - } - - if (is_mipi) - clk_byte = dev_priv->bpp / 8; - else if (is_mipi2) - clk_byte = dev_priv->bpp2 / 8; - - clk_tmp = clk * clk_n * clk_p2 * clk_byte; - - dev_dbg(dev->dev, "clk = %d, clk_n = %d, clk_p2 = %d. ", - clk, clk_n, clk_p2); - dev_dbg(dev->dev, "adjusted_mode->clock = %d, clk_tmp = %d. ", - adjusted_mode->clock, clk_tmp); - - ok = mdfldfindbestpll(crtc, clk_tmp, refclk, &clock); - - if (!ok) { - drm_error - ("mdfldfindbestpll fail in mdfld_crtc_mode_set. "); - } else { - m_conv = mdfld_m_converts[(clock.m - mdfld_m_min)]; - - dev_dbg(dev->dev, "dot clock = %d," - "m = %d, p1 = %d, m_conv = %d. ", - clock.dot, clock.m, - clock.p1, m_conv); - } - - dpll = reg_read(map->dpll); - - if (dpll & dpll_vco_enable) { - dpll &= ~dpll_vco_enable; - reg_write(map->dpll, dpll); - reg_read(map->dpll); - - /* fixme jliu7 check the dpll lock bit pipeaconf[29] */ - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(500); - - /* reset m1, n1 & p1 */ - reg_write(map->fp0, 0); - dpll &= ~mdfld_p1_mask; - reg_write(map->dpll, dpll); - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(500); - } - - /* when ungating power of dpll, needs to wait 0.5us before - * enable the vco */ - if (dpll & mdfld_pwr_gate_en) { - dpll &= ~mdfld_pwr_gate_en; - reg_write(map->dpll, dpll); - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(500); - } - dpll = 0; - - if (is_hdmi) - dpll |= mdfld_vco_sel; - - fp = (clk_n / 2) << 16; - fp |= m_conv; - - /* compute bitmask from p1 value */ - dpll |= (1 << (clock.p1 - 2)) << 17; - - } else { - dpll = 0x00800000; - fp = 0x000000c1; - } - - reg_write(map->fp0, fp); - reg_write(map->dpll, dpll); - /* fixme_mdfld po - change 500 to 1 after po */ - udelay(500); - - dpll |= dpll_vco_enable; - reg_write(map->dpll, dpll); - reg_read(map->dpll); - - /* wait for dsi pll to lock */ - while (timeout < 20000 && - !(reg_read(map->conf) & pipeconf_dsipll_lock)) { - udelay(150); - timeout++; - } - - if (is_mipi) - goto mrst_crtc_mode_set_exit; - - dev_dbg(dev->dev, "is_mipi = 0x%x ", is_mipi); - - reg_write(map->conf, dev_priv->pipeconf[pipe]); - reg_read(map->conf); - - /* wait for for the pipe enable to take effect. */ - reg_write(map->cntr, dev_priv->dspcntr[pipe]); - gma_wait_for_vblank(dev); - -mrst_crtc_mode_set_exit: - - gma_power_end(dev); - - return 0; -} - -const struct drm_crtc_helper_funcs mdfld_helper_funcs = { - .dpms = mdfld_crtc_dpms, - .mode_set = mdfld_crtc_mode_set, - .mode_set_base = mdfld__intel_pipe_set_base, - .prepare = gma_crtc_prepare, - .commit = gma_crtc_commit, -}; diff --git a/drivers/gpu/drm/gma500/mdfld_output.c b/drivers/gpu/drm/gma500/mdfld_output.c --- a/drivers/gpu/drm/gma500/mdfld_output.c +++ /dev/null -/* - * copyright (c) 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicensen - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * thomas eaton <thomas.g.eaton@intel.com> - * scott rowe <scott.m.rowe@intel.com> -*/ - -#include "mdfld_output.h" -#include "mdfld_dsi_dpi.h" -#include "mdfld_dsi_output.h" - -#include "tc35876x-dsi-lvds.h" - -int mdfld_get_panel_type(struct drm_device *dev, int pipe) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - return dev_priv->mdfld_panel_id; -} - -static void mdfld_init_panel(struct drm_device *dev, int mipi_pipe, - int p_type) -{ - switch (p_type) { - case tpo_vid: - mdfld_dsi_output_init(dev, mipi_pipe, &mdfld_tpo_vid_funcs); - break; - case tc35876x: - tc35876x_init(dev); - mdfld_dsi_output_init(dev, mipi_pipe, &mdfld_tc35876x_funcs); - break; - case tmd_vid: - mdfld_dsi_output_init(dev, mipi_pipe, &mdfld_tmd_vid_funcs); - break; - case hdmi: -/* if (dev_priv->mdfld_hdmi_present) - mdfld_hdmi_init(dev, &dev_priv->mode_dev); */ - break; - } -} - - -int mdfld_output_init(struct drm_device *dev) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - - /* fixme: hardcoded for now */ - dev_priv->mdfld_panel_id = tc35876x; - /* mipi panel 1 */ - mdfld_init_panel(dev, 0, dev_priv->mdfld_panel_id); - /* hdmi panel */ - mdfld_init_panel(dev, 1, hdmi); - return 0; -} - diff --git a/drivers/gpu/drm/gma500/mdfld_output.h b/drivers/gpu/drm/gma500/mdfld_output.h --- a/drivers/gpu/drm/gma500/mdfld_output.h +++ /dev/null -/* - * copyright (c) 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicensen - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * thomas eaton <thomas.g.eaton@intel.com> - * scott rowe <scott.m.rowe@intel.com> -*/ - -#ifndef mdfld_output_h -#define mdfld_output_h - -#include "psb_drv.h" - -#define tpo_panel_width 84 -#define tpo_panel_height 46 -#define tmd_panel_width 39 -#define tmd_panel_height 71 - -struct mdfld_dsi_config; - -enum panel_type { - tpo_vid, - tmd_vid, - hdmi, - tc35876x, -}; - -struct panel_info { - u32 width_mm; - u32 height_mm; - /* other info */ -}; - -struct panel_funcs { - const struct drm_encoder_helper_funcs *encoder_helper_funcs; - struct drm_display_mode * (*get_config_mode)(struct drm_device *); - int (*get_panel_info)(struct drm_device *, int, struct panel_info *); - int (*reset)(struct drm_device *, int); - void (*drv_ic_init)(struct mdfld_dsi_config *dsi_config, int pipe); -}; - -int mdfld_output_init(struct drm_device *dev); - -struct backlight_device *mdfld_get_backlight_device(void); -int mdfld_set_brightness(struct backlight_device *bd); - -int mdfld_get_panel_type(struct drm_device *dev, int pipe); - -extern const struct drm_crtc_helper_funcs mdfld_helper_funcs; - -extern const struct panel_funcs mdfld_tmd_vid_funcs; -extern const struct panel_funcs mdfld_tpo_vid_funcs; - -extern void mdfld_disable_crtc(struct drm_device *dev, int pipe); -extern void mdfldwaitforpipeenable(struct drm_device *dev, int pipe); -extern void mdfldwaitforpipedisable(struct drm_device *dev, int pipe); -#endif diff --git a/drivers/gpu/drm/gma500/mdfld_tmd_vid.c b/drivers/gpu/drm/gma500/mdfld_tmd_vid.c --- a/drivers/gpu/drm/gma500/mdfld_tmd_vid.c +++ /dev/null -/* - * copyright ©️ 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * jim liu <jim.liu@intel.com> - * jackie li<yaodong.li@intel.com> - * gideon eaton <eaton. - * scott rowe <scott.m.rowe@intel.com> - */ - -#include <linux/delay.h> - -#include "mdfld_dsi_dpi.h" -#include "mdfld_dsi_pkg_sender.h" - -static struct drm_display_mode *tmd_vid_get_config_mode(struct drm_device *dev) -{ - struct drm_display_mode *mode; - struct drm_psb_private *dev_priv = dev->dev_private; - struct oaktrail_timing_info *ti = &dev_priv->gct_data.dtd; - bool use_gct = false; /*disable gct for now*/ - - mode = kzalloc(sizeof(*mode), gfp_kernel); - if (!mode) - return null; - - if (use_gct) { - mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo; - mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo; - mode->hsync_start = mode->hdisplay + \ - ((ti->hsync_offset_hi << 8) | \ - ti->hsync_offset_lo); - mode->hsync_end = mode->hsync_start + \ - ((ti->hsync_pulse_width_hi << 8) | \ - ti->hsync_pulse_width_lo); - mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) | \ - ti->hblank_lo); - mode->vsync_start = \ - mode->vdisplay + ((ti->vsync_offset_hi << 8) | \ - ti->vsync_offset_lo); - mode->vsync_end = \ - mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) | \ - ti->vsync_pulse_width_lo); - mode->vtotal = mode->vdisplay + \ - ((ti->vblank_hi << 8) | ti->vblank_lo); - mode->clock = ti->pixel_clock * 10; - - dev_dbg(dev->dev, "hdisplay is %d ", mode->hdisplay); - dev_dbg(dev->dev, "vdisplay is %d ", mode->vdisplay); - dev_dbg(dev->dev, "hss is %d ", mode->hsync_start); - dev_dbg(dev->dev, "hse is %d ", mode->hsync_end); - dev_dbg(dev->dev, "htotal is %d ", mode->htotal); - dev_dbg(dev->dev, "vss is %d ", mode->vsync_start); - dev_dbg(dev->dev, "vse is %d ", mode->vsync_end); - dev_dbg(dev->dev, "vtotal is %d ", mode->vtotal); - dev_dbg(dev->dev, "clock is %d ", mode->clock); - } else { - mode->hdisplay = 480; - mode->vdisplay = 854; - mode->hsync_start = 487; - mode->hsync_end = 490; - mode->htotal = 499; - mode->vsync_start = 861; - mode->vsync_end = 865; - mode->vtotal = 873; - mode->clock = 33264; - } - - drm_mode_set_name(mode); - drm_mode_set_crtcinfo(mode, 0); - - mode->type |= drm_mode_type_preferred; - - return mode; -} - -static int tmd_vid_get_panel_info(struct drm_device *dev, - int pipe, - struct panel_info *pi) -{ - if (!dev || !pi) - return -einval; - - pi->width_mm = tmd_panel_width; - pi->height_mm = tmd_panel_height; - - return 0; -} - -/* ************************************************************************* *\ - * function: mdfld_init_tmd_mipi - * - * description: this function is called only by mrst_dsi_mode_set and - * restore_display_registers. since this function does not - * acquire the mutex, it is important that the calling function - * does! -\* ************************************************************************* */ - -/* fixme: make the below data u8 instead of u32; note byte order! */ -static u32 tmd_cmd_mcap_off[] = {0x000000b2}; -static u32 tmd_cmd_enable_lane_switch[] = {0x000101ef}; -static u32 tmd_cmd_set_lane_num[] = {0x006360ef}; -static u32 tmd_cmd_pushing_clock0[] = {0x00cc2fef}; -static u32 tmd_cmd_pushing_clock1[] = {0x00dd6eef}; -static u32 tmd_cmd_set_mode[] = {0x000000b3}; -static u32 tmd_cmd_set_sync_pulse_mode[] = {0x000961ef}; -static u32 tmd_cmd_set_column[] = {0x0100002a, 0x000000df}; -static u32 tmd_cmd_set_page[] = {0x0300002b, 0x00000055}; -static u32 tmd_cmd_set_video_mode[] = {0x00000153}; -/*no auto_bl,need add in furture*/ -static u32 tmd_cmd_enable_backlight[] = {0x00005ab4}; -static u32 tmd_cmd_set_backlight_dimming[] = {0x00000ebd}; - -static void mdfld_dsi_tmd_drv_ic_init(struct mdfld_dsi_config *dsi_config, - int pipe) -{ - struct mdfld_dsi_pkg_sender *sender - = mdfld_dsi_get_pkg_sender(dsi_config); - - drm_info("enter mdfld init tmd mipi display. "); - - if (!sender) { - drm_error("cannot get sender "); - return; - } - - if (dsi_config->dvr_ic_inited) - return; - - msleep(3); - - /* fixme: make the below data u8 instead of u32; note byte order! */ - - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_mcap_off, - sizeof(tmd_cmd_mcap_off), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_enable_lane_switch, - sizeof(tmd_cmd_enable_lane_switch), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_set_lane_num, - sizeof(tmd_cmd_set_lane_num), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_pushing_clock0, - sizeof(tmd_cmd_pushing_clock0), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_pushing_clock1, - sizeof(tmd_cmd_pushing_clock1), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_set_mode, - sizeof(tmd_cmd_set_mode), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_set_sync_pulse_mode, - sizeof(tmd_cmd_set_sync_pulse_mode), false); - mdfld_dsi_send_mcs_long(sender, (u8 *) tmd_cmd_set_column, - sizeof(tmd_cmd_set_column), false); - mdfld_dsi_send_mcs_long(sender, (u8 *) tmd_cmd_set_page, - sizeof(tmd_cmd_set_page), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_set_video_mode, - sizeof(tmd_cmd_set_video_mode), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_enable_backlight, - sizeof(tmd_cmd_enable_backlight), false); - mdfld_dsi_send_gen_long(sender, (u8 *) tmd_cmd_set_backlight_dimming, - sizeof(tmd_cmd_set_backlight_dimming), false); - - dsi_config->dvr_ic_inited = 1; -} - -/*tpo dpi encoder helper funcs*/ -static const struct drm_encoder_helper_funcs - mdfld_tpo_dpi_encoder_helper_funcs = { - .dpms = mdfld_dsi_dpi_dpms, - .mode_fixup = mdfld_dsi_dpi_mode_fixup, - .prepare = mdfld_dsi_dpi_prepare, - .mode_set = mdfld_dsi_dpi_mode_set, - .commit = mdfld_dsi_dpi_commit, -}; - -const struct panel_funcs mdfld_tmd_vid_funcs = { - .encoder_helper_funcs = &mdfld_tpo_dpi_encoder_helper_funcs, - .get_config_mode = &tmd_vid_get_config_mode, - .get_panel_info = tmd_vid_get_panel_info, - .reset = mdfld_dsi_panel_reset, - .drv_ic_init = mdfld_dsi_tmd_drv_ic_init, -}; diff --git a/drivers/gpu/drm/gma500/mdfld_tpo_vid.c b/drivers/gpu/drm/gma500/mdfld_tpo_vid.c --- a/drivers/gpu/drm/gma500/mdfld_tpo_vid.c +++ /dev/null -/* - * copyright ©️ 2010 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - * authors: - * jim liu <jim.liu@intel.com> - * jackie li<yaodong.li@intel.com> - */ - -#include "mdfld_dsi_dpi.h" - -static struct drm_display_mode *tpo_vid_get_config_mode(struct drm_device *dev) -{ - struct drm_display_mode *mode; - - mode = kzalloc(sizeof(*mode), gfp_kernel); - if (!mode) - return null; - - mode->hdisplay = 864; - mode->vdisplay = 480; - mode->hsync_start = 873; - mode->hsync_end = 876; - mode->htotal = 887; - mode->vsync_start = 487; - mode->vsync_end = 490; - mode->vtotal = 499; - mode->clock = 33264; - - drm_mode_set_name(mode); - drm_mode_set_crtcinfo(mode, 0); - - mode->type |= drm_mode_type_preferred; - - return mode; -} - -static int tpo_vid_get_panel_info(struct drm_device *dev, - int pipe, - struct panel_info *pi) -{ - if (!dev || !pi) - return -einval; - - pi->width_mm = tpo_panel_width; - pi->height_mm = tpo_panel_height; - - return 0; -} - -/*tpo dpi encoder helper funcs*/ -static const struct drm_encoder_helper_funcs - mdfld_tpo_dpi_encoder_helper_funcs = { - .dpms = mdfld_dsi_dpi_dpms, - .mode_fixup = mdfld_dsi_dpi_mode_fixup, - .prepare = mdfld_dsi_dpi_prepare, - .mode_set = mdfld_dsi_dpi_mode_set, - .commit = mdfld_dsi_dpi_commit, -}; - -const struct panel_funcs mdfld_tpo_vid_funcs = { - .encoder_helper_funcs = &mdfld_tpo_dpi_encoder_helper_funcs, - .get_config_mode = &tpo_vid_get_config_mode, - .get_panel_info = tpo_vid_get_panel_info, -}; diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c - * powervr sgx540 - medfield - intel atom z2460 - * powervr sgx544mp2 - medfield - -#if defined(config_drm_medfield) - { 0x8086, 0x0130, pci_any_id, pci_any_id, 0, 0, (long) &mdfld_chip_ops }, - { 0x8086, 0x0131, pci_any_id, pci_any_id, 0, 0, (long) &mdfld_chip_ops }, - { 0x8086, 0x0132, pci_any_id, pci_any_id, 0, 0, (long) &mdfld_chip_ops }, - { 0x8086, 0x0133, pci_any_id, pci_any_id, 0, 0, (long) &mdfld_chip_ops }, - { 0x8086, 0x0134, pci_any_id, pci_any_id, 0, 0, (long) &mdfld_chip_ops }, - { 0x8086, 0x0135, pci_any_id, pci_any_id, 0, 0, (long) &mdfld_chip_ops }, - { 0x8086, 0x0136, pci_any_id, pci_any_id, 0, 0, (long) &mdfld_chip_ops }, - { 0x8086, 0x0137, pci_any_id, pci_any_id, 0, 0, (long) &mdfld_chip_ops }, -#endif diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h - chip_mfld_0130 = 3, /* medfield */ -#define is_mfld(drm) ((to_pci_dev((drm)->dev)->device & 0xfff8) == 0x0130) -#define mdfld_mmio_size 0x000100000 -#define _mdfld_mipia_flag (1<<16) -#define _mdfld_mipic_flag (1<<17) -/* this flag includes all the display irq bits excepts the vblank irqs. */ -#define _mdfld_disp_all_irq_flag (_mdfld_pipec_event_flag | \ - _mdfld_pipeb_event_flag | \ - _psb_pipea_event_flag | \ - _psb_vsync_pipea_flag | \ - _mdfld_mipia_flag | \ - _mdfld_mipic_flag) -#define mdfld_pnw_b0 0x04 -#define mdfld_pnw_c0 0x08 - -#define mdfld_dsr_2d_3d_0 (1 << 0) -#define mdfld_dsr_2d_3d_2 (1 << 1) -#define mdfld_dsr_cursor_0 (1 << 2) -#define mdfld_dsr_cursor_2 (1 << 3) -#define mdfld_dsr_overlay_0 (1 << 4) -#define mdfld_dsr_overlay_2 (1 << 5) -#define mdfld_dsr_mipi_control (1 << 6) -#define mdfld_dsr_damage_mask_0 ((1 << 0) | (1 << 2) | (1 << 4)) -#define mdfld_dsr_damage_mask_2 ((1 << 1) | (1 << 3) | (1 << 5)) -#define mdfld_dsr_2d_3d (mdfld_dsr_2d_3d_0 | mdfld_dsr_2d_3d_2) - -#define mdfld_dsr_rr 45 -#define mdfld_dpu_enable (1 << 31) -#define mdfld_dsr_fullscreen (1 << 30) -#define mdfld_dsr_delay (hz / mdfld_dsr_rr) - -struct medfield_state { - uint32_t savemipi; - uint32_t savemipi_c; - - uint32_t savepfit_control; - uint32_t savepfit_pgm_ratios; - uint32_t savehdmiphymiscctl; - uint32_t savehdmib_control; -}; - - struct medfield_state mdfld; - int mdfld_panel_id; - -/* mdlfd_device.c */ -extern const struct psb_ops mdfld_chip_ops; - -static inline u32 mdfld_msg_read32(int domain, uint port, uint offset) -{ - int mcr = (0x10<<24) | (port << 16) | (offset << 8); - uint32_t ret_val = 0; - struct pci_dev *pci_root = pci_get_domain_bus_and_slot(domain, 0, 0); - pci_write_config_dword(pci_root, 0xd0, mcr); - pci_read_config_dword(pci_root, 0xd4, &ret_val); - pci_dev_put(pci_root); - return ret_val; -} -static inline void mdfld_msg_write32(int domain, uint port, uint offset, - u32 value) -{ - int mcr = (0x11<<24) | (port << 16) | (offset << 8) | 0xf0; - struct pci_dev *pci_root = pci_get_domain_bus_and_slot(domain, 0, 0); - pci_write_config_dword(pci_root, 0xd4, value); - pci_write_config_dword(pci_root, 0xd0, mcr); - pci_dev_put(pci_root); -} diff --git a/drivers/gpu/drm/gma500/psb_intel_reg.h b/drivers/gpu/drm/gma500/psb_intel_reg.h --- a/drivers/gpu/drm/gma500/psb_intel_reg.h +++ b/drivers/gpu/drm/gma500/psb_intel_reg.h -#define fw_blc_self 0x20e0 +#define fw_blc_self 0x20e0 -#define mdfld_dpll_b 0x0f018 -#define mdfld_input_ref_sel (1 << 14) -#define mdfld_vco_sel (1 << 16) -#define mdfld_pll_latchen (1 << 28) -#define mdfld_pwr_gate_en (1 << 30) -#define mdfld_p1_mask (0x1ff << 17) -#define mdfld_dpll_div0 0x0f048 -#define mdfld_dpll_div1 0x0f04c -#define mdfld_dspcbase 0x7219c -#define dbi_resolution_reg 0xb024 /* reserved for mdfld */ diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c --- a/drivers/gpu/drm/gma500/psb_irq.c +++ b/drivers/gpu/drm/gma500/psb_irq.c -#include "mdfld_output.h" - if (pipe_stat_val & pipe_vblank_status || - (is_mfld(dev) && pipe_stat_val & pipe_te_status)) { + if (pipe_stat_val & pipe_vblank_status) { - /* fixme: handle medfield - if (vdc_stat & _mdfld_disp_all_irq_flag) - dsp_int = 1; - */ - - /* fixme: handle medfield irq mask - if (dev->vblank[1].enabled) - dev_priv->vdc_irq_mask |= _mdfld_pipeb_event_flag; - if (dev->vblank[2].enabled) - dev_priv->vdc_irq_mask |= _mdfld_pipec_event_flag; - */ - - /* medfield is different - we should perhaps extract out vblank - and blacklight etc ops */ - if (is_mfld(dev)) - return mdfld_enable_te(dev, pipe); - - if (is_mfld(dev)) - mdfld_disable_te(dev, pipe); -/* - * it is used to enable te interrupt - */ -int mdfld_enable_te(struct drm_device *dev, int pipe) -{ - struct drm_psb_private *dev_priv = - (struct drm_psb_private *) dev->dev_private; - unsigned long irqflags; - uint32_t reg_val = 0; - uint32_t pipeconf_reg = mid_pipeconf(pipe); - - if (gma_power_begin(dev, false)) { - reg_val = reg_read(pipeconf_reg); - gma_power_end(dev); - } - - if (!(reg_val & pipeaconf_enable)) - return -einval; - - spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags); - - mid_enable_pipe_event(dev_priv, pipe); - psb_enable_pipestat(dev_priv, pipe, pipe_te_enable); - - spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags); - - return 0; -} - -/* - * it is used to disable te interrupt - */ -void mdfld_disable_te(struct drm_device *dev, int pipe) -{ - struct drm_psb_private *dev_priv = - (struct drm_psb_private *) dev->dev_private; - unsigned long irqflags; - - if (!dev_priv->dsr_enable) - return; - - spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags); - - mid_disable_pipe_event(dev_priv, pipe); - psb_disable_pipestat(dev_priv, pipe, pipe_te_enable); - - spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags); -} - diff --git a/drivers/gpu/drm/gma500/psb_irq.h b/drivers/gpu/drm/gma500/psb_irq.h --- a/drivers/gpu/drm/gma500/psb_irq.h +++ b/drivers/gpu/drm/gma500/psb_irq.h -int mdfld_enable_te(struct drm_device *dev, int pipe); -void mdfld_disable_te(struct drm_device *dev, int pipe); diff --git a/drivers/gpu/drm/gma500/psb_reg.h b/drivers/gpu/drm/gma500/psb_reg.h --- a/drivers/gpu/drm/gma500/psb_reg.h +++ b/drivers/gpu/drm/gma500/psb_reg.h -#define mdfld_pwrgt_display_a_cntr 0x0000000c -#define mdfld_pwrgt_display_b_cntr 0x0000c000 -#define mdfld_pwrgt_display_c_cntr 0x00030000 -#define mdfld_pwrgt_disp_mipi_cntr 0x000c0000 -#define mdfld_pwrgt_display_cntr (mdfld_pwrgt_display_a_cntr | mdfld_pwrgt_display_b_cntr | mdfld_pwrgt_display_c_cntr | mdfld_pwrgt_disp_mipi_cntr) /* 0x000fc00c */ -#define mdfld_pwrgt_display_a_sts 0x000000c0 -#define mdfld_pwrgt_display_b_sts 0x00000300 -#define mdfld_pwrgt_display_c_sts 0x00000c00 -#define mdfld_pwrgt_display_a_sts_b0 0x0000000c -#define mdfld_pwrgt_display_b_sts_b0 0x0000c000 -#define mdfld_pwrgt_display_c_sts_b0 0x00030000 -#define mdfld_pwrgt_disp_mipi_sts 0x000c0000 -#define mdfld_pwrgt_display_sts_a0 (mdfld_pwrgt_display_a_sts | mdfld_pwrgt_display_b_sts | mdfld_pwrgt_display_c_sts | mdfld_pwrgt_disp_mipi_sts) /* 0x000fc00c */ -#define mdfld_pwrgt_display_sts_b0 (mdfld_pwrgt_display_a_sts_b0 | mdfld_pwrgt_display_b_sts_b0 | mdfld_pwrgt_display_c_sts_b0 | mdfld_pwrgt_disp_mipi_sts) /* 0x000fc00c */ diff --git a/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c b/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c --- a/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c +++ /dev/null -/* - * copyright ©️ 2011 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - */ - -#include <linux/delay.h> -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/gpio/consumer.h> - -#include <asm/intel_scu_ipc.h> - -#include "mdfld_dsi_dpi.h" -#include "mdfld_dsi_pkg_sender.h" -#include "mdfld_output.h" -#include "tc35876x-dsi-lvds.h" - -static struct i2c_client *tc35876x_client; -static struct i2c_client *cmi_lcd_i2c_client; -/* panel gpios */ -static struct gpio_desc *bridge_reset; -static struct gpio_desc *bridge_bl_enable; -static struct gpio_desc *backlight_voltage; - - -#define fld_mask(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end)) -#define fld_val(val, start, end) (((val) << (end)) & fld_mask(start, end)) - -/* dsi d-phy layer registers */ -#define d0w_dphyconttx 0x0004 -#define clw_dphycontrx 0x0020 -#define d0w_dphycontrx 0x0024 -#define d1w_dphycontrx 0x0028 -#define d2w_dphycontrx 0x002c -#define d3w_dphycontrx 0x0030 -#define com_dphycontrx 0x0038 -#define clw_cntrl 0x0040 -#define d0w_cntrl 0x0044 -#define d1w_cntrl 0x0048 -#define d2w_cntrl 0x004c -#define d3w_cntrl 0x0050 -#define dftmode_cntrl 0x0054 - -/* dsi ppi layer registers */ -#define ppi_startppi 0x0104 -#define ppi_busyppi 0x0108 -#define ppi_lineinitcnt 0x0110 -#define ppi_lptxtimecnt 0x0114 -#define ppi_laneenable 0x0134 -#define ppi_tx_rx_ta 0x013c -#define ppi_cls_atmr 0x0140 -#define ppi_d0s_atmr 0x0144 -#define ppi_d1s_atmr 0x0148 -#define ppi_d2s_atmr 0x014c -#define ppi_d3s_atmr 0x0150 -#define ppi_d0s_clrsipocount 0x0164 -#define ppi_d1s_clrsipocount 0x0168 -#define ppi_d2s_clrsipocount 0x016c -#define ppi_d3s_clrsipocount 0x0170 -#define cls_pre 0x0180 -#define d0s_pre 0x0184 -#define d1s_pre 0x0188 -#define d2s_pre 0x018c -#define d3s_pre 0x0190 -#define cls_prep 0x01a0 -#define d0s_prep 0x01a4 -#define d1s_prep 0x01a8 -#define d2s_prep 0x01ac -#define d3s_prep 0x01b0 -#define cls_zero 0x01c0 -#define d0s_zero 0x01c4 -#define d1s_zero 0x01c8 -#define d2s_zero 0x01cc -#define d3s_zero 0x01d0 -#define ppi_clrflg 0x01e0 -#define ppi_clrsipo 0x01e4 -#define hstimeout 0x01f0 -#define hstimeoutenable 0x01f4 - -/* dsi protocol layer registers */ -#define dsi_startdsi 0x0204 -#define dsi_busydsi 0x0208 -#define dsi_laneenable 0x0210 -#define dsi_lanestatus0 0x0214 -#define dsi_lanestatus1 0x0218 -#define dsi_intstatus 0x0220 -#define dsi_intmask 0x0224 -#define dsi_intclr 0x0228 -#define dsi_lptxto 0x0230 - -/* dsi general registers */ -#define dsierrcnt 0x0300 - -/* dsi application layer registers */ -#define aplctrl 0x0400 -#define rdpktln 0x0404 - -/* video path registers */ -#define vpctrl 0x0450 -#define htim1 0x0454 -#define htim2 0x0458 -#define vtim1 0x045c -#define vtim2 0x0460 -#define vfuen 0x0464 - -/* lvds registers */ -#define lvmx0003 0x0480 -#define lvmx0407 0x0484 -#define lvmx0811 0x0488 -#define lvmx1215 0x048c -#define lvmx1619 0x0490 -#define lvmx2023 0x0494 -#define lvmx2427 0x0498 -#define lvcfg 0x049c -#define lvphy0 0x04a0 -#define lvphy1 0x04a4 - -/* system registers */ -#define sysstat 0x0500 -#define sysrst 0x0504 - -/* gpio registers */ -/*#define gpioc 0x0520*/ -#define gpioo 0x0524 -#define gpioi 0x0528 - -/* i2c registers */ -#define i2ctimctrl 0x0540 -#define i2cmaddr 0x0544 -#define wdataq 0x0548 -#define rdataq 0x054c - -/* chip/rev registers */ -#define idreg 0x0580 - -/* debug registers */ -#define debug00 0x05a0 -#define debug01 0x05a4 - -/* panel cabc registers */ -#define panel_pwm_control 0x90 -#define panel_freq_divider_hi 0x91 -#define panel_freq_divider_lo 0x92 -#define panel_duty_control 0x93 -#define panel_modify_rgb 0x94 -#define panel_framerate_control 0x96 -#define panel_pwm_min 0x97 -#define panel_pwm_ref 0x98 -#define panel_pwm_max 0x99 -#define panel_allow_distort 0x9a -#define panel_bypass_pwmi 0x9b - -/* panel color management registers */ -#define panel_cm_enable 0x700 -#define panel_cm_hue 0x701 -#define panel_cm_saturation 0x702 -#define panel_cm_intensity 0x703 -#define panel_cm_brightness 0x704 -#define panel_cm_ce_enable 0x705 -#define panel_cm_peak_en 0x710 -#define panel_cm_gain 0x711 -#define panel_cm_huetable_start 0x730 -#define panel_cm_huetable_end 0x747 /* inclusive */ - -/* input muxing for registers lvmx0003...lvmx2427 */ -enum { - input_r0, /* 0 */ - input_r1, - input_r2, - input_r3, - input_r4, - input_r5, - input_r6, - input_r7, - input_g0, /* 8 */ - input_g1, - input_g2, - input_g3, - input_g4, - input_g5, - input_g6, - input_g7, - input_b0, /* 16 */ - input_b1, - input_b2, - input_b3, - input_b4, - input_b5, - input_b6, - input_b7, - input_hsync, /* 24 */ - input_vsync, - input_de, - logic_0, - /* 28...31 undefined */ -}; - -#define input_mux(lvmx03, lvmx02, lvmx01, lvmx00) \ - (fld_val(lvmx03, 29, 24) | fld_val(lvmx02, 20, 16) | \ - fld_val(lvmx01, 12, 8) | fld_val(lvmx00, 4, 0)) - -/** - * tc35876x_regw - write dsi-lvds bridge register using i2c - * @client: struct i2c_client to use - * @reg: register address - * @value: value to write - * - * returns 0 on success, or a negative error value. - */ -static int tc35876x_regw(struct i2c_client *client, u16 reg, u32 value) -{ - int r; - u8 tx_data[] = { - /* note: register address big-endian, data little-endian. */ - (reg >> 8) & 0xff, - reg & 0xff, - value & 0xff, - (value >> 8) & 0xff, - (value >> 16) & 0xff, - (value >> 24) & 0xff, - }; - struct i2c_msg msgs[] = { - { - .addr = client->addr, - .flags = 0, - .buf = tx_data, - .len = array_size(tx_data), - }, - }; - - r = i2c_transfer(client->adapter, msgs, array_size(msgs)); - if (r < 0) { - dev_err(&client->dev, "%s: reg 0x%04x val 0x%08x error %d ", - __func__, reg, value, r); - return r; - } - - if (r < array_size(msgs)) { - dev_err(&client->dev, "%s: reg 0x%04x val 0x%08x msgs %d ", - __func__, reg, value, r); - return -eagain; - } - - dev_dbg(&client->dev, "%s: reg 0x%04x val 0x%08x ", - __func__, reg, value); - - return 0; -} - -/** - * tc35876x_regr - read dsi-lvds bridge register using i2c - * @client: struct i2c_client to use - * @reg: register address - * @value: pointer for storing the value - * - * returns 0 on success, or a negative error value. - */ -static int tc35876x_regr(struct i2c_client *client, u16 reg, u32 *value) -{ - int r; - u8 tx_data[] = { - (reg >> 8) & 0xff, - reg & 0xff, - }; - u8 rx_data[4]; - struct i2c_msg msgs[] = { - { - .addr = client->addr, - .flags = 0, - .buf = tx_data, - .len = array_size(tx_data), - }, - { - .addr = client->addr, - .flags = i2c_m_rd, - .buf = rx_data, - .len = array_size(rx_data), - }, - }; - - r = i2c_transfer(client->adapter, msgs, array_size(msgs)); - if (r < 0) { - dev_err(&client->dev, "%s: reg 0x%04x error %d ", __func__, - reg, r); - return r; - } - - if (r < array_size(msgs)) { - dev_err(&client->dev, "%s: reg 0x%04x msgs %d ", __func__, - reg, r); - return -eagain; - } - - *value = rx_data[0] << 24 | rx_data[1] << 16 | - rx_data[2] << 8 | rx_data[3]; - - dev_dbg(&client->dev, "%s: reg 0x%04x value 0x%08x ", __func__, - reg, *value); - - return 0; -} - -void tc35876x_set_bridge_reset_state(struct drm_device *dev, int state) -{ - if (warn(!tc35876x_client, "%s called before probe", __func__)) - return; - - dev_dbg(&tc35876x_client->dev, "%s: state %d ", __func__, state); - - if (!bridge_reset) - return; - - if (state) { - gpiod_set_value_cansleep(bridge_reset, 0); - mdelay(10); - } else { - /* pull mipi bridge reset pin to low */ - gpiod_set_value_cansleep(bridge_reset, 0); - mdelay(20); - /* pull mipi bridge reset pin to high */ - gpiod_set_value_cansleep(bridge_reset, 1); - mdelay(40); - } -} - -void tc35876x_configure_lvds_bridge(struct drm_device *dev) -{ - struct i2c_client *i2c = tc35876x_client; - u32 ppi_lptxtimecnt; - u32 txtagocnt; - u32 txtasurecnt; - u32 id; - - if (warn(!tc35876x_client, "%s called before probe", __func__)) - return; - - dev_dbg(&tc35876x_client->dev, "%s ", __func__); - - if (!tc35876x_regr(i2c, idreg, &id)) - dev_info(&tc35876x_client->dev, "tc35876x id 0x%08x ", id); - else - dev_err(&tc35876x_client->dev, "cannot read id "); - - ppi_lptxtimecnt = 4; - txtagocnt = (5 * ppi_lptxtimecnt - 3) / 4; - txtasurecnt = 3 * ppi_lptxtimecnt / 2; - tc35876x_regw(i2c, ppi_tx_rx_ta, fld_val(txtagocnt, 26, 16) | - fld_val(txtasurecnt, 10, 0)); - tc35876x_regw(i2c, ppi_lptxtimecnt, fld_val(ppi_lptxtimecnt, 10, 0)); - - tc35876x_regw(i2c, ppi_d0s_clrsipocount, fld_val(1, 5, 0)); - tc35876x_regw(i2c, ppi_d1s_clrsipocount, fld_val(1, 5, 0)); - tc35876x_regw(i2c, ppi_d2s_clrsipocount, fld_val(1, 5, 0)); - tc35876x_regw(i2c, ppi_d3s_clrsipocount, fld_val(1, 5, 0)); - - /* enabling mipi & ppi lanes, enable 4 lanes */ - tc35876x_regw(i2c, ppi_laneenable, - bit(4) | bit(3) | bit(2) | bit(1) | bit(0)); - tc35876x_regw(i2c, dsi_laneenable, - bit(4) | bit(3) | bit(2) | bit(1) | bit(0)); - tc35876x_regw(i2c, ppi_startppi, bit(0)); - tc35876x_regw(i2c, dsi_startdsi, bit(0)); - - /* setting lvds output frequency */ - tc35876x_regw(i2c, lvphy0, fld_val(1, 20, 16) | - fld_val(2, 15, 14) | fld_val(6, 4, 0)); /* 0x00048006 */ - - /* setting video panel control register,0x00000120 vtgen=on ?!?!? */ - tc35876x_regw(i2c, vpctrl, bit(8) | bit(5)); - - /* horizontal back porch and horizontal pulse width. 0x00280028 */ - tc35876x_regw(i2c, htim1, fld_val(40, 24, 16) | fld_val(40, 8, 0)); - - /* horizontal front porch and horizontal active video size. 0x00500500*/ - tc35876x_regw(i2c, htim2, fld_val(80, 24, 16) | fld_val(1280, 10, 0)); - - /* vertical back porch and vertical sync pulse width. 0x000e000a */ - tc35876x_regw(i2c, vtim1, fld_val(14, 23, 16) | fld_val(10, 7, 0)); - - /* vertical front porch and vertical display size. 0x000e0320 */ - tc35876x_regw(i2c, vtim2, fld_val(14, 23, 16) | fld_val(800, 10, 0)); - - /* set above htim1, htim2, vtim1, and vtim2 at next vsync. */ - tc35876x_regw(i2c, vfuen, bit(0)); - - /* soft reset lcd controller. */ - tc35876x_regw(i2c, sysrst, bit(2)); - - /* lvds-tx input muxing */ - tc35876x_regw(i2c, lvmx0003, - input_mux(input_r5, input_r4, input_r3, input_r2)); - tc35876x_regw(i2c, lvmx0407, - input_mux(input_g2, input_r7, input_r1, input_r6)); - tc35876x_regw(i2c, lvmx0811, - input_mux(input_g1, input_g0, input_g4, input_g3)); - tc35876x_regw(i2c, lvmx1215, - input_mux(input_b2, input_g7, input_g6, input_g5)); - tc35876x_regw(i2c, lvmx1619, - input_mux(input_b4, input_b3, input_b1, input_b0)); - tc35876x_regw(i2c, lvmx2023, - input_mux(logic_0, input_b7, input_b6, input_b5)); - tc35876x_regw(i2c, lvmx2427, - input_mux(input_r0, input_de, input_vsync, input_hsync)); - - /* enable lvds transmitter. */ - tc35876x_regw(i2c, lvcfg, bit(0)); - - /* clear notifications. don't write reserved bits. was write 0xffffffff - * to 0x0288, must be in error?! */ - tc35876x_regw(i2c, dsi_intclr, fld_mask(31, 30) | fld_mask(22, 0)); -} - -#define gpiopwmctrl 0x38f -#define pwm0clkdiv0 0x62 /* low byte */ -#define pwm0clkdiv1 0x61 /* high byte */ - -#define systemclk 19200000ul /* 19.2 mhz */ -#define pwm_frequency 9600 /* hz */ - -/* f = baseclk / (clkdiv + 1) => clkdiv = (baseclk - f) / f */ -static inline u16 calc_clkdiv(unsigned long baseclk, unsigned int f) -{ - return (baseclk - f) / f; -} - -static void tc35876x_brightness_init(struct drm_device *dev) -{ - int ret; - u8 pwmctrl; - u16 clkdiv; - - /* make sure the pwm reference is the 19.2 mhz system clock. read first - * instead of setting directly to catch potential conflicts between pwm - * users. */ - ret = intel_scu_ipc_ioread8(gpiopwmctrl, &pwmctrl); - if (ret || pwmctrl != 0x01) { - if (ret) - dev_err(dev->dev, "gpiopwmctrl read failed "); - else - dev_warn(dev->dev, "gpiopwmctrl was not set to system clock (pwmctrl = 0x%02x) ", pwmctrl); - - ret = intel_scu_ipc_iowrite8(gpiopwmctrl, 0x01); - if (ret) - dev_err(dev->dev, "gpiopwmctrl set failed "); - } - - clkdiv = calc_clkdiv(systemclk, pwm_frequency); - - ret = intel_scu_ipc_iowrite8(pwm0clkdiv1, (clkdiv >> 8) & 0xff); - if (!ret) - ret = intel_scu_ipc_iowrite8(pwm0clkdiv0, clkdiv & 0xff); - - if (ret) - dev_err(dev->dev, "pwm0clkdiv set failed "); - else - dev_dbg(dev->dev, "pwm0clkdiv set to 0x%04x (%d hz) ", - clkdiv, pwm_frequency); -} - -#define pwm0dutycycle 0x67 - -void tc35876x_brightness_control(struct drm_device *dev, int level) -{ - int ret; - u8 duty_val; - u8 panel_duty_val; - - level = clamp(level, 0, mdfld_dsi_brightness_max_level); - - /* pwm duty cycle 0x00...0x63 corresponds to 0...99% */ - duty_val = level * 0x63 / mdfld_dsi_brightness_max_level; - - /* i won't pretend to understand this formula. the panel spec is quite - * bad engrish. - */ - panel_duty_val = (2 * level - 100) * 0xa9 / - mdfld_dsi_brightness_max_level + 0x56; - - ret = intel_scu_ipc_iowrite8(pwm0dutycycle, duty_val); - if (ret) - dev_err(&tc35876x_client->dev, "%s: ipc write fail ", - __func__); - - if (cmi_lcd_i2c_client) { - ret = i2c_smbus_write_byte_data(cmi_lcd_i2c_client, - panel_pwm_max, panel_duty_val); - if (ret < 0) - dev_err(&cmi_lcd_i2c_client->dev, "%s: i2c write failed ", - __func__); - } -} - -void tc35876x_toshiba_bridge_panel_off(struct drm_device *dev) -{ - if (warn(!tc35876x_client, "%s called before probe", __func__)) - return; - - dev_dbg(&tc35876x_client->dev, "%s ", __func__); - - if (bridge_bl_enable) - gpiod_set_value_cansleep(bridge_bl_enable, 0); - - if (backlight_voltage) - gpiod_set_value_cansleep(backlight_voltage, 0); -} - -void tc35876x_toshiba_bridge_panel_on(struct drm_device *dev) -{ - struct drm_psb_private *dev_priv = dev->dev_private; - - if (warn(!tc35876x_client, "%s called before probe", __func__)) - return; - - dev_dbg(&tc35876x_client->dev, "%s ", __func__); - - if (backlight_voltage) { - gpiod_set_value_cansleep(backlight_voltage, 1); - msleep(260); - } - - if (cmi_lcd_i2c_client) { - int ret; - dev_dbg(&cmi_lcd_i2c_client->dev, "setting tcon "); - /* bit 4 is average_saving. setting it to 1, the brightness is - * referenced to the average of the frame content. 0 means - * reference to the maximum of frame contents. bits 3:0 are - * allow_distort. when set to a nonzero value, all color values - * between 255-allow_distort*2 and 255 are mapped to the - * 255-allow_distort*2 value. - */ - ret = i2c_smbus_write_byte_data(cmi_lcd_i2c_client, - panel_allow_distort, 0x10); - if (ret < 0) - dev_err(&cmi_lcd_i2c_client->dev, - "i2c write failed (%d) ", ret); - ret = i2c_smbus_write_byte_data(cmi_lcd_i2c_client, - panel_bypass_pwmi, 0); - if (ret < 0) - dev_err(&cmi_lcd_i2c_client->dev, - "i2c write failed (%d) ", ret); - /* set minimum brightness value - this is tunable */ - ret = i2c_smbus_write_byte_data(cmi_lcd_i2c_client, - panel_pwm_min, 0x35); - if (ret < 0) - dev_err(&cmi_lcd_i2c_client->dev, - "i2c write failed (%d) ", ret); - } - - if (bridge_bl_enable) - gpiod_set_value_cansleep(bridge_bl_enable, 1); - - tc35876x_brightness_control(dev, dev_priv->brightness_adjusted); -} - -static struct drm_display_mode *tc35876x_get_config_mode(struct drm_device *dev) -{ - struct drm_display_mode *mode; - - dev_dbg(dev->dev, "%s ", __func__); - - mode = kzalloc(sizeof(*mode), gfp_kernel); - if (!mode) - return null; - - /* fixme: do this properly. */ - mode->hdisplay = 1280; - mode->vdisplay = 800; - mode->hsync_start = 1360; - mode->hsync_end = 1400; - mode->htotal = 1440; - mode->vsync_start = 814; - mode->vsync_end = 824; - mode->vtotal = 838; - mode->clock = 33324 << 1; - - dev_info(dev->dev, "hdisplay(w) = %d ", mode->hdisplay); - dev_info(dev->dev, "vdisplay(h) = %d ", mode->vdisplay); - dev_info(dev->dev, "hss = %d ", mode->hsync_start); - dev_info(dev->dev, "hse = %d ", mode->hsync_end); - dev_info(dev->dev, "htotal = %d ", mode->htotal); - dev_info(dev->dev, "vss = %d ", mode->vsync_start); - dev_info(dev->dev, "vse = %d ", mode->vsync_end); - dev_info(dev->dev, "vtotal = %d ", mode->vtotal); - dev_info(dev->dev, "clock = %d ", mode->clock); - - drm_mode_set_name(mode); - drm_mode_set_crtcinfo(mode, 0); - - mode->type |= drm_mode_type_preferred; - - return mode; -} - -/* dv1 active area 216.96 x 135.6 mm */ -#define dv1_panel_width 217 -#define dv1_panel_height 136 - -static int tc35876x_get_panel_info(struct drm_device *dev, int pipe, - struct panel_info *pi) -{ - if (!dev || !pi) - return -einval; - - pi->width_mm = dv1_panel_width; - pi->height_mm = dv1_panel_height; - - return 0; -} - -static int tc35876x_bridge_probe(struct i2c_client *client, - const struct i2c_device_id *id) -{ - dev_info(&client->dev, "%s ", __func__); - - if (!i2c_check_functionality(client->adapter, i2c_func_i2c)) { - dev_err(&client->dev, "%s: i2c_check_functionality() failed ", - __func__); - return -enodev; - } - - bridge_reset = devm_gpiod_get_optional(&client->dev, "bridge-reset", gpiod_out_low); - if (is_err(bridge_reset)) - return ptr_err(bridge_reset); - if (bridge_reset) - gpiod_set_consumer_name(bridge_reset, "tc35876x bridge reset"); - - bridge_bl_enable = devm_gpiod_get_optional(&client->dev, "bl-en", gpiod_out_low); - if (is_err(bridge_bl_enable)) - return ptr_err(bridge_bl_enable); - if (bridge_bl_enable) - gpiod_set_consumer_name(bridge_bl_enable, "tc35876x panel bl en"); - - backlight_voltage = devm_gpiod_get_optional(&client->dev, "vadd", gpiod_out_low); - if (is_err(backlight_voltage)) - return ptr_err(backlight_voltage); - if (backlight_voltage) - gpiod_set_consumer_name(backlight_voltage, "tc35876x panel vadd"); - - tc35876x_client = client; - - return 0; -} - -static int tc35876x_bridge_remove(struct i2c_client *client) -{ - dev_dbg(&client->dev, "%s ", __func__); - - tc35876x_client = null; - - return 0; -} - -static const struct i2c_device_id tc35876x_bridge_id[] = { - { "i2c_disp_brig", 0 }, - { } -}; -module_device_table(i2c, tc35876x_bridge_id); - -static struct i2c_driver tc35876x_bridge_i2c_driver = { - .driver = { - .name = "i2c_disp_brig", - }, - .id_table = tc35876x_bridge_id, - .probe = tc35876x_bridge_probe, - .remove = tc35876x_bridge_remove, -}; - -/* lcd panel i2c */ -static int cmi_lcd_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) -{ - dev_info(&client->dev, "%s ", __func__); - - if (!i2c_check_functionality(client->adapter, i2c_func_i2c)) { - dev_err(&client->dev, "%s: i2c_check_functionality() failed ", - __func__); - return -enodev; - } - - cmi_lcd_i2c_client = client; - - return 0; -} - -static int cmi_lcd_i2c_remove(struct i2c_client *client) -{ - dev_dbg(&client->dev, "%s ", __func__); - - cmi_lcd_i2c_client = null; - - return 0; -} - -static const struct i2c_device_id cmi_lcd_i2c_id[] = { - { "cmi-lcd", 0 }, - { } -}; -module_device_table(i2c, cmi_lcd_i2c_id); - -static struct i2c_driver cmi_lcd_i2c_driver = { - .driver = { - .name = "cmi-lcd", - }, - .id_table = cmi_lcd_i2c_id, - .probe = cmi_lcd_i2c_probe, - .remove = cmi_lcd_i2c_remove, -}; - -/* hack to create i2c device while it's not created by platform code */ -#define cmi_lcd_i2c_adapter 2 -#define cmi_lcd_i2c_addr 0x60 - -static int cmi_lcd_hack_create_device(void) -{ - struct i2c_adapter *adapter; - struct i2c_client *client; - struct i2c_board_info info = { - .type = "cmi-lcd", - .addr = cmi_lcd_i2c_addr, - }; - - pr_debug("%s ", __func__); - - adapter = i2c_get_adapter(cmi_lcd_i2c_adapter); - if (!adapter) { - pr_err("%s: i2c_get_adapter(%d) failed ", __func__, - cmi_lcd_i2c_adapter); - return -einval; - } - - client = i2c_new_client_device(adapter, &info); - if (is_err(client)) { - pr_err("%s: creating i2c device failed ", __func__); - i2c_put_adapter(adapter); - return ptr_err(client); - } - - return 0; -} - -static const struct drm_encoder_helper_funcs tc35876x_encoder_helper_funcs = { - .dpms = mdfld_dsi_dpi_dpms, - .mode_fixup = mdfld_dsi_dpi_mode_fixup, - .prepare = mdfld_dsi_dpi_prepare, - .mode_set = mdfld_dsi_dpi_mode_set, - .commit = mdfld_dsi_dpi_commit, -}; - -const struct panel_funcs mdfld_tc35876x_funcs = { - .encoder_helper_funcs = &tc35876x_encoder_helper_funcs, - .get_config_mode = tc35876x_get_config_mode, - .get_panel_info = tc35876x_get_panel_info, -}; - -void tc35876x_init(struct drm_device *dev) -{ - int r; - - dev_dbg(dev->dev, "%s ", __func__); - - cmi_lcd_hack_create_device(); - - r = i2c_add_driver(&cmi_lcd_i2c_driver); - if (r < 0) - dev_err(dev->dev, - "%s: i2c_add_driver() for %s failed (%d) ", - __func__, cmi_lcd_i2c_driver.driver.name, r); - - r = i2c_add_driver(&tc35876x_bridge_i2c_driver); - if (r < 0) - dev_err(dev->dev, - "%s: i2c_add_driver() for %s failed (%d) ", - __func__, tc35876x_bridge_i2c_driver.driver.name, r); - - tc35876x_brightness_init(dev); -} - -void tc35876x_exit(void) -{ - pr_debug("%s ", __func__); - - i2c_del_driver(&tc35876x_bridge_i2c_driver); - - if (cmi_lcd_i2c_client) - i2c_del_driver(&cmi_lcd_i2c_driver); -} diff --git a/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.h b/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.h --- a/drivers/gpu/drm/gma500/tc35876x-dsi-lvds.h +++ /dev/null -/* - * copyright ©️ 2011 intel corporation - * - * permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "software"), - * to deal in the software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the software, and to permit persons to whom the - * software is furnished to do so, subject to the following conditions: - * - * the above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * software. - * - * the software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. in no event shall - * the authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising - * from, out of or in connection with the software or the use or other - * dealings in the software. - * - */ - -#ifndef __mdfld_dsi_lvds_bridge_h__ -#define __mdfld_dsi_lvds_bridge_h__ - -void tc35876x_set_bridge_reset_state(struct drm_device *dev, int state); -void tc35876x_configure_lvds_bridge(struct drm_device *dev); -void tc35876x_brightness_control(struct drm_device *dev, int level); -void tc35876x_toshiba_bridge_panel_off(struct drm_device *dev); -void tc35876x_toshiba_bridge_panel_on(struct drm_device *dev); -void tc35876x_init(struct drm_device *dev); -void tc35876x_exit(void); - -extern const struct panel_funcs mdfld_tc35876x_funcs; - -#endif /*__mdfld_dsi_lvds_bridge_h__*/
|
Graphics
|
b51035c200bd3423ae5b6b98b54735ef424dc746
|
thomas zimmermann
|
drivers
|
gpu
|
drm, gma500
|
drm/lima: add governor data with pre-defined thresholds
|
this patch adapts the panfrost pre-defined thresholds change [0] to the lima driver to improve real-world performance. the upthreshold value has been set to ramp gpu frequency to max freq faster (compared to panfrost) to compensate for the lower overall performance of utgard devices.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add governor data with pre-defined thresholds
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['lima ']
|
['h', 'c']
| 2
| 11
| 1
|
--- diff --git a/drivers/gpu/drm/lima/lima_devfreq.c b/drivers/gpu/drm/lima/lima_devfreq.c --- a/drivers/gpu/drm/lima/lima_devfreq.c +++ b/drivers/gpu/drm/lima/lima_devfreq.c + /* + * setup default thresholds for the simple_ondemand governor. + * the values are chosen based on experiments. + */ + ldevfreq->gov_data.upthreshold = 30; + ldevfreq->gov_data.downdifferential = 5; + - devfreq_gov_simple_ondemand, null); + devfreq_gov_simple_ondemand, + &ldevfreq->gov_data); diff --git a/drivers/gpu/drm/lima/lima_devfreq.h b/drivers/gpu/drm/lima/lima_devfreq.h --- a/drivers/gpu/drm/lima/lima_devfreq.h +++ b/drivers/gpu/drm/lima/lima_devfreq.h +#include <linux/devfreq.h> + struct devfreq_simple_ondemand_data gov_data;
|
Graphics
|
1d048afe7e52462d6b2a31dd6ee09c4475f39b4b
|
christian hewitt
|
drivers
|
gpu
|
drm, lima
|
drm/panel-simple: add n116bca-ea1
|
this panel is quite similar to the similarly named n116bge panel (the nominal timings are, in fact identical). however, let's add a new entry because the full range of clocks listed for n116bge aren't supported for n116bca-ea1, at least according to the datasheet.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add n116bca-ea1
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['panel-simple ']
|
['c']
| 1
| 33
| 0
|
--- diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c +static const struct drm_display_mode innolux_n116bca_ea1_mode = { + .clock = 76420, + .hdisplay = 1366, + .hsync_start = 1366 + 136, + .hsync_end = 1366 + 136 + 30, + .htotal = 1366 + 136 + 30 + 60, + .vdisplay = 768, + .vsync_start = 768 + 8, + .vsync_end = 768 + 8 + 12, + .vtotal = 768 + 8 + 12 + 12, + .flags = drm_mode_flag_nhsync | drm_mode_flag_nvsync, +}; + +static const struct panel_desc innolux_n116bca_ea1 = { + .modes = &innolux_n116bca_ea1_mode, + .num_modes = 1, + .bpc = 6, + .size = { + .width = 256, + .height = 144, + }, + .delay = { + .hpd_absent_delay = 200, + .prepare_to_enable = 80, + .unprepare = 500, + }, + .bus_format = media_bus_fmt_rgb666_1x18, + .connector_type = drm_mode_connector_edp, +}; + + }, { + .compatible = "innolux,n116bca-ea1", + .data = &innolux_n116bca_ea1,
|
Graphics
|
51d35631c9704b5e5219de15904809367a774297
|
douglas anderson stephen boyd swboyd chromium org linus walleij linus walleij linaro org
|
drivers
|
gpu
|
drm, panel
|
drm/panfrost: add governor data with pre-defined thresholds
|
the simple_ondemand devfreq governor uses two thresholds to decide about the frequency change: upthreshold, downdifferential. these two tunable change the behavior of the governor decision, e.g. how fast to increase the frequency or how rapidly limit the frequency. this patch adds needed governor data with thresholds values gathered experimentally in different workloads.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
add governor data with pre-defined thresholds
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['panfrost ']
|
['h', 'c']
| 2
| 11
| 1
|
--- diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c + /* + * setup default thresholds for the simple_ondemand governor. + * the values are chosen based on experiments. + */ + pfdevfreq->gov_data.upthreshold = 45; + pfdevfreq->gov_data.downdifferential = 5; + - devfreq_gov_simple_ondemand, null); + devfreq_gov_simple_ondemand, + &pfdevfreq->gov_data); diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.h b/drivers/gpu/drm/panfrost/panfrost_devfreq.h --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.h +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.h +#include <linux/devfreq.h> + struct devfreq_simple_ondemand_data gov_data;
|
Graphics
|
1f8644d56e91f1c3cbeb1a36c3a998397d06b9dc
|
lukasz luba steven price steven price arm com
|
drivers
|
gpu
|
drm, panfrost
|
drm/tegra: dc: implement hardware cursor on tegra186 and later
|
the hardware cursor on tegra186 differs slightly from the implementation on older soc generations. in particular the new implementation relies on software for clipping the cursor against the screen. fortunately, atomic kms already computes clipped coordinates for (cursor) planes, so this is trivial to implement.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
implement hardware cursor on tegra186 and later
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['tegra ']
|
['h', 'c']
| 2
| 58
| 8
|
--- diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c -static const u32 tegra_cursor_plane_formats[] = { +static const u32 tegra_legacy_cursor_plane_formats[] = { +static const u32 tegra_cursor_plane_formats[] = { + drm_format_argb8888, +}; + - u32 value = cursor_clip_display; + struct tegra_drm *tegra = plane->dev->dev_private; +#ifdef config_arch_dma_addr_t_64bit + u64 dma_mask = *dc->dev->dma_mask; +#endif + unsigned int x, y; + u32 value = 0; + /* + * legacy display supports hardware clipping of the cursor, but + * nvdisplay relies on software to clip the cursor to the screen. + */ + if (!dc->soc->has_nvdisplay) + value |= cursor_clip_display; + - value = (tegra_plane_state->iova[0] >> 32) & 0x3; + value = (tegra_plane_state->iova[0] >> 32) & (dma_mask >> 32); - value |= cursor_mode_normal; + + if (dc->soc->has_nvdisplay) + value &= ~cursor_composition_mode_xor; + else + value |= cursor_mode_normal; + + /* nvdisplay relies on software for clipping */ + if (dc->soc->has_nvdisplay) { + struct drm_rect src; + + x = new_state->dst.x1; + y = new_state->dst.y1; + + drm_rect_fp_to_int(&src, &new_state->src); + + value = (src.y1 & tegra->vmask) << 16 | (src.x1 & tegra->hmask); + tegra_dc_writel(dc, value, dc_disp_pcalc_head_set_cropped_point_in_cursor); + + value = (drm_rect_height(&src) & tegra->vmask) << 16 | + (drm_rect_width(&src) & tegra->hmask); + tegra_dc_writel(dc, value, dc_disp_pcalc_head_set_cropped_size_in_cursor); + } else { + x = new_state->crtc_x; + y = new_state->crtc_y; + } + - value = (new_state->crtc_y & 0x3fff) << 16 | - (new_state->crtc_x & 0x3fff); + value = ((y & tegra->vmask) << 16) | (x & tegra->hmask); - num_formats = array_size(tegra_cursor_plane_formats); - formats = tegra_cursor_plane_formats; + if (!dc->soc->has_nvdisplay) { + num_formats = array_size(tegra_legacy_cursor_plane_formats); + formats = tegra_legacy_cursor_plane_formats; + } else { + num_formats = array_size(tegra_cursor_plane_formats); + formats = tegra_cursor_plane_formats; + } diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h --- a/drivers/gpu/drm/tegra/dc.h +++ b/drivers/gpu/drm/tegra/dc.h +#define cursor_composition_mode_blend (0 << 25) +#define cursor_composition_mode_xor (1 << 25) +#define dc_disp_pcalc_head_set_cropped_point_in_cursor 0x442 +#define dc_disp_pcalc_head_set_cropped_size_in_cursor 0x446 +
|
Graphics
|
d5ec699db5bb15f981f1632d058ffe857d649765
|
thierry reding
|
drivers
|
gpu
|
drm, tegra
|
gpu: host1x: show number of pending waiters in debugfs
|
show the number of pending waiters in the debugfs status file. this is useful for testing to verify that waiters do not leak or accumulate incorrectly.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
show number of pending waiters in debugfs
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['host1x ']
|
['c']
| 1
| 11
| 3
|
--- diff --git a/drivers/gpu/host1x/debug.c b/drivers/gpu/host1x/debug.c --- a/drivers/gpu/host1x/debug.c +++ b/drivers/gpu/host1x/debug.c + struct list_head *pos; + unsigned int waiters = 0; - if (!min && !max) + spin_lock(&m->syncpt[i].intr.lock); + list_for_each(pos, &m->syncpt[i].intr.wait_head) + waiters++; + spin_unlock(&m->syncpt[i].intr.lock); + + if (!min && !max && !waiters) - host1x_debug_output(o, "id %u (%s) min %d max %d ", - i, m->syncpt[i].name, min, max); + host1x_debug_output(o, + "id %u (%s) min %d max %d (%d waiters) ", + i, m->syncpt[i].name, min, max, waiters);
|
Graphics
|
49a5fb1679952a76861bd2580f785e33e3de712c
|
mikko perttunen
|
drivers
|
gpu
|
host1x
|
backlight: ktd253: support ktd259
|
the ktd259 works just like ktd253 so add this compatible to the driver.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
support ktd259
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
['backlight', 'ktd253']
|
['c']
| 1
| 1
| 0
|
--- diff --git a/drivers/video/backlight/ktd253-backlight.c b/drivers/video/backlight/ktd253-backlight.c --- a/drivers/video/backlight/ktd253-backlight.c +++ b/drivers/video/backlight/ktd253-backlight.c + { .compatible = "kinetic,ktd259" },
|
Graphics
|
693091d99e7b7f5aa994745e719c69a731173db8
|
linus walleij daniel thompson daniel thompson linaro org
|
drivers
|
video
|
backlight
|
acpica: add parsing for ivrs ivhd 40h and device entry f0h
|
acpica commit eefb865355514048380d921de5efcf30027d6b02
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 16
| 1
|
--- diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h + acpi_ivrs_type_hardware3 = 0x40, - acpi_ivrs_type_special = 72 /* uses struct acpi_ivrs_device8c */ + acpi_ivrs_type_special = 72, /* uses struct acpi_ivrs_device8c */ + + /* variable-length device entries */ + + acpi_ivrs_type_hid = 240 /* uses acpi_ivrs_device_hid */ +/* type 240: variable-length device entry */ + +struct acpi_ivrs_device_hid { + struct acpi_ivrs_de_header header; + u64 acpi_hid; + u64 acpi_cid; + u8 uid_type; + u8 uid_length; +}; +
|
Power Management
|
7ce7a4459add3858243f77054fc98c1527a827fd
|
alexander monakov
|
include
|
acpi
| |
acpica: acpi 6.4: add new predefined objects _bpc, _bps, and _bpt
|
acpica commit 3cfef24ae2d98babbbfbe4ba612a2f5d9014d3ba
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 11
| 0
|
--- diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h --- a/drivers/acpi/acpica/acpredef.h +++ b/drivers/acpi/acpica/acpredef.h + {{"_bpc", method_0args, + method_returns(acpi_rtype_package)}}, /* fixed-length (4 int) */ + package_info(acpi_ptype1_fixed, acpi_rtype_integer, 4, 0, 0, 0), + + {{"_bps", method_0args, + method_returns(acpi_rtype_package)}}, /* fixed-length (5 int) */ + package_info(acpi_ptype1_fixed, acpi_rtype_integer, 5, 0, 0, 0), + + {{"_bpt", method_1args(acpi_type_package), + method_returns(acpi_rtype_integer)}}, +
|
Power Management
|
76d6338a82cf8285af140202d71b4444f2eab389
|
erik kaneda
|
drivers
|
acpi
|
acpica
|
acpica: acpi 6.4: add usb4 capabilities uuid
|
acpica commit 619e6df02edbebe95b2765cdd5159f02607e45fc
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 1
| 0
|
--- diff --git a/include/acpi/acuuid.h b/include/acpi/acuuid.h --- a/include/acpi/acuuid.h +++ b/include/acpi/acuuid.h +#define uuid_usb4_capabilities "23a0d13a-26ab-486c-9c5f-0ffa525a575a"
|
Power Management
|
e1dc932878ac66dab68557d4c06f7254a1a570e9
|
erik kaneda
|
include
|
acpi
| |
acpica: acpi 6.4: add cxl acpi device id and _cbr object
|
acpica commit 7f634ac53fe1e480c01ceff7532cd8dc6430f1b9
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 4
| 0
|
--- diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h --- a/drivers/acpi/acpica/acpredef.h +++ b/drivers/acpi/acpica/acpredef.h + {{"_cbr", method_0args, + method_returns(acpi_rtype_package)}}, /* fixed-length (3 int) */ + package_info(acpi_ptype1_fixed, acpi_rtype_integer, 3, 0, 0, 0), +
|
Power Management
|
97f46be290adc8f827d5d1b2266b42421162c18a
|
erik kaneda
|
drivers
|
acpi
|
acpica
|
acpica: acpi 6.4: madt: add multiprocessor wakeup structure
|
acpica commit b9eb6f3a19b816824d6f47a6bc86fd8ce690e04b
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 11
| 1
|
--- diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h - acpi_madt_type_reserved = 16 /* 16 and greater are reserved */ + acpi_madt_type_multiproc_wakeup = 16, + acpi_madt_type_reserved = 17 /* 17 and greater are reserved */ +/* 16: multiprocessor wakeup (acpi 6.4) */ + +struct acpi_madt_multiproc_wakeup { + struct acpi_subtable_header header; + u16 mailbox_version; + u32 reserved; /* reserved - must be zero */ + u64 base_address; +}; +
|
Power Management
|
9557cb8c5d8fbe835ade2775c95eb933344f8a27
|
erik kaneda
|
include
|
acpi
| |
acpica: acpi 6.4: pcct: add support for subtable type 5
|
acpica commit 208d7e27ebc473feb4182cc8e58f3789c4efaca6
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 20
| 1
|
--- diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h - acpi_pcct_type_reserved = 5 /* 5 and greater are reserved */ + acpi_pcct_type_hw_reg_comm_subspace = 5, /* acpi 6.4 */ + acpi_pcct_type_reserved = 6 /* 6 and greater are reserved */ +/* 5: hw registers based communications subspace */ + +struct acpi_pcct_hw_reg { + struct acpi_subtable_header header; + u16 version; + u64 base_address; + u64 length; + struct acpi_generic_address doorbell_register; + u64 doorbell_preserve; + u64 doorbell_write; + struct acpi_generic_address cmd_complete_register; + u64 cmd_complete_mask; + struct acpi_generic_address error_status_register; + u64 error_status_mask; + u32 nominal_latency; + u32 min_turnaround_time; +}; +
|
Power Management
|
71f79a3f0c752729b93ec5255476dce59bfae49a
|
erik kaneda
|
include
|
acpi
| |
acpica: acpi 6.4: pptt: add new version of subtable type 1
|
this commit squashes the following:
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 7
| 0
|
--- diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h +/* 1: cache type structure for pptt version 3 */ + +struct acpi_pptt_cache_v1 { + u32 cache_id; +}; + +#define acpi_pptt_cache_id_valid (1<<7) /* cache id valid */
|
Power Management
|
5e2e86c0b9970e6f70869e76a1c6417036fd3a7e
|
erik kaneda
|
include
|
acpi
| |
acpica: tree-wide: fix various typos and spelling mistakes
|
this commit squashes the following: acpica commit bc8939e2d902653e71bb1601b129a993c37fcfad acpica commit 2d9e5e98e23f2a569e5691e6bed183146e25798d acpica commit 937358156631ea7a0eef3569c213c82a031097d5
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h', 'c']
| 3
| 3
| 3
|
--- diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h - * debug case if code optimzation is disabled.) + * debug case if code optimization is disabled.) diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h --- a/include/acpi/platform/acgcc.h +++ b/include/acpi/platform/acgcc.h - * explictly mark intentional explicit fallthrough to silence + * explicitly mark intentional explicit fallthrough to silence diff --git a/tools/power/acpi/common/cmfsize.c b/tools/power/acpi/common/cmfsize.c --- a/tools/power/acpi/common/cmfsize.c +++ b/tools/power/acpi/common/cmfsize.c - * module name: cfsize - common get file size function + * module name: cmfsize - common get file size function
|
Power Management
|
e527db8f39d4c71128b3ef5f6a4e433513f5246b
|
colin ian king
|
tools
|
power
|
acpi, common, platform
|
acpica: acpi 6.4: nfit: add location cookie field
|
also, update struct size to reflect these changes in nfit core driver.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h', 'c']
| 2
| 3
| 1
|
--- diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c - build_bug_on(sizeof(struct acpi_nfit_system_address) != 56); + build_bug_on(sizeof(struct acpi_nfit_system_address) != 64); diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h + u64 location_cookie; /* acpi 6.4 */ +#define acpi_nfit_location_cookie_valid (1<<2) /* 02: spa location cookie valid (acpi 6.4) */
|
Power Management
|
cf16b05c607bd716a0a5726dc8d577a89fdc1777
|
bob moore
|
drivers
|
acpi
|
nfit
|
acpica: acpi 6.4: hmat: add new fields/flags
|
acpica commit 18a77ca6fc3edd26a24d8f32ae5c0ea66d84ccff
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 7
| 3
|
--- diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h - u16 reserved1; + u8 min_transfer_size; + u8 reserved1; -#define acpi_hmat_memory_hierarchy (0x0f) +#define acpi_hmat_memory_hierarchy (0x0f) /* bits 0-3 */ -/* values for memory hierarchy flag */ +/* values for memory hierarchy flags */ +#define acpi_hmat_minimum_xfer_size 0x10 /* bit 4: acpi 6.4 */ +#define acpi_hmat_non_sequential_xfers 0x20 /* bit 5: acpi 6.4 */ +
|
Power Management
|
f1489db63efb309b91539750875ee2ebe320873d
|
bob moore
|
include
|
acpi
| |
acpica: acpi 6.4: add new flags in srat
|
acpica commit 44633fa72f1e4ede718733aec16e7fb7572042f8
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 2
| 1
|
--- diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h --- a/include/acpi/actbl3.h +++ b/include/acpi/actbl3.h -#define acpi_srat_generic_affinity_enabled (1) /* 00: use affinity structure */ +#define acpi_srat_generic_affinity_enabled (1) /* 00: use affinity structure */ +#define acpi_srat_architectural_transactions (1<<1) /* acpi 6.4 */
|
Power Management
|
2dab2b68d25c9605ea30eb9dce9eefbfe3ec7d9e
|
bob moore
|
include
|
acpi
| |
acpica: acpi 6.4: add sdev secure access components
|
acpica commit 44ca5f4f9be24bf64524cdb1de46322509319056
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 41
| 0
|
--- diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h +#define acpi_sdev_secure_components_present (1<<1) +struct acpi_sdev_secure_component { + u16 secure_component_offset; + u16 secure_component_length; +}; + +/* + * sdev sub-subtables ("components") for above + */ +struct acpi_sdev_component { + struct acpi_sdev_header header; +}; + +/* values for sub-subtable type above */ + +enum acpi_sac_type { + acpi_sdev_type_id_component = 0, + acpi_sdev_type_mem_component = 1 +}; + +struct acpi_sdev_id_component { + struct acpi_sdev_header header; + u16 hardware_id_offset; + u16 hardware_id_length; + u16 subsystem_id_offset; + u16 subsystem_id_length; + u16 hardware_revision; + u8 hardware_rev_present; + u8 class_code_present; + u8 pci_base_class; + u8 pci_sub_class; + u8 pci_programming_xface; +}; + +struct acpi_sdev_mem_component { + struct acpi_sdev_header header; + u32 reserved; + u64 memory_base_address; + u64 memory_length; +}; +
|
Power Management
|
14012d2fb1fea43077f71d33333ba3703a21fdd6
|
erik kaneda
|
include
|
acpi
| |
acpica: iasl: add definitions for the viot table
|
acpica commit fc4e33319c1ee08f20f5c44853dd8426643f6dfd
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 66
| 0
|
--- diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h --- a/include/acpi/actbl3.h +++ b/include/acpi/actbl3.h +#define acpi_sig_viot "viot" /* virtual i/o translation table */ +/******************************************************************************* + * + * viot - virtual i/o translation table + * version 1 + * + ******************************************************************************/ + +struct acpi_table_viot { + struct acpi_table_header header; /* common acpi table header */ + u16 node_count; + u16 node_offset; + u8 reserved[8]; +}; + +/* viot subtable header */ + +struct acpi_viot_header { + u8 type; + u8 reserved; + u16 length; +}; + +/* values for type field above */ + +enum acpi_viot_node_type { + acpi_viot_node_pci_range = 0x01, + acpi_viot_node_mmio = 0x02, + acpi_viot_node_virtio_iommu_pci = 0x03, + acpi_viot_node_virtio_iommu_mmio = 0x04, +}; + +/* viot subtables */ + +struct acpi_viot_pci_range { + acpi_viot_header header; + u32 endpoint_start; + u16 segment_start; + u16 segment_end; + u16 bdf_start; + u16 bdf_end; + u16 output_node; + u8 reserved[6]; +}; + +struct acpi_viot_mmio { + acpi_viot_header header; + u32 endpoint; + u64 base_address; + u16 output_node; + u8 reserved[6]; +}; + +struct acpi_viot_virtio_iommu_pci { + acpi_viot_header header; + u16 segment; + u16 bdf; + u8 reserved[8]; +}; + +struct acpi_viot_virtio_iommu_mmio { + acpi_viot_header header; + u8 reserved[4]; + u64 base_address; +}; +
|
Power Management
|
582252034dd6b334c5f50140958362b19442fecd
|
jean philippe brucker
|
include
|
acpi
| |
acpica: cxl 2.0: cedt: add new cedt table
|
acpica commit 0b03aa8ebd7a5b2b9407893f123ee587af45926f
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 43
| 0
|
--- diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h +#define acpi_sig_cedt "cedt" /* cxl early discovery table */ +/******************************************************************************* + * + * cedt - cxl early discovery table + * version 1 + * + * conforms to the "cxl early discovery table" (cxl 2.0) + * + ******************************************************************************/ + +struct acpi_table_cedt { + struct acpi_table_header header; /* common acpi table header */ +}; + +/* cedt subtable header (performance record structure) */ + +struct acpi_cedt_header { + u8 type; + u8 reserved; + u16 length; +}; + +/* values for type field above */ + +enum acpi_cedt_type { + acpi_cedt_type_chbs = 0, +}; + +/* + * cedt subtables + */ + +/* 0: cxl host bridge structure */ + +struct acpi_cedt_chbs { + acpi_cedt_header header; + u32 uid; + u32 cxl_version; + u32 reserved; + u64 base; + u64 length; +}; +
|
Power Management
|
7c5eab72f5a4dffec61f8c0cd99736178f95a50a
|
ben widawsky
|
include
|
acpi
| |
acpica: acpi 6.4: pmtt: add new fields/structures
|
acpica commit 036290735ad8020f762c4d94bcbc0e84b2e307b6
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 35
| 18
|
--- diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h - u32 reserved; + u32 memory_device_count; + /* + * immediately followed by: + * memory_device memory_device_struct[memory_device_count]; + */ + u32 memory_device_count; /* zero means no memory device structs follow */ + /* + * immediately followed by: + * u8 type_specific_data[] + * memory_device memory_device_struct[memory_device_count]; + */ -#define acpi_pmtt_type_reserved 3 /* 0x03-0xff are reserved */ +#define acpi_pmtt_type_reserved 3 /* 0x03-0xfe are reserved */ +#define acpi_pmtt_type_vendor 0xff + /* + * immediately followed by: + * memory_device memory_device_struct[memory_device_count]; + */ - u32 read_latency; - u32 write_latency; - u32 read_bandwidth; - u32 write_bandwidth; - u16 access_width; - u16 alignment; + u16 controller_id; - u16 domain_count; -}; - -/* 1a: proximity domain substructure */ - -struct acpi_pmtt_domain { - u32 proximity_domain; + /* + * immediately followed by: + * memory_device memory_device_struct[memory_device_count]; + */ - u16 component_id; - u16 reserved; - u32 memory_size; +/* 0xff: vendor specific data */ + +struct acpi_pmtt_vendor_specific { + struct acpi_pmtt_header header; + u8 type_uuid[16]; + u8 specific[]; + /* + * immediately followed by: + * u8 vendor_specific_data[]; + * memory_device memory_device_struct[memory_device_count]; + */ +}; +
|
Power Management
|
cca97d421a01731d3ee3c0ac10f356c877e08e84
|
bob moore
|
include
|
acpi
| |
acpica: acpi 6.4: add csi2bus resource template
|
this commit the result of squashing the following: acpica commit 21a316fdaa46b3fb245a1920f3829cb05d6ced6e acpica commit f5506fc7dad08c2a25ef52cf836c2d67385a612c
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h', 'c']
| 13
| 183
| 8
|
--- diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h --- a/drivers/acpi/acpica/acresrc.h +++ b/drivers/acpi/acpica/acresrc.h + acpi_rsc_6bitflag, + acpi_rsd_6bitflag, +extern struct acpi_rsconvert_info acpi_rs_convert_csi2_serial_bus[]; +extern struct acpi_rsdump_info acpi_rs_dump_csi2_serial_bus[]; diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h --- a/drivers/acpi/acpica/acutils.h +++ b/drivers/acpi/acpica/acutils.h +extern const char *acpi_gbl_phy_decode[]; diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h --- a/drivers/acpi/acpica/amlresrc.h +++ b/drivers/acpi/acpica/amlresrc.h +#define acpi_restag_localport "_prt" +#define acpi_restag_phytype "_phy" -#define aml_resource_max_serialbustype 3 +#define aml_resource_csi2_serialbustype 4 +#define aml_resource_max_serialbustype 4 +struct aml_resource_csi2_serialbus { + aml_resource_large_header_common aml_resource_serial_common + /* + * optional fields follow immediately: + * 1) vendor data bytes + * 2) resource source string + */ +}; + +#define aml_resource_csi2_revision 1 /* acpi 6.4 */ +#define aml_resource_csi2_type_revision 1 /* acpi 6.4 */ +#define aml_resource_csi2_min_data_len 0 /* acpi 6.4 */ + + struct aml_resource_csi2_serialbus csi2_serial_bus; diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c --- a/drivers/acpi/acpica/rscalc.c +++ b/drivers/acpi/acpica/rscalc.c - "type %.2x, amllength %.2x internallength %.2x ", + "type %.2x, amllength %.2x internallength %.2x%8x ", - buffer_size)); + acpi_format_uint64(*size_needed))); diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c --- a/drivers/acpi/acpica/rsdump.c +++ b/drivers/acpi/acpica/rsdump.c + } else if (!resource_list->type) { + acpi_error((ae_info, "invalid zero resource type")); + return; + case acpi_rsd_6bitflag: + + acpi_rs_out_integer8(name, (acpi_get8(target) & 0x3f)); + break; + diff --git a/drivers/acpi/acpica/rsdumpinfo.c b/drivers/acpi/acpica/rsdumpinfo.c --- a/drivers/acpi/acpica/rsdumpinfo.c +++ b/drivers/acpi/acpica/rsdumpinfo.c +struct acpi_rsdump_info acpi_rs_dump_csi2_serial_bus[11] = { + { acpi_rsd_title, acpi_rsd_table_size(acpi_rs_dump_csi2_serial_bus), + "camera serial bus", null }, + { acpi_rsd_uint8, acpi_rsd_offset(csi2_serial_bus.revision_id), + "revisionid", null }, + { acpi_rsd_uint8, acpi_rsd_offset(csi2_serial_bus.type), "type", + acpi_gbl_sbt_decode }, + { acpi_rsd_1bitflag, acpi_rsd_offset(csi2_serial_bus.producer_consumer), + "producerconsumer", acpi_gbl_consume_decode }, + { acpi_rsd_1bitflag, acpi_rsd_offset(csi2_serial_bus.slave_mode), + "slavemode", acpi_gbl_sm_decode }, + { acpi_rsd_2bitflag, acpi_rsd_offset(csi2_serial_bus.phy_type), + "phytype", acpi_gbl_phy_decode }, + { acpi_rsd_6bitflag, + acpi_rsd_offset(csi2_serial_bus.local_port_instance), + "localportinstance", null }, + { acpi_rsd_uint8, acpi_rsd_offset(csi2_serial_bus.type_revision_id), + "typerevisionid", null }, + { acpi_rsd_uint16, acpi_rsd_offset(csi2_serial_bus.vendor_length), + "vendorlength", null }, + { acpi_rsd_shortlistx, acpi_rsd_offset(csi2_serial_bus.vendor_data), + "vendordata", null }, + { acpi_rsd_source, acpi_rsd_offset(csi2_serial_bus.resource_source), + "resourcesource", null }, +}; + diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c --- a/drivers/acpi/acpica/rsinfo.c +++ b/drivers/acpi/acpica/rsinfo.c -/* subtype table for serial_bus -- i2c, spi, and uart */ +/* subtype table for serial_bus -- i2c, spi, uart, and csi2 */ + acpi_rs_convert_csi2_serial_bus + acpi_rs_dump_csi2_serial_bus, /* aml_resource_csi2_bus_type */ + sizeof(struct aml_resource_csi2_serialbus), + acpi_rs_size(struct acpi_resource_csi2_serialbus), diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c --- a/drivers/acpi/acpica/rslist.c +++ b/drivers/acpi/acpica/rslist.c - /* this is an i2c, spi, or uart serial_bus descriptor */ + /* this is an i2c, spi, uart, or csi2 serial_bus descriptor */ + if (!resource->length) { + acpi_exception((ae_info, status, + "zero-length resource returned from rsconvertamltoresource")); + } + - /* this is an i2c, spi, or uart serial_bus descriptor */ + /* this is an i2c, spi, uart or csi2 serial_bus descriptor */ diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c --- a/drivers/acpi/acpica/rsmisc.c +++ b/drivers/acpi/acpica/rsmisc.c + target = null; + + case acpi_rsc_6bitflag: + /* + * mask and shift the flag bits + */ + acpi_set8(destination, + ((acpi_get8(source) >> info->value) & 0x3f)); + break; + + case acpi_rsc_6bitflag: + /* + * mask and shift the flag bits + */ + acpi_set_bit(*acpi_cast8(destination), (u8) + ((acpi_get8(source) & 0x3f) << info-> + value)); + break; + diff --git a/drivers/acpi/acpica/rsserial.c b/drivers/acpi/acpica/rsserial.c --- a/drivers/acpi/acpica/rsserial.c +++ b/drivers/acpi/acpica/rsserial.c +/******************************************************************************* + * + * acpi_rs_convert_csi2_serial_bus + * + ******************************************************************************/ + +struct acpi_rsconvert_info acpi_rs_convert_csi2_serial_bus[14] = { + { acpi_rsc_initget, acpi_resource_type_serial_bus, + acpi_rs_size(struct acpi_resource_csi2_serialbus), + acpi_rsc_table_size(acpi_rs_convert_csi2_serial_bus) }, + + { acpi_rsc_initset, acpi_resource_name_serial_bus, + sizeof(struct aml_resource_csi2_serialbus), + 0 }, + + { acpi_rsc_move8, acpi_rs_offset(data.common_serial_bus.revision_id), + aml_offset(common_serial_bus.revision_id), + 1 }, + + { acpi_rsc_move8, acpi_rs_offset(data.csi2_serial_bus.type), + aml_offset(csi2_serial_bus.type), + 1 }, + + { acpi_rsc_1bitflag, + acpi_rs_offset(data.csi2_serial_bus.producer_consumer), + aml_offset(csi2_serial_bus.flags), + 1 }, + + { acpi_rsc_1bitflag, acpi_rs_offset(data.csi2_serial_bus.slave_mode), + aml_offset(csi2_serial_bus.flags), + 0 }, + + { acpi_rsc_2bitflag, acpi_rs_offset(data.csi2_serial_bus.phy_type), + aml_offset(csi2_serial_bus.type_specific_flags), + 0 }, + + { acpi_rsc_6bitflag, + acpi_rs_offset(data.csi2_serial_bus.local_port_instance), + aml_offset(csi2_serial_bus.type_specific_flags), + 2 }, + + { acpi_rsc_move8, acpi_rs_offset(data.csi2_serial_bus.type_revision_id), + aml_offset(csi2_serial_bus.type_revision_id), + 1 }, + + /* vendor data */ + + { acpi_rsc_count_serial_ven, + acpi_rs_offset(data.csi2_serial_bus.vendor_length), + aml_offset(csi2_serial_bus.type_data_length), + aml_resource_csi2_min_data_len }, + + { acpi_rsc_move_serial_ven, + acpi_rs_offset(data.csi2_serial_bus.vendor_data), + 0, + sizeof(struct aml_resource_csi2_serialbus) }, + + /* resource source */ + + { acpi_rsc_move8, + acpi_rs_offset(data.csi2_serial_bus.resource_source.index), + aml_offset(csi2_serial_bus.res_source_index), + 1 }, + + { acpi_rsc_count_serial_res, + acpi_rs_offset(data.csi2_serial_bus.resource_source.string_length), + aml_offset(csi2_serial_bus.type_data_length), + sizeof(struct aml_resource_csi2_serialbus) }, + + { acpi_rsc_move_serial_res, + acpi_rs_offset(data.csi2_serial_bus.resource_source.string_ptr), + aml_offset(csi2_serial_bus.type_data_length), + sizeof(struct aml_resource_csi2_serialbus) }, +}; + diff --git a/drivers/acpi/acpica/utresdecode.c b/drivers/acpi/acpica/utresdecode.c --- a/drivers/acpi/acpica/utresdecode.c +++ b/drivers/acpi/acpica/utresdecode.c +const char *acpi_gbl_phy_decode[] = { + "type c", + "type d", + "unknown type", + "unknown type" +}; + - "uart" + "uart", + "csi2" diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c --- a/drivers/acpi/acpica/utresrc.c +++ b/drivers/acpi/acpica/utresrc.c + acpi_aml_size_large(struct aml_resource_csi2_serialbus), diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h --- a/include/acpi/acrestyp.h +++ b/include/acpi/acrestyp.h -/* common structure for i2c, spi, and uart serial descriptors */ +/* common structure for i2c, spi, uart, csi2 serial descriptors */ +#define acpi_resource_serial_type_csi2 4 +struct acpi_resource_csi2_serialbus { + acpi_resource_serial_common u8 local_port_instance; + u8 phy_type; +}; + + struct acpi_resource_csi2_serialbus csi2_serial_bus;
|
Power Management
|
a2befbb2c3fbeccf4a04e9f0179cc28d5f5c1682
|
bob moore
|
include
|
acpi
|
acpica
|
acpica: acpi 6.4: add support for phat table
|
acpica commit de805b6a355c01f3aff4044a4ba60e9845b7668c
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 61
| 0
|
--- diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h +#define acpi_sig_phat "phat" /* platform health assessment table */ +/******************************************************************************* + * + * phat - platform health assessment table (acpi 6.4) + * version 1 + * + ******************************************************************************/ + +struct acpi_table_phat { + struct acpi_table_header header; /* common acpi table header */ +}; + +/* common header for phat subtables that follow main table */ + +struct acpi_phat_header { + u16 type; + u16 length; + u8 revision; +}; + +/* values for type field above */ + +#define acpi_phat_type_fw_version_data 0 +#define acpi_phat_type_fw_health_data 1 +#define acpi_phat_type_reserved 2 /* 0x02-0xffff are reserved */ + +/* + * phat subtables, correspond to type in struct acpi_phat_header + */ + +/* 0: firmware version data record */ + +struct acpi_phat_version_data { + struct acpi_phat_header header; + u8 reserved[3]; + u32 element_count; +}; + +struct acpi_phat_version_element { + u8 guid[16]; + u64 version_value; + u32 producer_id; +}; + +/* 1: firmware health data record */ + +struct acpi_phat_health_data { + struct acpi_phat_header header; + u8 reserved[2]; + u8 health; + u8 device_guid[16]; + u32 device_specific_offset; /* zero if no device-specific data */ +}; + +/* values for health field above */ + +#define acpi_phat_errors_found 0 +#define acpi_phat_no_errors 1 +#define acpi_phat_unknown_errors 2 +#define acpi_phat_advisory 3 +
|
Power Management
|
9f40033734c7bc02f151e28975a59bdc2f332023
|
erik kaneda
|
include
|
acpi
| |
acpica: iasl: add support for cedt table
|
also, update the cedt template.
|
this release includes the landlock security module, which aims to make easier to sandbox applications; support for the clang control flow integrity, which aims to abort the program upon detecting certain forms of undefined behavior; support for randomising the stack address offset in each syscall; support for concurrent tbl flushing; preparatory apple m1 support; support for incoming amd and intel graphics chips; bpf support for calling kernel functions directly; a virtio sound driver for improved sound experience on virtualized guests; io_uring support for multi shot mode and a misc cgroup for miscellaneous resources. as always, there are many other features, new drivers, improvements and fixes.
|
acpi 6.4 support
|
['core (various)', 'file systems', 'memory management', 'block layer', 'tracing, perf and bpf', 'virtualization', 'security', 'networking', 'architectures arm x86 mips powerpc riscv s390 ia64 xtensa']
|
['graphics', 'power management', 'storage', 'drivers in the staging area', 'networking', 'audio', 'tablets, touch screens, keyboards, mouses', 'tv tuners, webcams, video capturers', 'universal serial bus', 'serial peripheral interface (spi)', 'watchdog', 'serial', 'cpu frequency scaling', 'voltage, current regulators, power capping, power supply', 'real time clock (rtc)', 'pin controllers (pinctrl)', 'multi media card (mmc)', 'memory technology devices (mtd)', 'industrial i/o (iio)', 'multi function devices (mfd)', 'pulse-width modulation (pwm)', 'inter-integrated circuit (i2c + i3c)', 'hardware monitoring (hwmon)', 'general purpose i/o (gpio)', 'leds', 'dma engines', 'cryptography hardware acceleration', 'pci', 'remote processors', 'clock', 'phy ("physical layer" framework)', 'various']
|
[]
|
['h']
| 1
| 2
| 1
|
--- diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h + acpi_cedt_type_reserved = 1 - acpi_cedt_header header; + struct acpi_cedt_header header;
|
Power Management
|
519c809069cef7de5ced3e620412fa66c032436d
|
bob moore
|
include
|
acpi
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.